summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-21 16:19:55 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-21 16:19:55 +0000
commitfa6986c6173ddf0954a6cd7e62b48492c6c1b3ad (patch)
tree9ffd25461bfad7e334c9bdf92526d59853ab289b /media-plugins/alsa-plugins
parentold (diff)
downloadhistorical-fa6986c6173ddf0954a6cd7e62b48492c6c1b3ad.tar.gz
historical-fa6986c6173ddf0954a6cd7e62b48492c6c1b3ad.tar.bz2
historical-fa6986c6173ddf0954a6cd7e62b48492c6c1b3ad.zip
old
Package-Manager: portage-2.2_rc38/cvs/Linux x86_64
Diffstat (limited to 'media-plugins/alsa-plugins')
-rw-r--r--media-plugins/alsa-plugins/Manifest5
-rw-r--r--media-plugins/alsa-plugins/files/1.0.14_rc3-gcd.h56
-rw-r--r--media-plugins/alsa-plugins/files/alsa-plugins-1.0.11-automagic.patch52
-rw-r--r--media-plugins/alsa-plugins/files/alsa-plugins-1.0.12-automagic.patch52
-rw-r--r--media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-automagic.patch64
-rw-r--r--media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch77
6 files changed, 0 insertions, 306 deletions
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index be0fb43e25f7..29d2e01f7b6e 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,10 +1,5 @@
-AUX 1.0.14_rc3-gcd.h 1567 RMD160 23b2bd9c9d6cb35e60d5bc56a95a58e6de4c6935 SHA1 e06b6cf70e63d3600de36b6287dcbe85702f4764 SHA256 7a46d8751b1f6bfe0c44b1a62d68452d2c8f4283af00e56e4b97af77d0ce47a1
-AUX alsa-plugins-1.0.11-automagic.patch 2387 RMD160 7ba1283bd2ac8c94b690db18ed80f2154df4e755 SHA1 fd6242d06959e20ecf4f69dabefd0f29e2fe192c SHA256 ce8a8a7de749167dce31008283045548077fc8a29704ab7742071e7deff87d39
-AUX alsa-plugins-1.0.12-automagic.patch 2414 RMD160 bef06a60e3a97d3a672df70314113e7d35a159fc SHA1 93a44aa404869de2f6966a18b0b9f614e56dfdd1 SHA256 95d0bf84d68d2c8452b926d9dba4bf7a0c35c107b850d05dc78df6e9d7de29e0
-AUX alsa-plugins-1.0.14_rc1-automagic.patch 2892 RMD160 46c8541aa738d7f1b78c07318bc26bb7739020f2 SHA1 ad5ff0d6c6eb807ce06d71d2dff2600877bc3ac6 SHA256 04a820b2c2a0ce7c518fceafa290965b9caec62a6293938b74c1c828080f2ce0
AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa SHA1 ac1839723063fcf3286d1ddf1bd291ba6c0b1220 SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e
AUX alsa-plugins-1.0.17-automagic.patch 2409 RMD160 9a4f13962e395de52c9b1b5c4d38e2f7d5f5b97d SHA1 e389bfbdb2d0d50f577e36a7cf00b58b752a2621 SHA256 5272c5f0d86d577f517d0652a4b7eee9977adb25aefa71d0a8690e5bc1607df0
-AUX alsa-plugins-1.0.18-automagic.patch 2980 RMD160 792d3b3c49849a47dba14db36a552531928f434e SHA1 42975db4ed1c14805e1c9656f238d98d72c94f12 SHA256 bcdf59d7d2d55498cb67b14dd6539c6b7944d837aa504f3f3993e130d1c4bbd3
AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a
AUX alsa-plugins-1.0.19-speex.patch 2741 RMD160 60df99a4085979c313ffc69b2444d7acd81d0ea2 SHA1 294ceb536f66dd81b09ecdae436780439a3d6e2d SHA256 2768121c051d4ddd1581b8a5790369136591538550d2ca48c0f32816c03310f4
AUX alsa-plugins-1.0.20-automagic.patch 343 RMD160 62e4ace9f1413fc61aa5193a7ff6052e1d898fd5 SHA1 e81137ffaf7e28c22609aa851995dbc6a59d4f29 SHA256 e9fbdf06516a49bd64fe3011b9bcbcf2723befc6f71a231b95cb3c5008e4f213
diff --git a/media-plugins/alsa-plugins/files/1.0.14_rc3-gcd.h b/media-plugins/alsa-plugins/files/1.0.14_rc3-gcd.h
deleted file mode 100644
index 672084c1e367..000000000000
--- a/media-plugins/alsa-plugins/files/1.0.14_rc3-gcd.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Fast implementation of greatest common divisor using the binary algorithm.
- * Copyright (c) 2007 Nicholas Kain
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-/* computes gcd using binary algorithm */
-static int gcd(int a, int b)
-{
- int s,d;
-
- if (!a || !b)
- return a | b;
-
- for (s=0; ((a|b)&1) == 0; ++s) {
- a >>= 1;
- b >>= 1;
- }
-
- while ((a&1) == 0)
- a >>= 1;
-
- do {
- while ((b&1) == 0) {
- b >>= 1;
- }
- if (a<b) {
- b -= a;
- } else {
- d = a-b;
- a = b;
- b = d;
- }
- b >>= 1;
- } while (b);
-
- return a << s;
-}
-
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.11-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.11-automagic.patch
deleted file mode 100644
index 30d540a54237..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.11-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: alsa-plugins-1.0.11/configure.in
-===================================================================
---- alsa-plugins-1.0.11.orig/configure.in
-+++ alsa-plugins-1.0.11/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(polypaudio, [polyplib], [HAVE_POLYP=yes], [HAVE_POLYP=no])
-+AC_ARG_ENABLE([polypaudio],
-+ AC_HELP_STRING([--disable-polypaudio], [Disable building of polypaudio plugin]))
-+if test "x$enable_polypaudio" != "xno"; then
-+ PKG_CHECK_MODULES(polypaudio, [polyplib], [HAVE_POLYP=yes], [HAVE_POLYP=no])
-+fi
- AM_CONDITIONAL(HAVE_POLYP, test x$HAVE_POLYP = 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"
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
deleted file mode 100644
index d1b380cbaa0d..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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"
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-automagic.patch
deleted file mode 100644
index 4e86d5f428d4..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-automagic.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: alsa-plugins-1.0.12rc1/configure.in
-===================================================================
---- alsa-plugins-1.0.12rc1.orig/configure.in
-+++ alsa-plugins-1.0.12rc1/configure.in
-@@ -13,22 +13,40 @@ 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)
-
--PKG_CHECK_MODULES(DBUS, [dbus-1], [HAVE_DBUS=yes], [HAVE_DBUS=no])
-+AC_ARG_ENABLE([dbus],
-+ AC_HELP_STRING([--disable-dbus], [Disable using of dbus server as resource manager plugin]))
-+if test "x$enable_dbus" != "xno"; then
-+ PKG_CHECK_MODULES(DBUS, [dbus-1], [HAVE_DBUS=yes], [HAVE_DBUS=no])
-+fi
- AM_CONDITIONAL(HAVE_DBUS, test x$HAVE_DBUS = xyes)
-
- if test "$HAVE_DBUS" = "yes"; then
- AC_DEFINE(USE_RESOURCE_MANAGER, 1,"Use dbus server as a resouce manager")
- fi
-
-+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"
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch
deleted file mode 100644
index a85114d7a990..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8e4cd0e52ceda7acbf52616beadf7a355208400e Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Thu, 13 Nov 2008 13:10:31 +0100
-Subject: [PATCH] Allow opt-out from jack, pulseaudio and avcodec dependencies.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Without this patch the jack, pulseaudio and avcodec discovery was
-"automagic", without a way for the user to disable the relative
-plugins if the dependencies are installed but the plugin is unwanted.
-
-This patch does not change the default behaviour but allows to opt-out
-from the plugins by passing the relative --without option at
-./configure time.
-
-Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
----
- configure.in | 31 ++++++++++++++++++++++++++-----
- 1 files changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 9efb890..4b5b278 100644
---- a/configure.in
-+++ b/configure.in
-@@ -15,13 +15,28 @@ 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],
-+ AS_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],
-+ AS_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],
-+ AS_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([maemo-plugin],
-@@ -45,8 +60,14 @@ if test "$use_maemo_rm" = "yes"; then
- fi
- fi
-
--PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
--if test "$HAVE_AVCODEC" != "yes"; then
-+AC_ARG_ENABLE([avcodec],
-+ AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)]))
-+
-+if test "x$enable_avcodec" != "xno"; then
-+ PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
-+fi
-+
-+if test "x$HAVE_AVCODEC" = "xno"; then
- AC_ARG_WITH([avcodec-includedir],
- AS_HELP_STRING([--with-avcodec-includedir=dir],
- [AVcodec include directory]),
---
-1.6.0.3
-