* [PATCH 1/4] libsdl2-image: update to 2.0.1
@ 2016-02-15 21:17 Andreas Müller
2016-02-15 21:17 ` [PATCH 2/4] libsdl-ttf: update to 2.0.11 Andreas Müller
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andreas Müller @ 2016-02-15 21:17 UTC (permalink / raw)
To: openembedded-devel
Licence checksum was changed by change of copyright year.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../libsdl-image/{libsdl2-image_2.0.0.bb => libsdl2-image_2.0.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-multimedia/libsdl-image/{libsdl2-image_2.0.0.bb => libsdl2-image_2.0.1.bb} (80%)
diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.0.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb
similarity index 80%
rename from meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.0.bb
rename to meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb
index a6885da..1f9c794 100644
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.0.bb
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb
@@ -2,13 +2,13 @@ SUMMARY = "Simple DirectMedia Layer image library v2"
SECTION = "libs"
LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=8f66a2e45aa301ea73b5ab275aeb0702"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=ec65b9778f5584a0bd8dfc17d6340ba0"
DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp"
SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
-SRC_URI[md5sum] = "fb399c8386fb3248f1b33cfe81bdf92b"
-SRC_URI[sha256sum] = "b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234"
+SRC_URI[md5sum] = "d94b94555ba022fa249a53a021dc3606"
+SRC_URI[sha256sum] = "3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64"
S = "${WORKDIR}/SDL2_image-${PV}"
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] libsdl-ttf: update to 2.0.11
2016-02-15 21:17 [PATCH 1/4] libsdl2-image: update to 2.0.1 Andreas Müller
@ 2016-02-15 21:17 ` Andreas Müller
2016-02-15 21:17 ` [PATCH 3/4] libsdl2-ttf: update to 2.0.14 Andreas Müller
2016-02-15 21:17 ` [PATCH 4/4] libsdl2-mixer: initial add 2.0.1 Andreas Müller
2 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2016-02-15 21:17 UTC (permalink / raw)
To: openembedded-devel
* Licence changed to Zlib [1]
* patch does not apply anymore and does not seem to miss
[1] https://www.libsdl.org/projects/SDL_ttf/
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../libsdl-ttf/files/configure.patch | 52 ----------------------
.../{libsdl-ttf_2.0.10.bb => libsdl-ttf_2.0.11.bb} | 20 +++------
2 files changed, 7 insertions(+), 65 deletions(-)
delete mode 100644 meta-oe/recipes-support/libsdl-ttf/files/configure.patch
rename meta-oe/recipes-support/libsdl-ttf/{libsdl-ttf_2.0.10.bb => libsdl-ttf_2.0.11.bb} (55%)
diff --git a/meta-oe/recipes-support/libsdl-ttf/files/configure.patch b/meta-oe/recipes-support/libsdl-ttf/files/configure.patch
deleted file mode 100644
index de88f0a..0000000
--- a/meta-oe/recipes-support/libsdl-ttf/files/configure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: SDL_ttf-2.0.10/configure.in
-===================================================================
---- SDL_ttf-2.0.10.orig/configure.in 2009-10-12 23:06:38.000000000 +0000
-+++ SDL_ttf-2.0.10/configure.in 2014-07-17 12:33:34.011662505 +0000
-@@ -1,5 +1,4 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(README)
-
- dnl Set various version strings - taken gratefully from the GTk sources
-
-@@ -11,12 +10,19 @@
- # if backwards compatibility has been broken,
- # set BINARY_AGE and INTERFACE_AGE to 0.
-
--MAJOR_VERSION=2
--MINOR_VERSION=0
--MICRO_VERSION=10
-+m4_define([sdlttf_major_version],[2])
-+m4_define([sdlttf_minor_version],[0])
-+m4_define([sdlttf_micro_version],[10])
-+m4_define([sdlttf_version], [sdlttf_major_version.sdlttf_minor_version.sdlttf_micro_version])
-+
-+AC_INIT([SDL_ttf], [sdlttf_version])
-+
-+MAJOR_VERSION=sdlttf_major_version
-+MINOR_VERSION=sdlttf_minor_version
-+MICRO_VERSION=sdlttf_micro_version
- INTERFACE_AGE=0
- BINARY_AGE=10
--VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
-+VERSION=sdlttf_version
-
- AC_SUBST(MAJOR_VERSION)
- AC_SUBST(MINOR_VERSION)
-@@ -25,6 +31,8 @@
- AC_SUBST(BINARY_AGE)
- AC_SUBST(VERSION)
-
-+AC_CONFIG_MACRO_DIR([acinclude])
-+
- # libtool versioning
- LT_INIT([win32-dll])
-
-@@ -42,7 +50,7 @@
- AC_CANONICAL_HOST
-
- dnl Setup for automake
--AM_INIT_AUTOMAKE(SDL_ttf, $VERSION)
-+AM_INIT_AUTOMAKE([foreign])
-
- dnl Check for tools
- AC_PROG_LIBTOOL
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb
similarity index 55%
rename from meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
rename to meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb
index ad3792e..0249abe 100644
--- a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb
@@ -1,33 +1,27 @@
SUMMARY = "Simple DirectMedia Layer truetype font library"
SECTION = "libs"
DEPENDS = "virtual/libsdl freetype"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
-
-PR = "r2"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303"
SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
- file://configure.patch \
file://use.pkg-config.for.freetype2.patch \
"
+SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa"
+SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
S = "${WORKDIR}/SDL_ttf-${PV}"
-EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config "
inherit autotools
-TARGET_CC_ARCH += "${LDFLAGS}"
-
do_configure_prepend() {
+ # make autoreconf happy
+ touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog
# Removing these files fixes a libtool version mismatch.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
- rm -f ${S}/acinclude/$i
+ rm -f ${S}/acinclude/$i
done
-
}
-
-SRC_URI[md5sum] = "814e6e17e8879254208d23b3b7e0354b"
-SRC_URI[sha256sum] = "7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a"
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] libsdl2-ttf: update to 2.0.14
2016-02-15 21:17 [PATCH 1/4] libsdl2-image: update to 2.0.1 Andreas Müller
2016-02-15 21:17 ` [PATCH 2/4] libsdl-ttf: update to 2.0.11 Andreas Müller
@ 2016-02-15 21:17 ` Andreas Müller
2016-02-15 23:55 ` Khem Raj
2016-02-15 21:17 ` [PATCH 4/4] libsdl2-mixer: initial add 2.0.1 Andreas Müller
2 siblings, 1 reply; 6+ messages in thread
From: Andreas Müller @ 2016-02-15 21:17 UTC (permalink / raw)
To: openembedded-devel
Licence checksum was changed by change of copyright year.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../{libsdl2-ttf_2.0.12.bb => libsdl2-ttf_2.0.14.bb} | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
rename meta-oe/recipes-support/libsdl-ttf/{libsdl2-ttf_2.0.12.bb => libsdl2-ttf_2.0.14.bb} (66%)
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
similarity index 66%
rename from meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb
rename to meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
index 47ce115..af5a55c 100644
--- a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
@@ -2,20 +2,19 @@ SUMMARY = "Simple DirectMedia Layer truetype font library"
SECTION = "libs"
DEPENDS = "virtual/libsdl2 freetype"
LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cdd16c6436d6b8fcbdd22a54d68c6dd3"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5"
SRC_URI = " \
http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
file://use.pkg-config.for.freetype2.patch \
"
+SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1"
+SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
S = "${WORKDIR}/SDL2_ttf-${PV}"
-#EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config "
inherit autotools
-TARGET_CC_ARCH += "${LDFLAGS}"
-
do_configure_prepend() {
touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
@@ -26,6 +25,3 @@ do_configure_prepend() {
rm -f ${S}/acinclude/$i
done
}
-
-SRC_URI[md5sum] = "79787216b56cb4707f39d538f2225e00"
-SRC_URI[sha256sum] = "8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e"
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] libsdl2-mixer: initial add 2.0.1
2016-02-15 21:17 [PATCH 1/4] libsdl2-image: update to 2.0.1 Andreas Müller
2016-02-15 21:17 ` [PATCH 2/4] libsdl-ttf: update to 2.0.11 Andreas Müller
2016-02-15 21:17 ` [PATCH 3/4] libsdl2-ttf: update to 2.0.14 Andreas Müller
@ 2016-02-15 21:17 ` Andreas Müller
2 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2016-02-15 21:17 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../libsdl-mixer/libsdl2-mixer_2.0.1.bb | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb
diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb
new file mode 100644
index 0000000..2dc48e4
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Simple DirectMedia Layer mixer library V2"
+SECTION = "libs"
+DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=29d8bc7c38aa44b1cf3a633a46589917"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "c6c4f556d4415871f526248f5c9a627d"
+SRC_URI[sha256sum] = "5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f"
+
+S = "${WORKDIR}/SDL2_mixer-${PV}"
+
+inherit autotools-brokensep
+
+EXTRA_AUTORECONF += "--include=acinclude"
+EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}"
+
+PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
+
+do_configure_prepend () {
+ # Remove old libtool macros.
+ MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+ for i in ${MACROS}; do
+ rm -f acinclude/$i
+ done
+}
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/4] libsdl2-ttf: update to 2.0.14
2016-02-15 21:17 ` [PATCH 3/4] libsdl2-ttf: update to 2.0.14 Andreas Müller
@ 2016-02-15 23:55 ` Khem Raj
2016-02-16 8:12 ` Andreas Müller
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2016-02-15 23:55 UTC (permalink / raw)
To: openembeded-devel
On Mon, Feb 15, 2016 at 1:17 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> Licence checksum was changed by change of copyright year.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> .../{libsdl2-ttf_2.0.12.bb => libsdl2-ttf_2.0.14.bb} | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
> rename meta-oe/recipes-support/libsdl-ttf/{libsdl2-ttf_2.0.12.bb => libsdl2-ttf_2.0.14.bb} (66%)
>
> diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
> similarity index 66%
> rename from meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb
> rename to meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
> index 47ce115..af5a55c 100644
> --- a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb
> +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
> @@ -2,20 +2,19 @@ SUMMARY = "Simple DirectMedia Layer truetype font library"
> SECTION = "libs"
> DEPENDS = "virtual/libsdl2 freetype"
> LICENSE = "Zlib"
> -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cdd16c6436d6b8fcbdd22a54d68c6dd3"
> +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5"
>
> SRC_URI = " \
> http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
> file://use.pkg-config.for.freetype2.patch \
> "
> +SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1"
> +SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
>
> S = "${WORKDIR}/SDL2_ttf-${PV}"
> -#EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config "
>
> inherit autotools
>
> -TARGET_CC_ARCH += "${LDFLAGS}"
> -
why is this removed ?
> do_configure_prepend() {
> touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
>
> @@ -26,6 +25,3 @@ do_configure_prepend() {
> rm -f ${S}/acinclude/$i
> done
> }
> -
> -SRC_URI[md5sum] = "79787216b56cb4707f39d538f2225e00"
> -SRC_URI[sha256sum] = "8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e"
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/4] libsdl2-ttf: update to 2.0.14
2016-02-15 23:55 ` Khem Raj
@ 2016-02-16 8:12 ` Andreas Müller
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2016-02-16 8:12 UTC (permalink / raw)
To: openembedded-devel
On Tue, Feb 16, 2016 at 12:55 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Mon, Feb 15, 2016 at 1:17 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> Licence checksum was changed by change of copyright year.
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>> .../{libsdl2-ttf_2.0.12.bb => libsdl2-ttf_2.0.14.bb} | 10 +++-------
>> 1 file changed, 3 insertions(+), 7 deletions(-)
>> rename meta-oe/recipes-support/libsdl-ttf/{libsdl2-ttf_2.0.12.bb => libsdl2-ttf_2.0.14.bb} (66%)
>>
>> diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
>> similarity index 66%
>> rename from meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb
>> rename to meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
>> index 47ce115..af5a55c 100644
>> --- a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.12.bb
>> +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
>> @@ -2,20 +2,19 @@ SUMMARY = "Simple DirectMedia Layer truetype font library"
>> SECTION = "libs"
>> DEPENDS = "virtual/libsdl2 freetype"
>> LICENSE = "Zlib"
>> -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cdd16c6436d6b8fcbdd22a54d68c6dd3"
>> +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5"
>>
>> SRC_URI = " \
>> http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
>> file://use.pkg-config.for.freetype2.patch \
>> "
>> +SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1"
>> +SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
>>
>> S = "${WORKDIR}/SDL2_ttf-${PV}"
>> -#EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config "
>>
>> inherit autotools
>>
>> -TARGET_CC_ARCH += "${LDFLAGS}"
>> -
>
> why is this removed ?
>
It is not necessary anymore - builds fine without it
Andreas
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-16 8:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-15 21:17 [PATCH 1/4] libsdl2-image: update to 2.0.1 Andreas Müller
2016-02-15 21:17 ` [PATCH 2/4] libsdl-ttf: update to 2.0.11 Andreas Müller
2016-02-15 21:17 ` [PATCH 3/4] libsdl2-ttf: update to 2.0.14 Andreas Müller
2016-02-15 23:55 ` Khem Raj
2016-02-16 8:12 ` Andreas Müller
2016-02-15 21:17 ` [PATCH 4/4] libsdl2-mixer: initial add 2.0.1 Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.