From 4e846d31e9b4441c35fbffadcd1f70c4f84563c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 26 Dec 2006 02:33:17 +0000 Subject: [PATCH] The wrong patch was removed, restore and close bug #158912, thanks to Carl Fongheiser for reporting. Package-Manager: portage-2.1.2_rc4-r1 --- media-plugins/alsa-plugins/ChangeLog | 8 ++- .../files/alsa-plugins-1.0.12-automagic.patch | 52 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 media-plugins/alsa-plugins/files/alsa-plugins-1.0.12-automagic.patch diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog index aaa220db86b7..52f058d35766 100644 --- a/media-plugins/alsa-plugins/ChangeLog +++ b/media-plugins/alsa-plugins/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/alsa-plugins # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.36 2006/12/21 14:31:36 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.37 2006/12/26 02:33:17 flameeyes Exp $ + + 26 Dec 2006; Diego Pettenò + +files/alsa-plugins-1.0.12-automagic.patch, + -files/alsa-plugins-1.0.12_rc1-automagic.patch: + The wrong patch was removed, restore and close bug #158912, thanks to Carl + Fongheiser for reporting. 21 Dec 2006; Bryan Østergaard alsa-plugins-1.0.13.ebuild: diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12-automagic.patch new file mode 100644 index 000000000000..d1b380cbaa0d --- /dev/null +++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12-automagic.patch @@ -0,0 +1,52 @@ +Index: alsa-plugins-1.0.12rc1/configure.in +=================================================================== +--- alsa-plugins-1.0.12rc1.orig/configure.in ++++ alsa-plugins-1.0.12rc1/configure.in +@@ -13,15 +13,29 @@ PKG_CHECK_MODULES(ALSA, alsa >= 1.0.11) + AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, + AC_ERROR([*** libasound has no external plugin SDK]), -ldl) + +-PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) ++AC_ARG_ENABLE([jack], ++ AC_HELP_STRING([--disable-jack], [Disable building of JACK plugin])) ++if test "x$enable_jack" != "xno"; then ++ PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) ++fi + AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes) + +-PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no]) ++AC_ARG_ENABLE([pulseaudio], ++ AC_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin])) ++if test "x$enable_pulseaudio" != "xno"; then ++ PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no]) ++fi + AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes) + +-PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no]) ++AC_ARG_ENABLE([samplerate], ++ AC_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin])) ++if test "x$enable_samplerate" != "xno"; then ++ PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no]) ++fi + AM_CONDITIONAL(HAVE_SAMPLERATE, test x$HAVE_SAMPLERATE = xyes) + ++AC_ARG_ENABLE([avcodec], ++ AC_HELP_STRING([--disable-avcodec], [Disable building of avcodec code (a52 plugin)])) + AC_ARG_WITH([avcodec-includedir], + [--with-avcodec-includedir=dir AVcodec include directory], + [AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""]) +@@ -35,9 +49,11 @@ LDFLAGS="$LDFLAGS $AVCODEC_LIBS" + AC_SUBST(AVCODEC_CFLAGS) + AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec" + AC_SUBST(AVCODEC_LIBS) +-AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) +-if test x$HAVE_AVCODEC = xyes; then +- AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no]) ++if test "x$enable_avcodec" != "xno"; then ++ AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) ++ if test x$HAVE_AVCODEC = xyes; then ++ AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no]) ++ fi + fi + AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) + CFLAGS="$CFLAGS_saved" -- 2.26.2