Merge lp:~jtaylor/ubuntu/oneiric/xawtv/fix-821916 into lp:ubuntu/oneiric/xawtv

[Julian Taylor]

fix loading of plugins which where not correctly linked.

[Felix Geyer (debfx)]

Merged, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-04 19:27:05 +0000
+++ debian/changelog	2011-08-06 21:36:00 +0000
@@ -1,3 +1,10 @@
+xawtv (3.95.dfsg.1-8.1ubuntu5) oneiric; urgency=low
+
+  * Add 104_fix_plugin_links.dpatch: (LP: #821916)
+    - link some plugins against libm and libjpeg
+
+ -- Julian Taylor <[e-mail]>  Sat, 06 Aug 2011 23:19:29 +0200
+
 xawtv (3.95.dfsg.1-8.1ubuntu4) oneiric; urgency=low
 
   * No-change rebuild to pick libquicktime's new shlib (LP: #773968).

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2011-01-09 17:14:14 +0000
+++ debian/patches/00list	2011-08-06 21:36:00 +0000
@@ -20,3 +20,4 @@
 101_fedora-nodga.dpatch
 102_fedora-use_libv4l.dpatch
 103_fix_ftbfs_no-add-needed.dpatch
+104_fix_plugin_links.dpatch

=== added file 'debian/patches/104_fix_plugin_links.dpatch'
--- debian/patches/104_fix_plugin_links.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/104_fix_plugin_links.dpatch	2011-08-06 21:36:00 +0000
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: link plugins against libma and libjpeg
+## Author: Julian Taylor <[e-mail]>
+## Bug: https://bugs.launchpad.net/ubuntu/+source/xawtv/+bug/821916
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' xawtv-3.95.dfsg.1~/libng/plugins/Subdir.mk xawtv-3.95.dfsg.1/libng/plugins/Subdir.mk
+--- xawtv-3.95.dfsg.1~/libng/plugins/Subdir.mk	2003-02-14 14:14:05.000000000 +0000
++++ xawtv-3.95.dfsg.1/libng/plugins/Subdir.mk	2011-08-06 20:51:42.628830920 +0000
+@@ -42,6 +42,9 @@
+ libng/plugins/read-dv.so  : LDLIBS := $(DV_LIBS)
+ libng/plugins/write-dv.so : LDLIBS := $(DV_LIBS)
+ libng/plugins/drv0-v4l2.so: LDLIBS := -lv4l2
++libng/plugins/flt-disor.so: LDLIBS := -lm
++libng/plugins/flt-gamma.so: LDLIBS := -lm
++libng/plugins/conv-mjpeg.so: LDLIBS := -ljpeg
+ 
+ # global targets
+ all:: $(TARGETS-plugins)