[jhbuild] [3.0] Patch gupnp-dlna-0.5.0 so it builds successfully



commit c16198eb9eeeb38f4d1e570f7d369bab55813d04
Author: Craig Keogh <cskeogh adam com au>
Date:   Fri Jan 14 20:28:39 2011 +1030

    [3.0] Patch gupnp-dlna-0.5.0 so it builds successfully
    
    Build failure was:
    /usr/bin/ld: gupnp-dlna-info.o: undefined reference to symbol
    'gst_discoverer_audio_info_get_sample_rate'

 modulesets/gnome-suites-core-deps-3.0.modules |   13 ++++++++---
 patches/gupnp-dlna-0.5.0-link.patch           |   26 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 913b715..c3b5108 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -568,10 +568,15 @@
     </suggests>
   </autotools>
 
-  <tarball id="gupnp-dlna" version="0.5.0">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-dlna-0.5.0.tar.gz";
+  <autotools id="gupnp-dlna" autogen-sh="autogen.sh">
+    <branch module="gupnp-dlna-0.5.0.tar.gz" version="0.5.0" repo="gupnp.org"
             hash="sha256:35e18e21cd6f0031673c323aaeab340aa301d0bee4bedc0b889a76d661cb90e9"
-            md5sum="c97ffbada5cb9f700d910995fab6ab46" size="403182"/>
+            md5sum="c97ffbada5cb9f700d910995fab6ab46" size="403182">
+      <!-- patch fixes following build failure:
+           ld: gupnp-dlna-info.o: undefined reference to symbol 'gst_discoverer_audio_info_get_sample_rate'
+        -->
+      <patch file="gupnp-dlna-0.5.0-link.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="glib"/>
@@ -584,7 +589,7 @@
       <dep package="gst-plugins-ugly"/>
       <dep package="gst-ffmpeg"/>
     </suggests>
-  </tarball>
+  </autotools>
 
   <tarball id="gupnp-vala" version="0.7.2">
     <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-vala-0.7.2.tar.gz";
diff --git a/patches/gupnp-dlna-0.5.0-link.patch b/patches/gupnp-dlna-0.5.0-link.patch
new file mode 100644
index 0000000..0b01122
--- /dev/null
+++ b/patches/gupnp-dlna-0.5.0-link.patch
@@ -0,0 +1,26 @@
+# Fixes:
+# /usr/bin/ld: gupnp-dlna-info.o: undefined reference to symbol 'gst_discoverer_audio_info_get_sample_rate'
+# gupnp-dlna uses automake 1.10.3, so autogen.sh is required propagate
+# Makefile.am changes
+diff -urN gupnp-dlna-0.5.0.orig/autogen.sh gupnp-dlna-0.5.0/autogen.sh
+--- gupnp-dlna-0.5.0.orig/autogen.sh	1970-01-01 09:30:00.000000000 +0930
++++ gupnp-dlna-0.5.0/autogen.sh	2011-01-14 20:12:52.138829403 +1030
+@@ -0,0 +1,5 @@
++#! /bin/sh
++gtkdocize --flavour no-tmpl || exit 1
++ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" autoreconf -v --install || exit 1
++glib-gettextize --force --copy || exit 1
++./configure --enable-debug "$@"
+diff -urN gupnp-dlna-0.5.0.orig/tools/Makefile.am gupnp-dlna-0.5.0/tools/Makefile.am
+--- gupnp-dlna-0.5.0.orig/tools/Makefile.am	2011-01-08 00:42:42.000000000 +1030
++++ gupnp-dlna-0.5.0/tools/Makefile.am	2011-01-14 20:12:37.483829403 +1030
+@@ -1,7 +1,8 @@
+ bin_PROGRAMS = gupnp-dlna-info gupnp-dlna-ls-profiles
+ 
+ AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gst-convenience/gst-libs $(GST_CFLAGS)
+-LIBS = $(GST_LIBS) \
++LIBS = $(GST_PBU_LIBS) \
++       $(GST_LIBS) \
+        $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.0.la
+ 
+ gupnp_dlna_ls_profiles_LDADD = \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]