Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/alsa-plugins/files: alsa-plugins-1.0.17-automagic.patch
Date: Sat, 02 Aug 2008 21:00:33
Message-Id: E1KPODG-0004B1-T0@stork.gentoo.org
1 betelgeuse 08/08/02 21:00:30
2
3 Added: alsa-plugins-1.0.17-automagic.patch
4 Log:
5 Version bump. Fixes bug #227043. Thanks to chutzpah for the help.
6 (Portage version: 2.2_rc4/cvs/Linux 2.6.26-gentoo i686)
7
8 Revision Changes Path
9 1.1 media-plugins/alsa-plugins/files/alsa-plugins-1.0.17-automagic.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/alsa-plugins/files/alsa-plugins-1.0.17-automagic.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/alsa-plugins/files/alsa-plugins-1.0.17-automagic.patch?rev=1.1&content-type=text/plain
13
14 Index: alsa-plugins-1.0.17-automagic.patch
15 ===================================================================
16 diff -ur alsa-plugins-1.0.17.orig/configure.in alsa-plugins-1.0.17/configure.in
17 --- alsa-plugins-1.0.17.orig/configure.in 2008-07-30 22:01:02.000000000 -0400
18 +++ alsa-plugins-1.0.17/configure.in 2008-07-30 22:04:59.000000000 -0400
19 @@ -15,13 +15,25 @@
20 AC_CHECK_LIB(asound, snd_pcm_ioplug_create,,
21 AC_ERROR([*** libasound has no external plugin SDK]), -ldl)
22
23 -PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no])
24 +AC_ARG_ENABLE([jack],
25 + AC_HELP_STRING([--disable-jack], [Disable building of JACK plugin]))
26 +if test "x$enable_jack" != "xno"; then
27 + PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no])
28 +fi
29 AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes)
30
31 -PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no])
32 +AC_ARG_ENABLE([pulseaudio],
33 + AC_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin]))
34 +if test "x$enable_pulseaudio" != "xno"; then
35 + PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no])
36 +fi
37 AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes)
38
39 -PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no])
40 +AC_ARG_ENABLE([samplerate],
41 + AC_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin]))
42 +if test "x$enable_samplerate" != "xno"; then
43 + PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no])
44 +fi
45 AM_CONDITIONAL(HAVE_SAMPLERATE, test x$HAVE_SAMPLERATE = xyes)
46
47 AC_ARG_ENABLE([maemo-plugin],
48 @@ -45,6 +57,8 @@
49 fi
50 fi
51
52 +AC_ARG_ENABLE([avcodec],
53 + AC_HELP_STRING([--disable-avcodec], [Disable building of avcodec code (a52 plugin)]))
54 AC_ARG_WITH([avcodec-includedir],
55 AS_HELP_STRING([--with-avcodec-includedir=dir],
56 [AVcodec include directory]),
57 @@ -60,9 +74,11 @@
58 AC_SUBST(AVCODEC_CFLAGS)
59 AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec"
60 AC_SUBST(AVCODEC_LIBS)
61 -AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
62 -if test x$HAVE_AVCODEC = xyes; then
63 - AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
64 +if test "x$enable_avcodec" != "xno"; then
65 + AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
66 + if test x$HAVE_AVCODEC = xyes; then
67 + AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
68 + fi
69 fi
70 AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
71 CFLAGS="$CFLAGS_saved"