diff -Nru alsa-plugins-1.0.27/debian/changelog alsa-plugins-1.0.27/debian/changelog --- alsa-plugins-1.0.27/debian/changelog 2014-02-17 13:58:34.000000000 -0500 +++ alsa-plugins-1.0.27/debian/changelog 2014-04-06 18:46:39.000000000 -0400 @@ -1,3 +1,10 @@ +alsa-plugins (1.0.27-3.1) experimental; urgency=low + + * Non-maintainer upload. + * Compile against Libav10 in experimental + + -- Reinhard Tartler Sun, 06 Apr 2014 18:46:38 -0400 + alsa-plugins (1.0.27-3) UNRELEASED; urgency=medium [ Elimar Riesebieter ] diff -Nru alsa-plugins-1.0.27/debian/control alsa-plugins-1.0.27/debian/control --- alsa-plugins-1.0.27/debian/control 2014-02-17 13:45:58.000000000 -0500 +++ alsa-plugins-1.0.27/debian/control 2014-04-06 18:52:55.000000000 -0400 @@ -8,8 +8,9 @@ debhelper (>= 9), dh-autoreconf, libasound2-dev (>= 1.0.25), - libavcodec-dev, - libavutil-dev, + libavcodec-dev (>= 6:10~), + libavresample-dev (>= 6:10~), + libavutil-dev (>= 6:10~), libdbus-1-dev (>= 1.4.12-3~), libjack-dev (>= 1:0.121.0+svn4538-2~), libpulse-dev (>= 0.99.1-1~), diff -Nru alsa-plugins-1.0.27/debian/patches/build-latest-avcodec.patch alsa-plugins-1.0.27/debian/patches/build-latest-avcodec.patch --- alsa-plugins-1.0.27/debian/patches/build-latest-avcodec.patch 2014-04-06 17:14:59.000000000 -0400 +++ alsa-plugins-1.0.27/debian/patches/build-latest-avcodec.patch 2014-04-06 18:55:46.000000000 -0400 @@ -10,9 +10,8 @@ a52/pcm_a52.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff -Naurd a/a52/pcm_a52.c b/a52/pcm_a52.c ---- a/a52/pcm_a52.c 2014-04-06 23:08:20.170546320 +0200 -+++ b/a52/pcm_a52.c 2014-04-06 23:10:18.538660707 +0200 +--- a/a52/pcm_a52.c ++++ b/a52/pcm_a52.c @@ -52,6 +52,10 @@ #endif #endif @@ -24,7 +23,7 @@ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 95, 0) #ifndef AV_SAMPLE_FMT_S16 #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 -@@ -864,7 +868,7 @@ +@@ -864,7 +868,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) if (rec->codec == NULL) rec->codec = avcodec_find_encoder_by_name("ac3"); if (rec->codec == NULL) @@ -33,3 +32,25 @@ if (rec->codec == NULL) { SNDERR("Cannot find codec engine"); err = -EINVAL; +--- a/configure.in ++++ b/configure.in +@@ -67,7 +67,7 @@ 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 libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) ++ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavresample libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) + fi + + if test "x$HAVE_AVCODEC" = "xno"; then +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,7 +9,7 @@ if HAVE_SAMPLERATE + SUBDIRS += rate + endif + if HAVE_AVCODEC +-SUBDIRS += a52 rate-lavc ++SUBDIRS += a52 # rate-lavc - this plugin needs to be ported to libavresample + endif + if HAVE_MAEMO_PLUGIN + SUBDIRS += maemo