[SCM] gmerlin-avdecoder/master: Propagate hardening LDFLAGS

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ba8f577ef9a002da2f338eca634034c679679316
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Dec 10 14:15:02 2013 +0100

    Propagate hardening LDFLAGS

diff --git a/debian/patches/plugins-ldflags.patch b/debian/patches/plugins-ldflags.patch
new file mode 100644
index 0000000..027cd3a
--- /dev/null
+++ b/debian/patches/plugins-ldflags.patch
@@ -0,0 +1,36 @@
+Description: propagate LDFLAGS to plugins
+Author: IOhannes m zmölnig
+Last-Update: 2013-1210
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- gmerlin-avdecoder.orig/configure.ac
++++ gmerlin-avdecoder/configure.ac
+@@ -24,6 +24,8 @@
+ AC_SUBST(LTVERSION_AGE)
+ 
+ OLD_CFLAGS=$CFLAGS
++XTRA_LDFLAGS=$LDFLAGS
++AC_SUBST([XTRA_LDFLAGS])
+ 
+ AC_GNU_SOURCE
+ 
+@@ -198,7 +200,7 @@
+ gmerlin_plugindir='$(libdir)/gmerlin/plugins'
+ 
+ dnl LDFLAGS for plugins
+-GMERLIN_PLUGIN_LDFLAGS="-export-symbols "`pkg-config --variable=prefix gmerlin`"/share/gmerlin/plugin.sym"
++GMERLIN_PLUGIN_LDFLAGS="-export-symbols "`pkg-config --variable=prefix gmerlin`"/share/gmerlin/plugin.sym ${XTRA_LDFLAGS}"
+ 
+ fi
+ 
+--- gmerlin-avdecoder.orig/lib/Makefile.am
++++ gmerlin-avdecoder/lib/Makefile.am
+@@ -284,7 +284,7 @@
+ 
+ SUBDIRS = $(win32_subdirs) $(gsm_subdirs)
+ 
+-libgmerlin_avdec_la_LDFLAGS=-export-dynamic -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@
++libgmerlin_avdec_la_LDFLAGS=-export-dynamic -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ @XTRA_LDFLAGS@
+ 
+ libgmerlin_avdec_la_LIBADD= \
+ @GMERLIN_DEP_LIBS@ \
diff --git a/debian/patches/series b/debian/patches/series
index 0963d0f..5fb9801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ system_gsm.patch
 gmerlin_versioned_depends.patch
 fix_typos.patch
 fix-ftbfs-libav9.patch
+plugins-ldflags.patch

-- 
gmerlin-avdecoder packaging