[SCM] mjpegtools/master: pick-up patches from Ubuntu to fix linking related FTBFS

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 328fb3dfc035123b53ec7ea51c10b76c3c826c1e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 11:42:08 2012 +0200

    pick-up patches from Ubuntu to fix linking related FTBFS

diff --git a/debian/patches/13_fix_lav2yuv_linking.diff b/debian/patches/13_fix_lav2yuv_linking.diff
new file mode 100644
index 0000000..2a0ae01
--- /dev/null
+++ b/debian/patches/13_fix_lav2yuv_linking.diff
@@ -0,0 +1,16 @@
+From: Daniel T Chen <crimsun at ubuntu.com>
+Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
+
+Index: mjpegtools-1.9.0/lavtools/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0.orig/lavtools/Makefile.am	2011-08-29 09:56:16.000000000 -0400
++++ mjpegtools-1.9.0/lavtools/Makefile.am	2011-08-29 09:57:37.000000000 -0400
+@@ -146,7 +146,7 @@
+ lav2yuv_SOURCES = lav2yuv.c lav_common.c
+ lav2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS)
+ lav2yuv_LDADD = $(LIBMJPEGUTILS) \
+-		liblavfile.la liblavjpeg.la
++		liblavfile.la liblavjpeg.la -ldv
+ 
+ jpeg2yuv_SOURCES = jpeg2yuv.c
+ jpeg2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
diff --git a/debian/patches/14_fix_mplex_linking.diff b/debian/patches/14_fix_mplex_linking.diff
new file mode 100644
index 0000000..5812fbd
--- /dev/null
+++ b/debian/patches/14_fix_mplex_linking.diff
@@ -0,0 +1,15 @@
+From: Daniel T Chen <crimsun at ubuntu.com>
+Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
+
+Index: mjpegtools-1.9.0/mplex/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0.orig/mplex/Makefile.am	2011-08-29 10:08:49.000000000 -0400
++++ mjpegtools-1.9.0/mplex/Makefile.am	2011-08-29 10:09:19.000000000 -0400
+@@ -83,5 +83,6 @@
+ 
+ mplex_DEPENDENCIES = libmplex2.la
+ 
+-mplex_LDADD = libmplex2.la @LIBGETOPT_LIB@ $(LIBM_LIBS)
++mplex_LDADD = libmplex2.la @LIBGETOPT_LIB@ $(LIBM_LIBS) \
++	$(top_builddir)/utils/libmjpegutils.la
+ 
diff --git a/debian/patches/15_fix_qttoy4m_linking.diff b/debian/patches/15_fix_qttoy4m_linking.diff
new file mode 100644
index 0000000..f948421
--- /dev/null
+++ b/debian/patches/15_fix_qttoy4m_linking.diff
@@ -0,0 +1,23 @@
+From: Daniel T Chen <crimsun at ubuntu.com>
+Subject: Link explicitly against the built libmjpegutils. Fixes FTBFS.
+
+Index: mjpegtools-1.9.0/y4mutils/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0.orig/y4mutils/Makefile.am	2011-08-29 10:14:03.000000000 -0400
++++ mjpegtools-1.9.0/y4mutils/Makefile.am	2011-08-29 10:17:15.000000000 -0400
+@@ -54,11 +54,13 @@
+ if HAVE_LIBQUICKTIME
+ y4mtoqt_SOURCES = y4mtoqt.c
+ y4mtoqt_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lavtools $(LIBQUICKTIME_CFLAGS)
+-y4mtoqt_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la
++y4mtoqt_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la \
++	-lquicktime
+ 
+ qttoy4m_SOURCES = qttoy4m.c
+ qttoy4m_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lavtools $(LIBQUICKTIME_CFLAGS)
+-qttoy4m_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la
++qttoy4m_LDADD = $(LIBMJPEGUTILS) $(top_builddir)/lavtools/liblavfile.la \
++	-lquicktime
+ endif
+ 
+ y4mtoyuv_SOURCES = y4mtoyuv.c
diff --git a/debian/patches/series b/debian/patches/series
index 053b6f1..7a84457 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,6 @@
 10_usr_local.patch
 11_fix_ftbfs_gcc4.7.patch
 12_make_v4l_optional.patch
+13_fix_lav2yuv_linking.diff
+14_fix_mplex_linking.diff
+15_fix_qttoy4m_linking.diff

-- 
mjpegtools packaging