Added gst-plugins-base-subtitles0.10-0.10.34 for Meego Harmattan 1.2
[mafwsubrenderer] / gst-plugins-base-subtitles0.10 / debian / patches / 0021-Fix-libgstpbutils-libgstvideo-linking.patch
diff --git a/gst-plugins-base-subtitles0.10/debian/patches/0021-Fix-libgstpbutils-libgstvideo-linking.patch b/gst-plugins-base-subtitles0.10/debian/patches/0021-Fix-libgstpbutils-libgstvideo-linking.patch
new file mode 100644 (file)
index 0000000..1d4499b
--- /dev/null
@@ -0,0 +1,58 @@
+From 6b907a22af2596928132d72a83366a41d0a91e1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20Stadler?= <rene.stadler@nokia.com>
+Date: Thu, 3 Mar 2011 18:49:43 +0200
+Subject: [PATCH] Fix libgstpbutils/libgstvideo linking
+
+Not sure why this is suddenly needed, but otherwise linkage will fail
+in our build system (though nowhere else).
+---
+ tests/check/Makefile.am             |    9 +++++++--
+ tests/examples/encoding/Makefile.am |    1 +
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index 8b8782d..573a4b1 100644
+--- a/tests/check/Makefile.am
++++ b/tests/check/Makefile.am
+@@ -238,6 +238,7 @@ libs_discoverer_CFLAGS = \
+       -DGST_TEST_FILE="\"$(abs_top_srcdir)/tests/files/partialframe.mjpeg\""
+ libs_discoverer_LDADD = \
+       $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
++      $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
+       $(GST_BASE_LIBS) $(LDADD)
+ libs_fft_CFLAGS = \
+@@ -311,7 +312,9 @@ libs_profile_CFLAGS = \
+       $(GST_PLUGINS_BASE_CFLAGS) \
+       $(AM_CFLAGS)
+ libs_profile_LDADD = \
+-      $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la $(LDADD)
++      $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
++      $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
++      $(LDADD)
+ libs_xmpwriter_CFLAGS = \
+       $(GST_PLUGINS_BASE_CFLAGS) \
+@@ -379,7 +382,9 @@ elements_playbin2_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+ elements_decodebin_LDADD = $(GST_BASE_LIBS) $(LDADD)
+ elements_decodebin_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+-elements_encodebin_LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la $(GST_BASE_LIBS) $(LDADD)
++elements_encodebin_LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
++      $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
++      $(GST_BASE_LIBS) $(LDADD)
+ elements_encodebin_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+ elements_decodebin2_LDADD = $(GST_BASE_LIBS) $(LDADD)
+diff --git a/tests/examples/encoding/Makefile.am b/tests/examples/encoding/Makefile.am
+index 2bcc902..be3378a 100644
+--- a/tests/examples/encoding/Makefile.am
++++ b/tests/examples/encoding/Makefile.am
+@@ -6,6 +6,7 @@ EXTRA_DIST = gstcapslist.h
+ noinst_PROGRAMS = $(examples)
+ LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
++        $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
+       $(GST_LIBS)
+ AM_CFLAGS = -I$(top_builddir)/gst-libs \
+       $(GST_PLUGINS_BASE_CFLAGS) \