New upstream development snapshot.debian/1.1.4-1

8 files changed, 40 insertions, 5 deletions

diff --git a/debian/build-deps b/debian/build-deps
index efd49d97..1988abc5 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -34,7 +34,7 @@ libglib2.0-dev (>= 2.32)
 libgme-dev
 libgnutls-dev (>= 2.11.3)
 libgsm1-dev
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.1.3)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.1.4)
 libgtk2.0-dev (>= 2.14.0)
 libiptcdata0-dev (>= 1.0.2)
 libjasper-dev
@@ -64,6 +64,7 @@ libssl-dev
 libtool (>= 2.2.6)
 libvo-aacenc-dev
 libvo-amrwbenc-dev
+libwebp-dev (>= 0.2.1)
 libwildmidi-dev (>= 0.2.3)
 libx11-dev
 libxml2-dev (>= 2.4)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 36186baa..459409db 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -1,6 +1,6 @@
 @GST_LIB_DEV_DEP@
 @GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.1.3)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.1.4)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -71,3 +71,4 @@ libsbc-dev (>= 1.1)
 libbluetooth-dev (<< 5)
 libgnutls-dev (>= 2.11.3)
 libchromaprint-dev
+libwebp-dev (>= 0.2.1)
diff --git a/debian/changelog b/debian/changelog
index 333c3047..12aca157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gst-plugins-bad1.0 (1.1.4-1) experimental; urgency=low
+
+  * New upstream development snapshot:
+    + debian/rules,
+      debian/build-deps.in:
+      - Build depend on GStreamer and gst-plugins-base >= 1.1.4.
+    + debian/build-deps.in,
+      debian/gstreamer-plugins-bad.install:
+      - Add webp plugin.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 30 Aug 2013 13:06:41 +0200
+
 gst-plugins-bad1.0 (1.1.3-1) experimental; urgency=low
 
   * New upstream development snapshot:
diff --git a/debian/control b/debian/control
index c3710ac2..a8cb3fda 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: autoconf (>= 2.62),
                libdc1394-22-dev (>= 2.0.0) [linux-any],
                libgudev-1.0-dev (>= 143) [linux-any],
                libusb-1.0-0-dev [linux-any],
-               libgstreamer1.0-dev (>= 1.1.3),
+               libgstreamer1.0-dev (>= 1.1.4),
                gstreamer1.0-doc,
                gstreamer1.0-plugins-base (>= 1.0.0),
                gstreamer1.0-plugins-base-doc,
@@ -44,7 +44,7 @@ Build-Depends: autoconf (>= 2.62),
                libgme-dev,
                libgnutls-dev (>= 2.11.3),
                libgsm1-dev,
-               libgstreamer-plugins-base1.0-dev (>= 1.1.3),
+               libgstreamer-plugins-base1.0-dev (>= 1.1.4),
                libgtk2.0-dev (>= 2.14.0),
                libiptcdata0-dev (>= 1.0.2),
                libjasper-dev,
@@ -74,6 +74,7 @@ Build-Depends: autoconf (>= 2.62),
                libtool (>= 2.2.6),
                libvo-aacenc-dev,
                libvo-amrwbenc-dev,
+               libwebp-dev (>= 0.2.1),
                libwildmidi-dev (>= 0.2.3),
                libx11-dev,
                libxml2-dev (>= 2.4),
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index c01b9c7c..491e428c 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -81,6 +81,7 @@ debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvideofiltersbad.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvideoparsersbad.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvoaacenc.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvoamrwbenc.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstwebp.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstwildmidi.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsty4mdec.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstyadif.so
diff --git a/debian/patches/01_fix-modplug-linking.patch b/debian/patches/01_fix-modplug-linking.patch
new file mode 100644
index 00000000..8a49741e
--- /dev/null
+++ b/debian/patches/01_fix-modplug-linking.patch
@@ -0,0 +1,18 @@
+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>
+
+Index: b/ext/modplug/Makefile.am
+===================================================================
+--- 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) -lstdc++ $(LIBM) $(MODPLUG_LIBS)
++libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lstdc++ $(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 2497acb7..d02a58f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+01_fix-modplug-linking.patch
 99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index 92130cdc..a32f9232 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ gst_abi=$(gst_major).$(gst_minor)
 gst_lib=libgstreamer$(gst_abi)-0
 gst_lib_dev=libgstreamer$(gst_abi)-dev
 # what gstreamer version is needed
-gst_lib_dev_dep=$(gst_lib_dev) (>= 1.1.3)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 1.1.4)
 
 gst_pkgname=gstreamer$(gst_abi)
 gst_deb_abi=$(gst_abi)-0