[SCM] gmerlin/master: Add patch to prevent FTBFS with newest toolchain.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Jan 17 14:37:35 UTC 2011 

The following commit has been merged in the master branch:
commit b93c186696a572664353890896e015d63c989296
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 17 15:37:23 2011 +0100

    Add patch to prevent FTBFS with newest toolchain.

diff --git a/debian/patches/binutils_gold.patch b/debian/patches/binutils_gold.patch
new file mode 100644
index 0000000..8eb6c78
--- /dev/null
+++ b/debian/patches/binutils_gold.patch
@@ -0,0 +1,163 @@
+Description: Prevent FTBFS with newest toolchain.
+ This also allows gmerlin to build on Ubuntu Natty.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ apps/alsamixer/Makefile.am  |    2 +-
+ apps/camelot/Makefile.am    |    3 ++-
+ apps/kbd/Makefile.am        |    4 ++--
+ apps/player/Makefile.am     |    2 +-
+ apps/plugincfg/Makefile.am  |    3 ++-
+ apps/recorder/Makefile.am   |    3 ++-
+ apps/transcoder/Makefile.am |    3 ++-
+ apps/visualizer/Makefile.am |    2 +-
+ lib/Makefile.am             |    2 +-
+ tests/Makefile.am           |   16 ++++++++--------
+ 10 files changed, 22 insertions(+), 18 deletions(-)
+
+--- gmerlin.orig/lib/Makefile.am
++++ gmerlin/lib/Makefile.am
+@@ -51,7 +51,7 @@ libgmerlin_la_LIBADD = $(x11_libadd) @FO
+ pkgbin_PROGRAMS = gmerlin_visualizer_slave
+ 
+ gmerlin_visualizer_slave_SOURCES = visualize_slave.c
+-gmerlin_visualizer_slave_LDADD = libgmerlin.la
++gmerlin_visualizer_slave_LDADD = -lpthread -ldl libgmerlin.la
+ 
+ lib_LTLIBRARIES = libgmerlin.la
+ libgmerlin_la_SOURCES = \
+--- gmerlin.orig/tests/Makefile.am
++++ gmerlin/tests/Makefile.am
+@@ -112,13 +112,13 @@ fvtest_LDADD = ../lib/libgmerlin.la -ldl
+ 
+ 
+ cfgtest_SOURCES = cfgtest.c
+-cfgtest_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++cfgtest_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ chapter_SOURCES = chapter.c
+-chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++chapter_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ vumeter_SOURCES = vumeter.c
+-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++vumeter_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ 
+ v4ltest_SOURCES = v4ltest.c
+@@ -131,19 +131,19 @@ visualization_SOURCES = visualization.c
+ visualization_LDADD = ../lib/libgmerlin.la
+ 
+ scrolltext_SOURCES = scrolltext.c
+-scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++scrolltext_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ question_SOURCES = question.c
+-question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++question_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ auth_SOURCES = auth.c
+-auth_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++auth_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ message_SOURCES = message.c
+-message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++message_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ playtree_SOURCES = playtree.c
+-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++playtree_LDADD = @GTK_LIBS@ ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ server_SOURCES = server.c
+ server_LDADD = ../lib/libgmerlin.la
+--- gmerlin.orig/apps/player/Makefile.am
++++ gmerlin/apps/player/Makefile.am
+@@ -38,7 +38,7 @@ gmerlin.h \
+ player_remote.h \
+ playerwindow.h
+ 
+-gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
++gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @GTK_LIBS@ @XML2_LIBS@
+ gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
+ 
+ EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
+--- gmerlin.orig/apps/plugincfg/Makefile.am
++++ gmerlin/apps/plugincfg/Makefile.am
+@@ -18,6 +18,7 @@ Desktop_DATA = gmerlin-plugincfg.desktop
+ gmerlin_plugincfg_SOURCES = gmerlin_plugincfg.c
+ gmerlin_plugincfg_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la \
++ at GTK_LIBS@
+ 
+ EXTRA_DIST = gmerlin-plugincfg.desktop
+--- gmerlin.orig/apps/alsamixer/Makefile.am
++++ gmerlin/apps/alsamixer/Makefile.am
+@@ -18,7 +18,7 @@ Desktop_DATA = gmerlin-alsamixer.desktop
+ bin_PROGRAMS = gmerlin_alsamixer
+ 
+ gmerlin_alsamixer_SOURCES = card.c main.c mixer.c g_control.c g_card.c g_mixer.c
+-gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread
++gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ @GTK_LIBS@ -lpthread
+ 
+ noinst_HEADERS = alsamixer.h gui.h
+ 
+--- gmerlin.orig/apps/camelot/Makefile.am
++++ gmerlin/apps/camelot/Makefile.am
+@@ -25,7 +25,8 @@ bin_PROGRAMS = camelot
+ camelot_SOURCES = webcam.c webcam_window.c main.c $(vloopback_sources)
+ camelot_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la \
++ at GTK_LIBS@
+ 
+ noinst_HEADERS = webcam.h webcam_window.h webcam_priv.h vloopback.h
+ 
+--- gmerlin.orig/apps/recorder/Makefile.am
++++ gmerlin/apps/recorder/Makefile.am
+@@ -20,7 +20,8 @@ gmerlin_recorder_SOURCES = gmerlin_recor
+ 
+ gmerlin_recorder_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la \
++ at GTK_LIBS@
+ 
+ noinst_HEADERS = recorder_window.h
+ 
+--- gmerlin.orig/apps/kbd/Makefile.am
++++ gmerlin/apps/kbd/Makefile.am
+@@ -33,7 +33,7 @@ noinst_HEADERS = \
+ kbd.h \
+ kbd_remote.h
+ 
+-gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@
+-gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
++gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@ @XML2_LIBS@
++gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @X_LIBS@ @GTK_LIBS@ @XML2_LIBS@
+ 
+ EXTRA_DIST = gmerlin-kbd.desktop
+--- gmerlin.orig/apps/transcoder/Makefile.am
++++ gmerlin/apps/transcoder/Makefile.am
+@@ -28,7 +28,8 @@ gmerlin_transcoder_remote_SOURCES = gmer
+ 
+ gmerlin_transcoder_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la \
++ at GTK_LIBS@
+ 
+ gmerlin_transcoder_remote_LDADD = \
+ $(top_builddir)/lib/libgmerlin.la
+--- gmerlin.orig/apps/visualizer/Makefile.am
++++ gmerlin/apps/visualizer/Makefile.am
+@@ -18,6 +18,6 @@ bin_PROGRAMS = gmerlin_visualizer
+ gmerlin_visualizer_SOURCES = \
+ gmerlin_visualizer.c
+ 
+-gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
++gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ 
+ EXTRA_DIST = gmerlin-visualizer.desktop
diff --git a/debian/patches/series b/debian/patches/series
index d2a76f5..ecd25c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ function_param_type.patch
 underlinking.patch
 gmerlin_visualizer_slave.patch
 fix_typos.patch
+binutils_gold.patch

-- 
gmerlin packaging

More information about the pkg-multimedia-commits mailing list