[SCM] transcode/master: Fix underlinkage of some plugins

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b2dc483c26a41133f83a63755424efea0b72dcda
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Dec 21 16:09:42 2013 +0100

    Fix underlinkage of some plugins

diff --git a/debian/patches/11-underlinkage.patch b/debian/patches/11-underlinkage.patch
new file mode 100644
index 0000000..af46cd8
--- /dev/null
+++ b/debian/patches/11-underlinkage.patch
@@ -0,0 +1,55 @@
+Description: Fix underlinkage of some plugins
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2013-12-21
+
+--- a/import/Makefile.am
++++ b/import/Makefile.am
+@@ -140,12 +140,12 @@
+ import_dvd_la_SOURCES = import_dvd.c ac3scan.c dvd_reader.c clone.c ioaux.c frame_info.c ivtc.c
+ import_dvd_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDVDREAD_CFLAGS)
+ import_dvd_la_LDFLAGS = -module -avoid-version
+-import_dvd_la_LIBADD = $(LIBDVDREAD_LIBS)
++import_dvd_la_LIBADD = $(LIBDVDREAD_LIBS) $(PTHREAD_LIBS)
+ 
+ import_ffmpeg_la_SOURCES = import_ffmpeg.c
+-import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS)
++import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS)
+ import_ffmpeg_la_LDFLAGS = -module -avoid-version
+-import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS)
++import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS)
+ 
+ import_im_la_SOURCES = import_im.c
+ import_im_la_CPPFLAGS = $(AM_CPPFLAGS) $(IMAGEMAGICK_CFLAGS)
+@@ -208,6 +208,7 @@
+ import_vob_la_SOURCES = import_vob.c ac3scan.c clone.c ioaux.c frame_info.c ivtc.c
+ import_vob_la_CPPFLAGS = $(AM_CPPFLAGS)
+ import_vob_la_LDFLAGS =	-module -avoid-version
++import_vob_la_LIBADD = $(PTHREAD_LIBS)
+ 
+ import_xml_la_SOURCES = import_xml.c ioxml.c probe_xml.c
+ import_xml_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBXML2_CFLAGS)
+--- a/filter/extsub/Makefile.am
++++ b/filter/extsub/Makefile.am
+@@ -11,8 +11,10 @@
+ 
+ filter_extsub_la_SOURCES = filter_extsub.c subproc.c subtitle_buffer.c
+ filter_extsub_la_LDFLAGS = -module -avoid-version
++filter_extsub_la_LIBADD = $(PTHREAD_LIBS)
+ 
+ filter_extsub2_la_SOURCES = filter_extsub.c subproc.c subtitle_buffer.c
+ filter_extsub2_la_LDFLAGS = -module -avoid-version
++filter_extsub2_la_LIBADD = $(PTHREAD_LIBS)
+ 
+ EXTRA_DIST = subproc.h subtitle_buffer.h
+--- a/filter/subtitler/Makefile.am
++++ b/filter/subtitler/Makefile.am
+@@ -38,7 +38,8 @@
+ 	-lXt \
+ 	-lm \
+ 	$(FREETYPE2_LIBS) \
+-	$(ICONV_LIBS)
++	$(ICONV_LIBS) \
++	$(PTHREAD_LIBS)
+ 
+ EXTRA_DIST = \
+ 	CHANGES \
diff --git a/debian/patches/series b/debian/patches/series
index 5474b14..b2be685 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ ac3-audio-track-number.patch
 08_libav9-opt.patch
 09_libav9-arch.patch
 10-freetype.patch
+11-underlinkage.patch

-- 
transcode packaging