From 4b5d2af979c17c6a2a65a6ea9a4e7f41414c9feb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 15 Dec 2012 17:54:06 +0000 Subject: libsdl-mixer: update to upstream version 1.2.12 Now uses zlib license. Dropped fix-flac-madness patch as upsream configure check in question now uses AC_TRY_COMPILE instead of AC_TRY_RUN. Signed-off-by: Marko Lindqvist Signed-off-by: Martin Jansa --- .../libsdl-mixer/libsdl-mixer/configure.patch | 9 +++-- .../libsdl-mixer/fix-flac-madness.diff | 28 ---------------- .../libsdl-mixer/libsdl-mixer_1.2.11.bb | 38 ---------------------- .../libsdl-mixer/libsdl-mixer_1.2.12.bb | 38 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 71 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb create mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch index 7cc69e057f..4c9e8d094c 100644 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch +++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch @@ -1,11 +1,10 @@ -Index: SDL_mixer-1.2.11/configure.in -=================================================================== ---- SDL_mixer-1.2.11.orig/configure.in 2011-02-15 11:54:23.929086120 +0100 -+++ SDL_mixer-1.2.11/configure.in 2011-02-15 11:56:53.745736645 +0100 +diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in +--- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200 ++++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200 @@ -1,6 +1,5 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(README) --AC_CONFIG_AUX_DIRS($srcdir/build-scripts) +-AC_CONFIG_AUX_DIR(build-scripts) dnl Set various version strings - taken gratefully from the GTk sources diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff deleted file mode 100644 index 48fe88ef4a..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- /tmp/configure.in 2009-12-02 16:18:33.000000000 +0100 -+++ SDL_mixer-1.2.11/configure.in 2009-12-02 16:20:02.000000000 +0100 -@@ -413,24 +413,7 @@ - [], [enable_music_flac_shared=yes]) - if test x$enable_music_flac = xyes; then - AC_CHECK_HEADER([FLAC/export.h], [have_flac_export=yes]) -- if test x$have_flac_export = xyes; then -- LIBS_SAVED="$LIBS" -- LIBS="-lFLAC" -- AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver]) -- AC_TRY_RUN([ --#include "FLAC/export.h" --#include "stdio.h" --int main( int argc, char *argv[] ) { --#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver) -- return 0; --#else -- return 1; --#endif --} --], have_flac_ver=yes, have_flac_ver=no) -- LIBS="$LIBS_SAVED" -- AC_MSG_RESULT($have_flac_ver) -- fi -+ have_flac_ver=yes - - if test x$have_flac_ver = xyes; then - AC_CHECK_HEADER([FLAC/stream_decoder.h], [have_flac_hdr=yes]) diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb deleted file mode 100644 index bccbc50fcb..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Simple DirectMedia Layer mixer library." -SECTION = "libs" -DEPENDS = "virtual/libsdl flac libmikmod libvorbis ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" - -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ - file://fix-flac-madness.diff \ - file://configure.patch \ - " -SRC_URI[md5sum] = "65ada3d997fe85109191a5fb083f248c" -SRC_URI[sha256sum] = "86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9" - -S = "${WORKDIR}/SDL_mixer-${PV}" - -inherit autotools - -EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}" - -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 -} - diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb new file mode 100644 index 0000000000..c8fa6ca468 --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Simple DirectMedia Layer mixer library." +SECTION = "libs" +DEPENDS = "virtual/libsdl flac libmikmod libvorbis ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" +LICENSE = "zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d" + +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ + file://configure.patch \ + " + +SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1" +SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" + +S = "${WORKDIR}/SDL_mixer-${PV}" + +inherit autotools + +EXTRA_AUTORECONF += "--include=acinclude" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}" + +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 +} + -- cgit v1.2.3-54-g00ecf