diff --git a/packages/multimedia/SDL/package.mk b/packages/multimedia/SDL/package.mk index d3fc66849e..55c279e685 100644 --- a/packages/multimedia/SDL/package.mk +++ b/packages/multimedia/SDL/package.mk @@ -25,7 +25,7 @@ PKG_SITE="http://www.libsdl.org/" PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="" PKG_DEPENDS_TARGET="alsa-lib" -PKG_BUILD_DEPENDS_HOST="toolchain yasm:host alsa-lib" # todo: hack: autoreconf depends on alsa-lib's m4 files, so build here +PKG_BUILD_DEPENDS_HOST="toolchain yasm:host" PKG_BUILD_DEPENDS_TARGET="toolchain yasm:host alsa-lib" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/multimedia/SDL/patches/SDL-1.2.15-alsa-meh.patch b/packages/multimedia/SDL/patches/SDL-1.2.15-alsa-meh.patch new file mode 100644 index 0000000000..db96273e8d --- /dev/null +++ b/packages/multimedia/SDL/patches/SDL-1.2.15-alsa-meh.patch @@ -0,0 +1,68 @@ +From 5bdb0f83add08b47b577e3f4b9c12685a77b7a5b Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Wed, 22 Jan 2014 23:12:17 +0200 +Subject: [PATCH] alsa? meh + +--- + configure.in | 38 -------------------------------------- + 1 files changed, 0 insertions(+), 38 deletions(-) + +diff --git a/configure.in b/configure.in +index 48369ef..c03f5fc 100644 +--- a/configure.in ++++ b/configure.in +@@ -355,43 +355,6 @@ AC_HELP_STRING([--enable-oss], [support the OSS audio API [[default=yes]]]), + fi + } + +-dnl See if the ALSA audio interface is supported +-CheckALSA() +-{ +- AC_ARG_ENABLE(alsa, +-AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]), +- , enable_alsa=yes) +- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then +- AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no) +- # Restore all flags from before the ALSA detection runs +- CFLAGS="$alsa_save_CFLAGS" +- LDFLAGS="$alsa_save_LDFLAGS" +- LIBS="$alsa_save_LIBS" +- if test x$have_alsa = xyes; then +- AC_ARG_ENABLE(alsa-shared, +-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]), +- , enable_alsa_shared=yes) +- alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] +- +- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA) +- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c" +- EXTRA_CFLAGS="$EXTRA_CFLAGS $ALSA_CFLAGS" +- if test x$have_loadso != xyes && \ +- test x$enable_alsa_shared = xyes; then +- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading]) +- fi +- if test x$have_loadso = xyes && \ +- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then +- echo "-- dynamic libasound -> $alsa_lib" +- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib") +- else +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS" +- fi +- have_audio=yes +- fi +- fi +-} +- + dnl Check whether we want to use IRIX 6.5+ native audio or not + CheckDMEDIA() + { +@@ -2367,7 +2330,6 @@ case "$host" in + CheckOSS + CheckDMEDIA + CheckMME +- CheckALSA + CheckARTSC + CheckESD + CheckPulseAudio +-- +1.7.2.5 +