mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-08 05:29:22 +00:00
Code Issues Projects Releases Wiki Activity

libsdl-mixer: update to upstream version 1.2.12

Browse Source 
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 <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Marko Lindqvist
2012-12-15 17:54:06 +00:00
committed by Martin Jansa
parent 70129e0cd1
commit 4b5d2af979
3 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
+4 -5
View File
@@ -1,11 +1,10 @@
Index: SDL_mixer-1.2.11/configure.in 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.11.orig/configure.in 2011-02-15 11:54:23.929086120 +0100 +++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200
+++ SDL_mixer-1.2.11/configure.in 2011-02-15 11:56:53.745736645 +0100
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(README) 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 dnl Set various version strings - taken gratefully from the GTk sources
meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff
-28
View File
@@ -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])
meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.11.bb → meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
+5 -5
View File
@@ -1,15 +1,15 @@
DESCRIPTION = "Simple DirectMedia Layer mixer library." DESCRIPTION = "Simple DirectMedia Layer mixer library."
SECTION = "libs" SECTION = "libs"
DEPENDS = "virtual/libsdl flac libmikmod libvorbis ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" DEPENDS = "virtual/libsdl flac libmikmod libvorbis ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
LICENSE = "LGPLv2.1" LICENSE = "zlib"
LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d"
SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
file://fix-flac-madness.diff \
file://configure.patch \ file://configure.patch \
" "
SRC_URI[md5sum] = "65ada3d997fe85109191a5fb083f248c"
SRC_URI[sha256sum] = "86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9" SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
S = "${WORKDIR}/SDL_mixer-${PV}" S = "${WORKDIR}/SDL_mixer-${PV}"