Bug#733023: gst-plugins-good0.10: re-enable libtoolize for better new-ports coverage

[Colin Watson]

Package: gst-plugins-good0.10
Version: 0.10.31-3+nmu1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch trusty

Hi,

The ppc64el port requires a patch to libtool.m4.  I don't think that's
in Debian yet, but when it is it will require autoreconfing a bunch of
packages to pick it up.  gst-plugins-good0.10 uses dh_autoreconf, but it
disables libtoolize because of its ltmain.sh patch; it could instead use
dh_autoreconf --as-needed and then it would be able to pick up other
libtool changes automatically.

  * Use dh_autoreconf --as-needed rather than disabling libtoolize and
    manually patching ltmain.sh, to pick up other libtool macro changes for
    new ports.

diff -Nru gst-plugins-good0.10-0.10.31/debian/patches/99_ltmain_as-needed.patch gst-plugins-good0.10-0.10.31/debian/patches/99_ltmain_as-needed.patch
--- gst-plugins-good0.10-0.10.31/debian/patches/99_ltmain_as-needed.patch	2012-05-22 09:12:55.000000000 +0100
+++ gst-plugins-good0.10-0.10.31/debian/patches/99_ltmain_as-needed.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-diff --git a/ltmain.sh b/ltmain.sh
-index c7d06c3..7bc27f2 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -5800,6 +5800,11 @@ func_mode_link ()
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -6163,6 +6168,15 @@ func_mode_link ()
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test "$linkmode,$pass" = "prog,link"; then
diff -Nru gst-plugins-good0.10-0.10.31/debian/patches/series gst-plugins-good0.10-0.10.31/debian/patches/series
--- gst-plugins-good0.10-0.10.31/debian/patches/series	2012-05-22 09:12:55.000000000 +0100
+++ gst-plugins-good0.10-0.10.31/debian/patches/series	2013-12-24 02:34:52.000000000 +0000
@@ -1,2 +1,1 @@
 0001-pulsesrc-Listen-to-source-output-events-not-sink-inp.patch
-99_ltmain_as-needed.patch
diff -Nru gst-plugins-good0.10-0.10.31/debian/rules gst-plugins-good0.10-0.10.31/debian/rules
--- gst-plugins-good0.10-0.10.31/debian/rules	2012-05-22 09:12:55.000000000 +0100
+++ gst-plugins-good0.10-0.10.31/debian/rules	2013-12-24 02:35:10.000000000 +0000
@@ -5,8 +5,8 @@
 include /usr/share/cdbs/1/rules/utils.mk
 -include /usr/share/cdbs/1/rules/autoreconf.mk
 
-# make autoreconf not call libtoolize since we ship a patch for ltmain.sh
-export LIBTOOLIZE=true
+DEB_DH_AUTORECONF_ARGS := --as-needed
+
 # make autoreconf not call autopoint since we ship a patch for po/Makefile.in.in
 export AUTOPOINT=true
 

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]