From 68b325b9fa119eab09b8c6fdecbdcaf21f1643d0 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Tue, 16 Apr 2013 02:00:21 +0300 Subject: [PATCH] libsdl-mixer: update to 1.2.12 to fix music resume bug copy-paste from upstream OE --- recipes/libsdl/libsdl-mixer/configure.patch | 21 ++++++++++++ recipes/libsdl/libsdl-mixer_1.2.12.bb | 38 +++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 recipes/libsdl/libsdl-mixer/configure.patch create mode 100644 recipes/libsdl/libsdl-mixer_1.2.12.bb diff --git a/recipes/libsdl/libsdl-mixer/configure.patch b/recipes/libsdl/libsdl-mixer/configure.patch new file mode 100644 index 0000000000..4c9e8d094c --- /dev/null +++ b/recipes/libsdl/libsdl-mixer/configure.patch @@ -0,0 +1,21 @@ +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_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/recipes/libsdl/libsdl-mixer_1.2.12.bb b/recipes/libsdl/libsdl-mixer_1.2.12.bb new file mode 100644 index 0000000000..8fecd83a41 --- /dev/null +++ b/recipes/libsdl/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;patch=1 \ +" + +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 +} + -- 2.39.5