[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 01/01: debian/patches/01_fix-modplug-linking.patch

[Sjoerd Simons]

This is an automated email from the git hooks/post-receive script.

sjoerd pushed a commit to branch master
in repository gst-plugins-bad1.0.

commit 1af8e41f83c712c4112fb69bc39d42d7d37b1b2b
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Tue Jul 1 12:57:25 2014 +0200

    debian/patches/01_fix-modplug-linking.patch
    
    * debian/patches/01_fix-modplug-linking.patch
      - Re-add. Fixes link issues on i386
---
 debian/changelog                            |  7 ++++++-
 debian/patches/01_fix-modplug-linking.patch | 16 ++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1ebe6b2..614fe18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 gst-plugins-bad1.0 (1.3.90-2) UNRELEASED; urgency=medium
 
+  [ Sebastian Dröge ]
   * debian/gstreamer-plugins-bad.install:
     + Include mpeg2enc plugin.
 
- -- Sebastian Dröge <slomo at debian.org>  Sat, 28 Jun 2014 14:03:17 +0200
+  [ Sjoerd Simons ]
+  * debian/patches/01_fix-modplug-linking.patch
+    - Re-add. Fixes link issues on i386
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 01 Jul 2014 12:56:54 +0200
 
 gst-plugins-bad1.0 (1.3.90-1) experimental; urgency=medium
 
diff --git a/debian/patches/01_fix-modplug-linking.patch b/debian/patches/01_fix-modplug-linking.patch
new file mode 100644
index 0000000..2a03069
--- /dev/null
+++ b/debian/patches/01_fix-modplug-linking.patch
@@ -0,0 +1,16 @@
+Description: Tell libtool not to deduplicate linked libraries which causes problems in the case of circular deps. Force -lc to be added at the end.
+Author: Iain Lane <iain.lane at canonical.com>
+
+--- a/ext/modplug/Makefile.am
++++ b/ext/modplug/Makefile.am
+@@ -2,8 +2,8 @@
+ 
+ libgstmodplug_la_SOURCES = gstmodplug.cc
+ libgstmodplug_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MODPLUG_CFLAGS)
+-libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(LIBM) $(MODPLUG_LIBS)
++libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(LIBM) $(MODPLUG_LIBS) -lc
+ libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+-libgstmodplug_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
++libgstmodplug_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) --preserve-dup-deps
+ 
+ noinst_HEADERS = gstmodplug.h
diff --git a/debian/patches/series b/debian/patches/series
index 685da25..6d98219 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_fix-modplug-linking.patch
 02_opencv-linking.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-bad1.0.git