Patchwork [meta-oe] libsdl2-mixer: add recipe

login
register
mail settings
Submitter Marko Lindqvist
Date Oct. 30, 2013, 1:57 p.m.
Message ID <1383141430-30778-1-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/60765/
State Changes Requested, archived
Headers show

Comments

Marko Lindqvist - Oct. 30, 2013, 1:57 p.m.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../libsdl2-mixer/libsdl2-mixer/configure.patch    | 26 +++++++++++++++
 .../libsdl2-mixer/libsdl2-mixer_2.0.0.bb           | 39 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch
 create mode 100644 meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb
Martin Jansa - Nov. 3, 2013, 9:37 p.m.
On Wed, Oct 30, 2013 at 03:57:10PM +0200, Marko Lindqvist wrote:
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
>  .../libsdl2-mixer/libsdl2-mixer/configure.patch    | 26 +++++++++++++++
>  .../libsdl2-mixer/libsdl2-mixer_2.0.0.bb           | 39 ++++++++++++++++++++++
>  2 files changed, 65 insertions(+)
>  create mode 100644 meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch
>  create mode 100644 meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb
> 
> diff --git a/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch
> new file mode 100644
> index 0000000..43477e0
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch
> @@ -0,0 +1,26 @@
> +Upstream-Status: Inappropriate [configure]
> +
> +Adopted from similar patch for libsdl-mixer.
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +diff -Nurd SDL2_mixer-2.0.0/configure.in SDL2_mixer-2.0.0/configure.in
> +--- SDL2_mixer-2.0.0/configure.in	2013-08-10 20:39:55.000000000 +0300
> ++++ SDL2_mixer-2.0.0/configure.in	2013-10-30 15:40:40.508477024 +0200
> +@@ -1,6 +1,5 @@
> + dnl Process this file with autoconf to produce a configure script.
> + AC_INIT(README.txt)
> +-AC_CONFIG_AUX_DIR(build-scripts)
> + 
> + dnl Set various version strings - taken gratefully from the GTk sources
> + 
> +@@ -40,10 +39,6 @@
> + AC_SUBST(LT_REVISION)
> + AC_SUBST(LT_AGE)
> + 
> +-dnl Detect the canonical build and host environments
> +-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
> +-dnl AC_CANONICAL_HOST
> +-
> + dnl Check for tools
> + AC_PROG_LIBTOOL
> + AC_PROG_CC
> diff --git a/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb
> new file mode 100644
> index 0000000..f016e84
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb
> @@ -0,0 +1,39 @@
> +DESCRIPTION = "Simple DirectMedia Layer mixer library."
> +SECTION = "libs"
> +DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis"
> +LICENSE = "Zlib"
> +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7d198f6396c6f21fa575129c5b2fe8fe"
> +
> +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \
> +           file://configure.patch \
> +"
> +
> +SRC_URI[md5sum] = "65f6d80df073a1fb3bb537fbda031b50"
> +SRC_URI[sha256sum] = "a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b"
> +
> +S = "${WORKDIR}/SDL2_mixer-${PV}"
> +
> +inherit autotools
> +
> +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_compile fails with:
| In file included from mixer.c:41:0:
| dynamic_ogg.h:24:25: fatal error: ivorbisfile.h: No such file or
directory
|  #include <ivorbisfile.h>
|                          ^
| compilation terminated.

Full log
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20131102_233937.log/bitbake.log


> +
> +do_configure () {
> +    # 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
> +    cp build-scripts/* . || true
> +    rm -rf build-scripts/
> +    export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
> +
> +    autotools_do_configure
> +
> +    rm config.log
> +    for i in $(find -name "Makefile") ; do
> +        sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
> +    done
> +}
> -- 
> 1.8.4.rc3
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch
new file mode 100644
index 0000000..43477e0
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer/configure.patch
@@ -0,0 +1,26 @@ 
+Upstream-Status: Inappropriate [configure]
+
+Adopted from similar patch for libsdl-mixer.
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd SDL2_mixer-2.0.0/configure.in SDL2_mixer-2.0.0/configure.in
+--- SDL2_mixer-2.0.0/configure.in	2013-08-10 20:39:55.000000000 +0300
++++ SDL2_mixer-2.0.0/configure.in	2013-10-30 15:40:40.508477024 +0200
+@@ -1,6 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(README.txt)
+-AC_CONFIG_AUX_DIR(build-scripts)
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
+@@ -40,10 +39,6 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-dnl Detect the canonical build and host environments
+-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
+-dnl AC_CANONICAL_HOST
+-
+ dnl Check for tools
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
diff --git a/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb
new file mode 100644
index 0000000..f016e84
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl2-mixer/libsdl2-mixer_2.0.0.bb
@@ -0,0 +1,39 @@ 
+DESCRIPTION = "Simple DirectMedia Layer mixer library."
+SECTION = "libs"
+DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7d198f6396c6f21fa575129c5b2fe8fe"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \
+           file://configure.patch \
+"
+
+SRC_URI[md5sum] = "65f6d80df073a1fb3bb537fbda031b50"
+SRC_URI[sha256sum] = "a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b"
+
+S = "${WORKDIR}/SDL2_mixer-${PV}"
+
+inherit autotools
+
+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 () {
+    # 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
+    cp build-scripts/* . || true
+    rm -rf build-scripts/
+    export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
+
+    autotools_do_configure
+
+    rm config.log
+    for i in $(find -name "Makefile") ; do
+        sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
+    done
+}