Projects
Multimedia
gmerlin
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 33
View file
ld_build_fix.patch
Changed
@@ -178,3 +178,259 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/alsamixer/Makefile.in new/apps/alsamixer/Makefile.in +--- gmerlin-1.0.0/apps/alsamixer/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/alsamixer/Makefile.in 2011-10-19 15:59:49.142981624 +0200 +@@ -409,7 +409,7 @@ + rm -f $$list + gmerlin_alsamixer$(EXEEXT): $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_DEPENDENCIES) + @rm -f gmerlin_alsamixer$(EXEEXT) +- $(LINK) $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/camelot/Makefile.in new/apps/camelot/Makefile.in +--- gmerlin-1.0.0/apps/camelot/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/camelot/Makefile.in 2011-10-19 16:00:03.614982324 +0200 +@@ -414,7 +414,7 @@ + rm -f $$list + camelot$(EXEEXT): $(camelot_OBJECTS) $(camelot_DEPENDENCIES) + @rm -f camelot$(EXEEXT) +- $(LINK) $(camelot_OBJECTS) $(camelot_LDADD) $(LIBS) ++ $(LINK) $(camelot_OBJECTS) $(camelot_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/cmdlineplayer/Makefile.in new/apps/cmdlineplayer/Makefile.in +--- gmerlin-1.0.0/apps/cmdlineplayer/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/cmdlineplayer/Makefile.in 2011-10-19 16:00:17.725983010 +0200 +@@ -398,7 +398,7 @@ + rm -f $$list + gmerlin_play$(EXEEXT): $(gmerlin_play_OBJECTS) $(gmerlin_play_DEPENDENCIES) + @rm -f gmerlin_play$(EXEEXT) +- $(LINK) $(gmerlin_play_OBJECTS) $(gmerlin_play_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_play_OBJECTS) $(gmerlin_play_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/kbd/Makefile.in new/apps/kbd/Makefile.in +--- gmerlin-1.0.0/apps/kbd/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/kbd/Makefile.in 2011-10-19 16:00:48.174984481 +0200 +@@ -427,10 +427,10 @@ + rm -f $$list + gmerlin_kbd$(EXEEXT): $(gmerlin_kbd_OBJECTS) $(gmerlin_kbd_DEPENDENCIES) + @rm -f gmerlin_kbd$(EXEEXT) +- $(LINK) $(gmerlin_kbd_OBJECTS) $(gmerlin_kbd_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_kbd_OBJECTS) $(gmerlin_kbd_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_kbd_config$(EXEEXT): $(gmerlin_kbd_config_OBJECTS) $(gmerlin_kbd_config_DEPENDENCIES) + @rm -f gmerlin_kbd_config$(EXEEXT) +- $(LINK) $(gmerlin_kbd_config_OBJECTS) $(gmerlin_kbd_config_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_kbd_config_OBJECTS) $(gmerlin_kbd_config_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/recorder/Makefile.in new/apps/recorder/Makefile.in +--- gmerlin-1.0.0/apps/recorder/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/recorder/Makefile.in 2011-10-19 16:01:20.267986033 +0200 +@@ -411,7 +411,7 @@ + rm -f $$list + gmerlin_recorder$(EXEEXT): $(gmerlin_recorder_OBJECTS) $(gmerlin_recorder_DEPENDENCIES) + @rm -f gmerlin_recorder$(EXEEXT) +- $(LINK) $(gmerlin_recorder_OBJECTS) $(gmerlin_recorder_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_recorder_OBJECTS) $(gmerlin_recorder_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/thumbnailer/Makefile.in new/apps/thumbnailer/Makefile.in +--- gmerlin-1.0.0/apps/thumbnailer/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/thumbnailer/Makefile.in 2011-10-19 16:01:40.183986996 +0200 +@@ -374,7 +374,7 @@ + rm -f $$list + gmerlin-video-thumbnailer$(EXEEXT): $(gmerlin_video_thumbnailer_OBJECTS) $(gmerlin_video_thumbnailer_DEPENDENCIES) + @rm -f gmerlin-video-thumbnailer$(EXEEXT) +- $(LINK) $(gmerlin_video_thumbnailer_OBJECTS) $(gmerlin_video_thumbnailer_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_video_thumbnailer_OBJECTS) $(gmerlin_video_thumbnailer_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/transcoder/Makefile.in new/apps/transcoder/Makefile.in +--- gmerlin-1.0.0/apps/transcoder/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/transcoder/Makefile.in 2011-10-19 16:01:59.462987932 +0200 +@@ -442,10 +442,10 @@ + rm -f $$list + gmerlin_transcoder$(EXEEXT): $(gmerlin_transcoder_OBJECTS) $(gmerlin_transcoder_DEPENDENCIES) + @rm -f gmerlin_transcoder$(EXEEXT) +- $(LINK) $(gmerlin_transcoder_OBJECTS) $(gmerlin_transcoder_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_transcoder_OBJECTS) $(gmerlin_transcoder_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_transcoder_remote$(EXEEXT): $(gmerlin_transcoder_remote_OBJECTS) $(gmerlin_transcoder_remote_DEPENDENCIES) + @rm -f gmerlin_transcoder_remote$(EXEEXT) +- $(LINK) $(gmerlin_transcoder_remote_OBJECTS) $(gmerlin_transcoder_remote_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_transcoder_remote_OBJECTS) $(gmerlin_transcoder_remote_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/apps/visualizer/Makefile.in new/apps/visualizer/Makefile.in +--- gmerlin-1.0.0/apps/visualizer/Makefile.in 2011-01-08 01:50:09.000000000 +0100 ++++ new/apps/visualizer/Makefile.in 2011-10-19 16:02:15.701988717 +0200 +@@ -404,7 +404,7 @@ + rm -f $$list + gmerlin_visualizer$(EXEEXT): $(gmerlin_visualizer_OBJECTS) $(gmerlin_visualizer_DEPENDENCIES) + @rm -f gmerlin_visualizer$(EXEEXT) +- $(LINK) $(gmerlin_visualizer_OBJECTS) $(gmerlin_visualizer_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_visualizer_OBJECTS) $(gmerlin_visualizer_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/lib/Makefile.am new/lib/Makefile.am +--- gmerlin-1.0.0/lib/Makefile.am 2010-09-30 15:59:04.000000000 +0200 ++++ new/lib/Makefile.am 2011-10-19 14:39:55.748749636 +0200 +@@ -44,7 +44,7 @@ + + 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 ++libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + bin_PROGRAMS = gmerlin_visualizer_slave + +diff -urB gmerlin-1.0.0/lib/Makefile.in new/lib/Makefile.in +--- gmerlin-1.0.0/lib/Makefile.in 2011-01-08 01:50:10.000000000 +0100 ++++ new/lib/Makefile.in 2011-10-19 14:39:55.749749637 +0200 +@@ -614,7 +614,7 @@ + rm -f $$list + gmerlin_visualizer_slave$(EXEEXT): $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_DEPENDENCIES) + @rm -f gmerlin_visualizer_slave$(EXEEXT) +- $(LINK) $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_LDADD) $(LIBS) -lpthread -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +diff -urB gmerlin-1.0.0/tests/Makefile.in new/tests/Makefile.in +--- gmerlin-1.0.0/tests/Makefile.in 2011-01-08 01:50:12.000000000 +0100 ++++ new/tests/Makefile.in 2011-10-19 14:39:55.750749638 +0200 +@@ -590,94 +590,94 @@ + rm -f $$list + audioplayer1$(EXEEXT): $(audioplayer1_OBJECTS) $(audioplayer1_DEPENDENCIES) + @rm -f audioplayer1$(EXEEXT) +- $(LINK) $(audioplayer1_OBJECTS) $(audioplayer1_LDADD) $(LIBS) ++ $(LINK) $(audioplayer1_OBJECTS) $(audioplayer1_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES) + @rm -f auth$(EXEEXT) +- $(LINK) $(auth_OBJECTS) $(auth_LDADD) $(LIBS) ++ $(LINK) $(auth_OBJECTS) $(auth_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + cfgtest$(EXEEXT): $(cfgtest_OBJECTS) $(cfgtest_DEPENDENCIES) + @rm -f cfgtest$(EXEEXT) +- $(LINK) $(cfgtest_OBJECTS) $(cfgtest_LDADD) $(LIBS) ++ $(LINK) $(cfgtest_OBJECTS) $(cfgtest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + chapter$(EXEEXT): $(chapter_OBJECTS) $(chapter_DEPENDENCIES) + @rm -f chapter$(EXEEXT) +- $(LINK) $(chapter_OBJECTS) $(chapter_LDADD) $(LIBS) ++ $(LINK) $(chapter_OBJECTS) $(chapter_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) + @rm -f client$(EXEEXT) +- $(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS) ++ $(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + dump_plugins$(EXEEXT): $(dump_plugins_OBJECTS) $(dump_plugins_DEPENDENCIES) + @rm -f dump_plugins$(EXEEXT) +- $(LINK) $(dump_plugins_OBJECTS) $(dump_plugins_LDADD) $(LIBS) ++ $(LINK) $(dump_plugins_OBJECTS) $(dump_plugins_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + extractchannel$(EXEEXT): $(extractchannel_OBJECTS) $(extractchannel_DEPENDENCIES) + @rm -f extractchannel$(EXEEXT) +- $(LINK) $(extractchannel_OBJECTS) $(extractchannel_LDADD) $(LIBS) ++ $(LINK) $(extractchannel_OBJECTS) $(extractchannel_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + fvtest$(EXEEXT): $(fvtest_OBJECTS) $(fvtest_DEPENDENCIES) + @rm -f fvtest$(EXEEXT) +- $(LINK) $(fvtest_OBJECTS) $(fvtest_LDADD) $(LIBS) ++ $(LINK) $(fvtest_OBJECTS) $(fvtest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_imgconvert$(EXEEXT): $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_DEPENDENCIES) + @rm -f gmerlin_imgconvert$(EXEEXT) +- $(LINK) $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_imgdiff$(EXEEXT): $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_DEPENDENCIES) + @rm -f gmerlin_imgdiff$(EXEEXT) +- $(LINK) $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_psnr$(EXEEXT): $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_DEPENDENCIES) + @rm -f gmerlin_psnr$(EXEEXT) +- $(LINK) $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_ssim$(EXEEXT): $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_DEPENDENCIES) + @rm -f gmerlin_ssim$(EXEEXT) +- $(LINK) $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_vanalyze$(EXEEXT): $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_DEPENDENCIES) + @rm -f gmerlin_vanalyze$(EXEEXT) +- $(LINK) $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_visualize$(EXEEXT): $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_DEPENDENCIES) + @rm -f gmerlin_visualize$(EXEEXT) +- $(LINK) $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + gmerlin_vpsnr$(EXEEXT): $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_DEPENDENCIES) + @rm -f gmerlin_vpsnr$(EXEEXT) +- $(LINK) $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_LDADD) $(LIBS) ++ $(LINK) $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2 + insertchannel$(EXEEXT): $(insertchannel_OBJECTS) $(insertchannel_DEPENDENCIES) + @rm -f insertchannel$(EXEEXT) +- $(LINK) $(insertchannel_OBJECTS) $(insertchannel_LDADD) $(LIBS)
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.