diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-07-01 12:57:25 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-07-01 13:00:01 +0200 |
| commit | 1af8e41f83c712c4112fb69bc39d42d7d37b1b2b (patch) | |
| tree | 074a9c8b98c92291991bd256ac2dd485484139c2 | |
| parent | 1fef6e4b5f119b1dd9e39215a90555915c15de05 (diff) | |
debian/patches/01_fix-modplug-linking.patch
* debian/patches/01_fix-modplug-linking.patch
- Re-add. Fixes link issues on i386
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/01_fix-modplug-linking.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 23 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1ebe6b2b..614fe184 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@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@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 00000000..2a030694 --- /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@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 685da252..6d982195 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +01_fix-modplug-linking.patch 02_opencv-linking.patch |