[SCM] transcode/master: Move underlink patch and fix underlinkage in filter_resample

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d204d7a9e9a912af4ba69e9bcc3d60e7930a2352
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Mar 1 17:50:22 2014 +0100

    Move underlink patch and fix underlinkage in filter_resample

diff --git a/debian/patches/12_underlinkage.patch b/debian/patches/12_underlinkage.patch
index af46cd8..e396d51 100644
--- a/debian/patches/12_underlinkage.patch
+++ b/debian/patches/12_underlinkage.patch
@@ -53,3 +53,44 @@ Last-Update: 2013-12-21
  
  EXTRA_DIST = \
  	CHANGES \
+--- a/configure.in
++++ b/configure.in
+@@ -601,11 +601,24 @@
+   dnl
+   TC_PKG_CONFIG_CHECK(libavformat, "$enable_ffmpeg", LIBAVFORMAT, libavformat, [http://www.ffmpeg.org/])
+ 
++  dnl
++  dnl libavutil
++  dnl
++  TC_PKG_CONFIG_CHECK(libavutil, "$enable_ffmpeg", LIBAVUTIL, libavutil, [http://www.ffmpeg.org/])
++
++  dnl
++  dnl libavresample
++  dnl
++  TC_PKG_CONFIG_CHECK(libavresample, "$enable_ffmpeg", LIBAVRESAMPLE, libavresample, [http://www.ffmpeg.org/])
++
++
+   AC_DEFINE([HAVE_FFMPEG], 1, [Have FFmpeg libraries support])
+ fi
+ 
+ TC_PKG_HAVE(libavcodec, LIBAVCODEC)
+ TC_PKG_HAVE(libavformat, LIBAVFORMAT)
++TC_PKG_HAVE(libavutil, LIBAVUTIL)
++TC_PKG_HAVE(libavresample, LIBAVRESAMPLE)
+ 
+ AM_CONDITIONAL(HAVE_FFMPEG, test x"$enable_ffmpeg" = x"yes")
+ 
+--- a/filter/Makefile.am
++++ b/filter/Makefile.am
+@@ -205,9 +205,9 @@
+ filter_skip_la_LDFLAGS = -module -avoid-version
+ 
+ filter_resample_la_SOURCES = filter_resample.c
+-filter_resample_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVCODEC_CFLAGS)
++filter_resample_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBAVRESAMPLE_CFLAGS) $(LIBAVUTIL_CFLAGS)
+ filter_resample_la_LDFLAGS = -module -avoid-version
+-filter_resample_la_LIBADD = $(LIBAVCODEC_LIBS)
++filter_resample_la_LIBADD = $(LIBAVCODEC_LIBS) $(LIBAVRESAMPLE_LIBS) $(LIBAVUTIL_LIBS)
+ 
+ filter_slowmo_la_SOURCES = filter_slowmo.c
+ filter_slowmo_la_LDFLAGS = -module -avoid-version
diff --git a/debian/patches/series b/debian/patches/series
index 3521148..e564798 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,5 @@ ac3-audio-track-number.patch
 08_libav9-opt.patch
 09_libav9-arch.patch
 10_freetype.patch
-11_underlinkage.patch
 11_libav10.patch
+12_underlinkage.patch

-- 
transcode packaging