[Pkg-xfce-commits] r7239 - in desktop/trunk/tumbler/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Dec 11 08:50:38 UTC 2012
Author: corsac
Date: 2012-12-11 20:50:37 +0000 (Tue, 11 Dec 2012)
New Revision: 7239
Added:
desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch
desktop/trunk/tumbler/debian/patches/series
Modified:
desktop/trunk/tumbler/debian/changelog
desktop/trunk/tumbler/debian/control
desktop/trunk/tumbler/debian/rules
Log:
* debian/control:
- update gstreamer build-dep to libgstreamer1.0-dev and
libgstreamer-plugins-base1.0-dev.
- add build-dep on xdt-autogen and dependencies.
* debian/patches:
- 0001-Fix-build-when-using-Wl-z-defs added, link against libgsttags and
libm.
* debian/rules:
- run xdt-autogen before configure.
Modified: desktop/trunk/tumbler/debian/changelog
===================================================================
--- desktop/trunk/tumbler/debian/changelog 2012-12-10 22:20:35 UTC (rev 7238)
+++ desktop/trunk/tumbler/debian/changelog 2012-12-11 20:50:37 UTC (rev 7239)
@@ -1,6 +1,15 @@
tumbler (0.1.26-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/control:
+ - update gstreamer build-dep to libgstreamer1.0-dev and
+ libgstreamer-plugins-base1.0-dev.
+ - add build-dep on xdt-autogen and dependencies.
+ * debian/patches:
+ - 0001-Fix-build-when-using-Wl-z-defs added, link against libgsttags and
+ libm.
+ * debian/rules:
+ - run xdt-autogen before configure.
-- Yves-Alexis Perez <corsac at debian.org> Mon, 10 Dec 2012 23:20:27 +0100
Modified: desktop/trunk/tumbler/debian/control
===================================================================
--- desktop/trunk/tumbler/debian/control 2012-12-10 22:20:35 UTC (rev 7238)
+++ desktop/trunk/tumbler/debian/control 2012-12-11 20:50:37 UTC (rev 7239)
@@ -6,8 +6,9 @@
Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config,
libglib2.0-dev, libgtk2.0-dev, libdbus-glib-1-dev, libpoppler-glib-dev,
- libgstreamer0.10-dev, libjpeg-dev, libgsf-1-dev, libopenrawgnome-dev,
- dpkg-dev (>= 1.16.1)
+ libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev,
+ libjpeg-dev, libgsf-1-dev, libopenrawgnome-dev, dpkg-dev (>= 1.16.1),
+ xfce4-dev-tools, libtool, gtk-doc-tools, intltool
Standards-Version: 3.9.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/tumbler
Added: desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch
===================================================================
--- desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch (rev 0)
+++ desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch 2012-12-11 20:50:37 UTC (rev 7239)
@@ -0,0 +1,62 @@
+From 0a4f4e0b69599d6eb51f96d17141a8c0331b6943 Mon Sep 17 00:00:00 2001
+From: Yves-Alexis Perez <corsac at debian.org>
+Date: Tue, 11 Dec 2012 21:37:00 +0100
+Subject: [PATCH] Fix build when using -Wl,-z,defs
+
+GStreamer thumbnailers should be linked against libmath and
+libgsttags.
+
+Do the first directly from Makefile.am, and implement the second in the
+AC macros for GSTREAMER support.
+
+Signed-off-by: Yves-Alexis Perez <corsac at debian.org>
+---
+ acinclude.m4 | 7 +++++--
+ plugins/gst-thumbnailer/Makefile.am | 5 ++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e84b8c3..4105e37 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -157,8 +157,11 @@ if test x"$ac_tumbler_gstreamer_thumbnailer" = x"yes"; then
+ dnl Check for gdk-pixbuf
+ PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14],
+ [
+- dnl Check for libgstreamerthumbnailer
+- PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [], [ac_tumbler_gstreamer_thumbnailer=no])
++ dnl Check for libgstreamer
++ PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [
++ dnl Check for libgstreamertag
++ PKG_CHECK_MODULES([GSTREAMER_TAG], [gstreamer-tag-1.0], [], [ac_tumbler_gstreamer_thumbnailer=no])
++ ], [ac_tumbler_gstreamer_thumbnailer=no])
+ ], [ac_tumbler_gstreamer_thumbnailer=no])
+ fi
+
+diff --git a/plugins/gst-thumbnailer/Makefile.am b/plugins/gst-thumbnailer/Makefile.am
+index 87c33c3..5a0cda3 100644
+--- a/plugins/gst-thumbnailer/Makefile.am
++++ b/plugins/gst-thumbnailer/Makefile.am
+@@ -39,6 +39,7 @@ tumbler_gst_thumbnailer_la_CFLAGS = \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ $(GDK_PIXBUF_CFLAGS) \
+ $(GSTREAMER_CFLAGS) \
++ $(GSTREAMER_TAG_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(PLATFORM_CFLAGS) \
+@@ -54,8 +55,10 @@ tumbler_gst_thumbnailer_la_LIBADD = \
+ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la \
+ $(GDK_PIXBUF_LIBS) \
+ $(GSTREAMER_LIBS) \
++ $(GSTREAMER_TAG_LIBS) \
+ $(GIO_LIBS) \
+- $(GLIB_LIBS)
++ $(GLIB_LIBS) \
++ -lm
+
+ tumbler_gst_thumbnailer_la_DEPENDENCIES = \
+ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+--
+1.7.10.4
+
Added: desktop/trunk/tumbler/debian/patches/series
===================================================================
--- desktop/trunk/tumbler/debian/patches/series (rev 0)
+++ desktop/trunk/tumbler/debian/patches/series 2012-12-11 20:50:37 UTC (rev 7239)
@@ -0,0 +1 @@
+0001-Fix-build-when-using-Wl-z-defs.patch
Modified: desktop/trunk/tumbler/debian/rules
===================================================================
--- desktop/trunk/tumbler/debian/rules 2012-12-10 22:20:35 UTC (rev 7238)
+++ desktop/trunk/tumbler/debian/rules 2012-12-11 20:50:37 UTC (rev 7239)
@@ -16,4 +16,6 @@
dh $@ --parallel
override_dh_auto_configure:
+ mkdir -p m4
+ NOCONFIGURE=1 xdt-autogen
dh_auto_configure -- --disable-ffmpeg-thumbnailer
More information about the Pkg-xfce-commits
mailing list