Projects
Multimedia
gmerlin
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 18
View file
ld_build_fix.patch
Changed
@@ -1,4 +1,3 @@ -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-18 19:29:43.604218618 +0200 @@ -44,7 +44,7 @@ @@ -6,11 +5,10 @@ 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 -lgtk-x11-2.0 -lgdk-x11-2.0 ++libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread -ldl 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 11:37:12.503219047 +0200 @@ -614,7 +614,7 @@ @@ -18,7 +16,134 @@ 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 ++ $(LINK) $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_LDADD) $(LIBS) -lpthread + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +--- gmerlin-1.0.0/tests/Makefile.in 2011-01-08 01:50:12.000000000 +0100 ++++ new/tests/Makefile.in 2011-10-19 13:20:32.761519124 +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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + insertchannel$(EXEEXT): $(insertchannel_OBJECTS) $(insertchannel_DEPENDENCIES) + @rm -f insertchannel$(EXEEXT) +- $(LINK) $(insertchannel_OBJECTS) $(insertchannel_LDADD) $(LIBS) ++ $(LINK) $(insertchannel_OBJECTS) $(insertchannel_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + ladspa$(EXEEXT): $(ladspa_OBJECTS) $(ladspa_DEPENDENCIES) + @rm -f ladspa$(EXEEXT) +- $(LINK) $(ladspa_OBJECTS) $(ladspa_LDADD) $(LIBS) ++ $(LINK) $(ladspa_OBJECTS) $(ladspa_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + message$(EXEEXT): $(message_OBJECTS) $(message_DEPENDENCIES) + @rm -f message$(EXEEXT) +- $(LINK) $(message_OBJECTS) $(message_LDADD) $(LIBS) ++ $(LINK) $(message_OBJECTS) $(message_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + msgtest$(EXEEXT): $(msgtest_OBJECTS) $(msgtest_DEPENDENCIES) + @rm -f msgtest$(EXEEXT) +- $(LINK) $(msgtest_OBJECTS) $(msgtest_LDADD) $(LIBS) ++ $(LINK) $(msgtest_OBJECTS) $(msgtest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + playtree$(EXEEXT): $(playtree_OBJECTS) $(playtree_DEPENDENCIES) + @rm -f playtree$(EXEEXT) +- $(LINK) $(playtree_OBJECTS) $(playtree_LDADD) $(LIBS) ++ $(LINK) $(playtree_OBJECTS) $(playtree_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + question$(EXEEXT): $(question_OBJECTS) $(question_DEPENDENCIES) + @rm -f question$(EXEEXT) +- $(LINK) $(question_OBJECTS) $(question_LDADD) $(LIBS) ++ $(LINK) $(question_OBJECTS) $(question_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + scrolltext$(EXEEXT): $(scrolltext_OBJECTS) $(scrolltext_DEPENDENCIES) + @rm -f scrolltext$(EXEEXT) +- $(LINK) $(scrolltext_OBJECTS) $(scrolltext_LDADD) $(LIBS) ++ $(LINK) $(scrolltext_OBJECTS) $(scrolltext_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES) + @rm -f server$(EXEEXT) +- $(LINK) $(server_OBJECTS) $(server_LDADD) $(LIBS) ++ $(LINK) $(server_OBJECTS) $(server_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + textrenderer$(EXEEXT): $(textrenderer_OBJECTS) $(textrenderer_DEPENDENCIES) + @rm -f textrenderer$(EXEEXT) +- $(LINK) $(textrenderer_OBJECTS) $(textrenderer_LDADD) $(LIBS) ++ $(LINK) $(textrenderer_OBJECTS) $(textrenderer_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + thumbnail$(EXEEXT): $(thumbnail_OBJECTS) $(thumbnail_DEPENDENCIES) + @rm -f thumbnail$(EXEEXT) +- $(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS) ++ $(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + v4ldump$(EXEEXT): $(v4ldump_OBJECTS) $(v4ldump_DEPENDENCIES) + @rm -f v4ldump$(EXEEXT) +- $(LINK) $(v4ldump_OBJECTS) $(v4ldump_LDADD) $(LIBS) ++ $(LINK) $(v4ldump_OBJECTS) $(v4ldump_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + v4ltest$(EXEEXT): $(v4ltest_OBJECTS) $(v4ltest_DEPENDENCIES) + @rm -f v4ltest$(EXEEXT) +- $(LINK) $(v4ltest_OBJECTS) $(v4ltest_LDADD) $(LIBS) ++ $(LINK) $(v4ltest_OBJECTS) $(v4ltest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + videoplayer1$(EXEEXT): $(videoplayer1_OBJECTS) $(videoplayer1_DEPENDENCIES) + @rm -f videoplayer1$(EXEEXT) +- $(LINK) $(videoplayer1_OBJECTS) $(videoplayer1_LDADD) $(LIBS) ++ $(LINK) $(videoplayer1_OBJECTS) $(videoplayer1_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + visualization$(EXEEXT): $(visualization_OBJECTS) $(visualization_DEPENDENCIES) + @rm -f visualization$(EXEEXT) +- $(LINK) $(visualization_OBJECTS) $(visualization_LDADD) $(LIBS) ++ $(LINK) $(visualization_OBJECTS) $(visualization_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 + vumeter$(EXEEXT): $(vumeter_OBJECTS) $(vumeter_DEPENDENCIES) + @rm -f vumeter$(EXEEXT) +- $(LINK) $(vumeter_OBJECTS) $(vumeter_LDADD) $(LIBS) ++ $(LINK) $(vumeter_OBJECTS) $(vumeter_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 mostlyclean-compile: -rm -f *.$(OBJEXT)
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
.