File gmerlin-1.2.0-underlinking.patch of Package gmerlin

File gmerlin-1.2.0-underlinking.patch of Package gmerlin (Revision f355e88000ffe5060913e5af292e9261)

Currently displaying revision f355e88000ffe5060913e5af292e9261 , Show latest

Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am.orig
+++ lib/Makefile.am
@@ -49,7 +49,7 @@ libgmerlin_la_LIBADD = $(x11_libadd) @FO
 bin_PROGRAMS = gmerlin_visualizer_slave
 
 gmerlin_visualizer_slave_SOURCES = visualize_slave.c
-gmerlin_visualizer_slave_LDADD = libgmerlin.la
+gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
 
 lib_LTLIBRARIES = libgmerlin.la
 libgmerlin_la_SOURCES = \
Index: lib/Makefile.in
===================================================================
--- lib/Makefile.in.orig
+++ lib/Makefile.in
@@ -427,7 +427,7 @@ $(lv_cflags)
 libgmerlin_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ -export-symbols-regex ^bg_
 libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread
 gmerlin_visualizer_slave_SOURCES = visualize_slave.c
-gmerlin_visualizer_slave_LDADD = libgmerlin.la
+gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
 lib_LTLIBRARIES = libgmerlin.la
 libgmerlin_la_SOURCES = \
 $(lv_sources) \
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am.orig
+++ tests/Makefile.am
@@ -130,7 +130,7 @@ chapter_SOURCES = chapter.c
 chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 
 vumeter_SOURCES = vumeter.c
-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 
 
 v4ltest_SOURCES = v4ltest.c
@@ -143,7 +143,7 @@ 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 = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 
 question_SOURCES = question.c
 question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
@@ -155,7 +155,7 @@ message_SOURCES = message.c
 message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 
 playtree_SOURCES = playtree.c
-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 
 server_SOURCES = server.c
 server_LDADD = ../lib/libgmerlin.la
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in.orig
+++ tests/Makefile.in
@@ -504,7 +504,7 @@ cfgtest_LDADD = ../lib/libgmerlin.la ../
 chapter_SOURCES = chapter.c
 chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 vumeter_SOURCES = vumeter.c
-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 v4ltest_SOURCES = v4ltest.c
 v4ltest_LDADD = ../lib/libgmerlin.la
 v4ldump_SOURCES = v4ldump.c
@@ -512,7 +512,7 @@ v4ldump_LDADD = ../lib/libgmerlin.la
 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 = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 question_SOURCES = question.c
 question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 auth_SOURCES = auth.c
@@ -520,7 +520,7 @@ auth_LDADD = ../lib/libgmerlin.la ../lib
 message_SOURCES = message.c
 message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
 playtree_SOURCES = playtree.c
-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
 server_SOURCES = server.c
 server_LDADD = ../lib/libgmerlin.la
 client_SOURCES = client.c
Index: apps/player/Makefile.am
===================================================================
--- apps/player/Makefile.am.orig
+++ 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 @XML2_LIBS@
+gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
 gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
 
 EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
Index: apps/player/Makefile.in
===================================================================
--- apps/player/Makefile.in.orig
+++ apps/player/Makefile.in
@@ -361,7 +361,7 @@ gmerlin.h \
 player_remote.h \
 playerwindow.h
 
-gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
+gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
 gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
 EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
 all: all-am
Index: apps/plugincfg/Makefile.am
===================================================================
--- apps/plugincfg/Makefile.am.orig
+++ apps/plugincfg/Makefile.am
@@ -18,6 +18,6 @@ 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 @GTK_LIBS@
 
 EXTRA_DIST = gmerlin-plugincfg.desktop
Index: apps/plugincfg/Makefile.in
===================================================================
--- apps/plugincfg/Makefile.in.orig
+++ apps/plugincfg/Makefile.in
@@ -328,7 +328,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 @GTK_LIBS@
 
 EXTRA_DIST = gmerlin-plugincfg.desktop
 all: all-am
Index: apps/alsamixer/Makefile.am
===================================================================
--- apps/alsamixer/Makefile.am.orig
+++ 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@ -lpthread @GTK_LIBS@
 
 noinst_HEADERS = alsamixer.h gui.h
 
Index: apps/alsamixer/Makefile.in
===================================================================
--- apps/alsamixer/Makefile.in.orig
+++ apps/alsamixer/Makefile.in
@@ -331,7 +331,7 @@ AM_CFLAGS = \
 Desktopdir = $(datadir)/applications
 Desktop_DATA = gmerlin-alsamixer.desktop
 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@ -lpthread @GTK_LIBS@
 noinst_HEADERS = alsamixer.h gui.h
 EXTRA_DIST = gmerlin-alsamixer.desktop
 all: all-am
Index: apps/recorder/Makefile.am
===================================================================
--- apps/recorder/Makefile.am.orig
+++ apps/recorder/Makefile.am
@@ -20,7 +20,7 @@ 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 @GTK_LIBS@
 
 noinst_HEADERS = recorder_window.h
 
Index: apps/recorder/Makefile.in
===================================================================
--- apps/recorder/Makefile.in.orig
+++ apps/recorder/Makefile.in
@@ -332,7 +332,7 @@ Desktop_DATA = gmerlin-recorder.desktop
 gmerlin_recorder_SOURCES = gmerlin_recorder.c recorder_window.c
 gmerlin_recorder_LDADD = \
 $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-$(top_builddir)/lib/libgmerlin.la
+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
 
 noinst_HEADERS = recorder_window.h
 EXTRA_DIST = gmerlin-recorder.desktop
Index: apps/transcoder/Makefile.am
===================================================================
--- apps/transcoder/Makefile.am.orig
+++ apps/transcoder/Makefile.am
@@ -28,7 +28,7 @@ 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 @GTK_LIBS@
 
 gmerlin_transcoder_remote_LDADD = \
 $(top_builddir)/lib/libgmerlin.la
Index: apps/transcoder/Makefile.in
===================================================================
--- apps/transcoder/Makefile.in.orig
+++ apps/transcoder/Makefile.in
@@ -354,7 +354,7 @@ tracklist.c
 gmerlin_transcoder_remote_SOURCES = gmerlin_transcoder_remote.c
 gmerlin_transcoder_LDADD = \
 $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
-$(top_builddir)/lib/libgmerlin.la
+$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
 
 gmerlin_transcoder_remote_LDADD = \
 $(top_builddir)/lib/libgmerlin.la
Index: apps/kbd/Makefile.am
===================================================================
--- apps/kbd/Makefile.am.orig
+++ apps/kbd/Makefile.am
@@ -34,6 +34,6 @@ kbd.h \
 kbd_remote.h
 
 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 @XML2_LIBS@
+gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @X_LIBS@ @XML2_LIBS@ @GTK_LIBS@
 
 EXTRA_DIST = gmerlin-kbd.desktop
Index: apps/kbd/Makefile.in
===================================================================
--- apps/kbd/Makefile.in.orig
+++ apps/kbd/Makefile.in
@@ -350,7 +350,7 @@ kbd.h \
 kbd_remote.h
 
 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 @XML2_LIBS@
+gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @X_LIBS@ @XML2_LIBS@ @GTK_LIBS@
 EXTRA_DIST = gmerlin-kbd.desktop
 all: all-am
 
Index: apps/visualizer/Makefile.am
===================================================================
--- apps/visualizer/Makefile.am.orig
+++ 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
Index: apps/visualizer/Makefile.in
===================================================================
--- apps/visualizer/Makefile.in.orig
+++ apps/visualizer/Makefile.in
@@ -327,7 +327,7 @@ Desktop_DATA = gmerlin-visualizer.deskto
 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
 all: all-am
 
Index: plugins/videofilters/Makefile.am
===================================================================
--- plugins/videofilters/Makefile.am.orig
+++ plugins/videofilters/Makefile.am
@@ -36,7 +36,7 @@ fv_transform.la \
 fv_zoom.la
 
 fv_blur_la_SOURCES  = fv_blur.c
-fv_blur_la_LIBADD = @MODULE_LIBADD@
+fv_blur_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 
 fv_colormatrix_rgb_la_SOURCES  = fv_colormatrix_rgb.c colormatrix.c
 fv_colormatrix_rgb_la_LIBADD = @MODULE_LIBADD@
@@ -71,7 +71,7 @@ fv_tctweak_la_SOURCES  = fv_tctweak.c
 fv_tctweak_la_LIBADD = @MODULE_LIBADD@
 
 fv_transform_la_SOURCES  = fv_transform.c
-fv_transform_la_LIBADD = @MODULE_LIBADD@
+fv_transform_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 
 fv_cropscale_la_SOURCES  = fv_cropscale.c
 fv_cropscale_la_LIBADD = @MODULE_LIBADD@
@@ -91,9 +91,11 @@ fv_deinterlace_la_LIBADD   = @MODULE_LIB
 fv_deinterlace_la_SOURCES  = fv_deinterlace.c bgyadif.c
 
 fv_equalizer_la_SOURCES  = fv_equalizer.c colormatrix.c
-fv_equalizer_la_LIBADD = @MODULE_LIBADD@
+fv_equalizer_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 
 fv_zoom_la_SOURCES  = fv_zoom.c
 fv_zoom_la_LIBADD = @MODULE_LIBADD@
 
+fv_swapfields_la_LIBADD = @MODULE_LIBADD@
+
 noinst_HEADERS = bgyadif.h colormatrix.h deinterlace.h
Index: plugins/videofilters/Makefile.in
===================================================================
--- plugins/videofilters/Makefile.in.orig
+++ plugins/videofilters/Makefile.in
@@ -441,7 +441,7 @@ fv_transform.la \
 fv_zoom.la
 
 fv_blur_la_SOURCES = fv_blur.c
-fv_blur_la_LIBADD = @MODULE_LIBADD@
+fv_blur_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 fv_colormatrix_rgb_la_SOURCES = fv_colormatrix_rgb.c colormatrix.c
 fv_colormatrix_rgb_la_LIBADD = @MODULE_LIBADD@
 fv_colormatrix_yuv_la_SOURCES = fv_colormatrix_yuv.c colormatrix.c
@@ -465,7 +465,7 @@ fv_textlogo_la_LIBADD = @MODULE_LIBADD@
 fv_tctweak_la_SOURCES = fv_tctweak.c
 fv_tctweak_la_LIBADD = @MODULE_LIBADD@
 fv_transform_la_SOURCES = fv_transform.c
-fv_transform_la_LIBADD = @MODULE_LIBADD@
+fv_transform_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 fv_cropscale_la_SOURCES = fv_cropscale.c
 fv_cropscale_la_LIBADD = @MODULE_LIBADD@
 fv_framerate_la_SOURCES = fv_framerate.c
@@ -478,9 +478,10 @@ fv_deinterlace_la_CFLAGS = -DLOCALE_DIR=
 fv_deinterlace_la_LIBADD = @MODULE_LIBADD@
 fv_deinterlace_la_SOURCES = fv_deinterlace.c bgyadif.c
 fv_equalizer_la_SOURCES = fv_equalizer.c colormatrix.c
-fv_equalizer_la_LIBADD = @MODULE_LIBADD@
+fv_equalizer_la_LIBADD = @MODULE_LIBADD@ @LIBM@
 fv_zoom_la_SOURCES = fv_zoom.c
 fv_zoom_la_LIBADD = @MODULE_LIBADD@
+fv_swapfields_la_LIBADD = @MODULE_LIBADD@
 noinst_HEADERS = bgyadif.h colormatrix.h deinterlace.h
 all: all-am
 
Index: plugins/cdaudio/Makefile.am
===================================================================
--- plugins/cdaudio/Makefile.am.orig
+++ plugins/cdaudio/Makefile.am
@@ -56,6 +56,7 @@ $(cddb_libs) \
 @CDIO_LIBS@ \
 @CDIO_CDDA_LIBS@ \
 @CDIO_PARANOIA_LIBS@ \
-@MODULE_LIBADD@
+@MODULE_LIBADD@ \
+@XML2_LIBS@
 
 noinst_HEADERS = cdaudio.h sha1.h
Index: plugins/cdaudio/Makefile.in
===================================================================
--- plugins/cdaudio/Makefile.in.orig
+++ plugins/cdaudio/Makefile.in
@@ -363,7 +363,8 @@ $(cddb_libs) \
 @CDIO_LIBS@ \
 @CDIO_CDDA_LIBS@ \
 @CDIO_PARANOIA_LIBS@ \
-@MODULE_LIBADD@
+@MODULE_LIBADD@ \
+@XML2_LIBS@
 
 noinst_HEADERS = cdaudio.h sha1.h
 all: all-am