Author: ranger Date: Tue Jun 19 15:45:26 2007 New Revision: 844 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=844&repname=user%3a+ranger Log: working on kdemult still
Modified: trunk/experimental/10.3/main/finkinfo/kde/kdemultimedia3.patch trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia3.patch trunk/experimental/common/main/finkinfo/kde/kdemultimedia3.patch Modified: trunk/experimental/10.3/main/finkinfo/kde/kdemultimedia3.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kdemultimedia3.patch&rev=844&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.3/main/finkinfo/kde/kdemultimedia3.patch (original) +++ trunk/experimental/10.3/main/finkinfo/kde/kdemultimedia3.patch Tue Jun 19 15:45:26 2007 @@ -1,100 +1,58 @@ - ---- kdemultimedia-3.5.7/akode_artsplugin/Makefile.in 2007-05-14 04:37:18.000000000 -0700 -+++ kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.in 2007-06-15 14:57:18.000000000 -0700 -@@ -57,7 +57,7 @@ - *) f=$$p;; \ - esac; - am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mcopclassdir)" \ -+am__installdirs = "$(DESTDIR)$(libdir)/akode" "$(DESTDIR)$(mcopclassdir)" \ - "$(DESTDIR)$(mcoptypedir)" - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -496,7 +496,7 @@ +--- kdemultimedia-3.5.7/akode_artsplugin/Makefile.am 2006-07-22 01:10:53.000000000 -0700 ++++ kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.am 2007-06-15 17:48:31.000000000 -0700 +@@ -1,8 +1,9 @@ + INCLUDES= $(akode_includes) -I$(kde_includes)/arts $(all_includes) - #>- libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined - #>+ 1 --libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -+libarts_akode_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) - libarts_akode_la_LIBADD = $(akode_libs) -lkmedia2_idl -lsoundserver_idl -lartsflow - #>- libarts_akode_la_METASOURCES = AUTO - libarts_akode_la_COMPILE_FIRST = akodearts.h -@@ -561,12 +561,12 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ test -z "$(libdir)/akode" || $(mkdir_p) "$(DESTDIR)$(libdir)/akode" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/akode/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/akode/$$f"; \ - else :; fi; \ - done +-noinst_HEADERS = akodePlayObject_impl.h ++akodedir = $(libdir)/akode ++akode_LTLIBRARIES = libarts_akode.la -@@ -590,7 +590,7 @@ - #>+ 2 - @[EMAIL PROTECTED]: libarts_akode.la.closure $(libarts_akode_la_OBJECTS) $(libarts_akode_la_DEPENDENCIES) - @[EMAIL PROTECTED]: $(libarts_akode_la_OBJECTS) $(libarts_akode_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libarts_akode_la_LDFLAGS) $(libarts_akode_la_OBJECTS) $(libarts_akode_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir)/akode $(libarts_akode_la_LDFLAGS) $(libarts_akode_la_OBJECTS) $(libarts_akode_la_LIBADD) $(LIBS) +-lib_LTLIBRARIES = libarts_akode.la ++noinst_HEADERS = akodePlayObject_impl.h - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -772,7 +772,7 @@ - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mcopclassdir)" "$(DESTDIR)$(mcoptypedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)/akode" "$(DESTDIR)$(mcopclassdir)" "$(DESTDIR)$(mcoptypedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done - install: install-am ---- kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.in 2007-05-14 04:37:19.000000000 -0700 -+++ kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.in 2007-06-15 15:42:21.000000000 -0700 -@@ -486,7 +486,7 @@ + libarts_akode_la_SOURCES = akodearts.cc akodePlayObject_impl.cpp \ + akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp \ +--- kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.am 2006-07-22 01:10:54.000000000 -0700 ++++ kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.am 2007-06-15 17:46:38.000000000 -0700 +@@ -5,7 +5,7 @@ + lib_LTLIBRARIES = libarts_audiofile.la + libarts_audiofile_la_COMPILE_FIRST = audiofilearts.h libarts_audiofile_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp - #>- libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined - #>+ 1 --libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -+libarts_audiofile_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) - libarts_audiofile_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile - #>- libarts_audiofile_la_METASOURCES = AUTO - mcoptypedir = $(libdir)/mcop ---- kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.in 2007-05-14 04:37:24.000000000 -0700 -+++ kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.in 2007-06-15 16:05:39.000000000 -0700 -@@ -497,7 +497,7 @@ +-libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined ++libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version + libarts_audiofile_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile + libarts_audiofile_la_METASOURCES = AUTO + +--- kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.am 2005-09-10 01:19:33.000000000 -0700 ++++ kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.am 2007-06-15 17:47:12.000000000 -0700 +@@ -6,7 +6,7 @@ + FFTScopes.cpp StereoEffectStack_impl.cpp \ + StereoVolumeControl_impl.cpp Session_impl.cpp libnoatunarts_la_COMPILE_FIRST = noatunarts.h - #>- libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined - #>+ 1 --libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined $(KDE_NO_UNDEFINED) -+libnoatunarts_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) - libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow - #>- libnoatunarts_la_METASOURCES = AUTO - mcoptypedir = $(libdir)/mcop ---- kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.in 2007-05-14 04:37:26.000000000 -0700 -+++ kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.in 2007-06-15 16:11:19.000000000 -0700 -@@ -563,8 +563,7 @@ - #>- noatun_winskin_la_LDFLAGS = $(all_libraries) \ - #>- -module -avoid-version -no-undefined - #>+ 2 --noatun_winskin_la_LDFLAGS = $(all_libraries) \ -- -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) -+noatun_winskin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) +-libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined ++libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -version-info 1:0:0 + libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow + libnoatunarts_la_METASOURCES = AUTO - noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ - $(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la ---- kdemultimedia-3.5.7/xine_artsplugin/Makefile.in 2007-05-14 04:37:26.000000000 -0700 -+++ kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.in 2007-06-15 16:11:40.000000000 -0700 -@@ -510,7 +510,7 @@ +--- kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.am 2005-09-10 01:19:37.000000000 -0700 ++++ kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.am 2007-06-15 17:48:15.000000000 -0700 +@@ -8,7 +8,7 @@ + -I$(kde_includes)/arts \ + $(all_includes) - #>- libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread - #>+ 1 --libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -pthread -+libarts_xine_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) -pthread +-kde_module_LTLIBRARIES = noatun_winskin.la ++noatun_modules_winskin_LTLIBRARIES = noatun_winskin.la + + noatun_winskin_la_SOURCES = fileInfo.cpp \ + guiSpectrumAnalyser.cpp \ +--- kdemultimedia-3.5.7/xine_artsplugin/Makefile.am 2006-07-22 01:10:54.000000000 -0700 ++++ kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.am 2007-06-15 17:48:55.000000000 -0700 +@@ -7,7 +7,7 @@ + libarts_xine_la_SOURCES = xinePlayObject.cc \ + xinePlayObject_impl.cpp \ + audio_fifo_out.c +-libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread ++libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread -avoid-version libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \ -lkmedia2_idl -lsoundserver_idl -lartsflow Modified: trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia3.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia3.patch&rev=844&repname=user%3a+ranger ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia3.patch (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia3.patch Tue Jun 19 15:45:26 2007 @@ -1,100 +1,58 @@ - ---- kdemultimedia-3.5.7/akode_artsplugin/Makefile.in 2007-05-14 04:37:18.000000000 -0700 -+++ kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.in 2007-06-15 14:57:18.000000000 -0700 -@@ -57,7 +57,7 @@ - *) f=$$p;; \ - esac; - am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mcopclassdir)" \ -+am__installdirs = "$(DESTDIR)$(libdir)/akode" "$(DESTDIR)$(mcopclassdir)" \ - "$(DESTDIR)$(mcoptypedir)" - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -496,7 +496,7 @@ +--- kdemultimedia-3.5.7/akode_artsplugin/Makefile.am 2006-07-22 01:10:53.000000000 -0700 ++++ kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.am 2007-06-15 17:48:31.000000000 -0700 +@@ -1,8 +1,9 @@ + INCLUDES= $(akode_includes) -I$(kde_includes)/arts $(all_includes) - #>- libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined - #>+ 1 --libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -+libarts_akode_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) - libarts_akode_la_LIBADD = $(akode_libs) -lkmedia2_idl -lsoundserver_idl -lartsflow - #>- libarts_akode_la_METASOURCES = AUTO - libarts_akode_la_COMPILE_FIRST = akodearts.h -@@ -561,12 +561,12 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ test -z "$(libdir)/akode" || $(mkdir_p) "$(DESTDIR)$(libdir)/akode" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/akode/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/akode/$$f"; \ - else :; fi; \ - done +-noinst_HEADERS = akodePlayObject_impl.h ++akodedir = $(libdir)/akode ++akode_LTLIBRARIES = libarts_akode.la -@@ -590,7 +590,7 @@ - #>+ 2 - @[EMAIL PROTECTED]: libarts_akode.la.closure $(libarts_akode_la_OBJECTS) $(libarts_akode_la_DEPENDENCIES) - @[EMAIL PROTECTED]: $(libarts_akode_la_OBJECTS) $(libarts_akode_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libarts_akode_la_LDFLAGS) $(libarts_akode_la_OBJECTS) $(libarts_akode_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir)/akode $(libarts_akode_la_LDFLAGS) $(libarts_akode_la_OBJECTS) $(libarts_akode_la_LIBADD) $(LIBS) +-lib_LTLIBRARIES = libarts_akode.la ++noinst_HEADERS = akodePlayObject_impl.h - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -772,7 +772,7 @@ - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mcopclassdir)" "$(DESTDIR)$(mcoptypedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)/akode" "$(DESTDIR)$(mcopclassdir)" "$(DESTDIR)$(mcoptypedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done - install: install-am ---- kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.in 2007-05-14 04:37:19.000000000 -0700 -+++ kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.in 2007-06-15 15:42:21.000000000 -0700 -@@ -486,7 +486,7 @@ + libarts_akode_la_SOURCES = akodearts.cc akodePlayObject_impl.cpp \ + akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp \ +--- kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.am 2006-07-22 01:10:54.000000000 -0700 ++++ kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.am 2007-06-15 17:46:38.000000000 -0700 +@@ -5,7 +5,7 @@ + lib_LTLIBRARIES = libarts_audiofile.la + libarts_audiofile_la_COMPILE_FIRST = audiofilearts.h libarts_audiofile_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp - #>- libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined - #>+ 1 --libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -+libarts_audiofile_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) - libarts_audiofile_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile - #>- libarts_audiofile_la_METASOURCES = AUTO - mcoptypedir = $(libdir)/mcop ---- kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.in 2007-05-14 04:37:24.000000000 -0700 -+++ kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.in 2007-06-15 16:05:39.000000000 -0700 -@@ -497,7 +497,7 @@ +-libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined ++libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version + libarts_audiofile_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile + libarts_audiofile_la_METASOURCES = AUTO + +--- kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.am 2005-09-10 01:19:33.000000000 -0700 ++++ kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.am 2007-06-15 17:47:12.000000000 -0700 +@@ -6,7 +6,7 @@ + FFTScopes.cpp StereoEffectStack_impl.cpp \ + StereoVolumeControl_impl.cpp Session_impl.cpp libnoatunarts_la_COMPILE_FIRST = noatunarts.h - #>- libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined - #>+ 1 --libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined $(KDE_NO_UNDEFINED) -+libnoatunarts_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) - libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow - #>- libnoatunarts_la_METASOURCES = AUTO - mcoptypedir = $(libdir)/mcop ---- kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.in 2007-05-14 04:37:26.000000000 -0700 -+++ kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.in 2007-06-15 16:11:19.000000000 -0700 -@@ -563,8 +563,7 @@ - #>- noatun_winskin_la_LDFLAGS = $(all_libraries) \ - #>- -module -avoid-version -no-undefined - #>+ 2 --noatun_winskin_la_LDFLAGS = $(all_libraries) \ -- -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) -+noatun_winskin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) +-libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined ++libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -version-info 1:0:0 + libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow + libnoatunarts_la_METASOURCES = AUTO - noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ - $(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la ---- kdemultimedia-3.5.7/xine_artsplugin/Makefile.in 2007-05-14 04:37:26.000000000 -0700 -+++ kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.in 2007-06-15 16:11:40.000000000 -0700 -@@ -510,7 +510,7 @@ +--- kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.am 2005-09-10 01:19:37.000000000 -0700 ++++ kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.am 2007-06-15 17:48:15.000000000 -0700 +@@ -8,7 +8,7 @@ + -I$(kde_includes)/arts \ + $(all_includes) - #>- libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread - #>+ 1 --libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -pthread -+libarts_xine_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) -pthread +-kde_module_LTLIBRARIES = noatun_winskin.la ++noatun_modules_winskin_LTLIBRARIES = noatun_winskin.la + + noatun_winskin_la_SOURCES = fileInfo.cpp \ + guiSpectrumAnalyser.cpp \ +--- kdemultimedia-3.5.7/xine_artsplugin/Makefile.am 2006-07-22 01:10:54.000000000 -0700 ++++ kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.am 2007-06-15 17:48:55.000000000 -0700 +@@ -7,7 +7,7 @@ + libarts_xine_la_SOURCES = xinePlayObject.cc \ + xinePlayObject_impl.cpp \ + audio_fifo_out.c +-libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread ++libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread -avoid-version libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \ -lkmedia2_idl -lsoundserver_idl -lartsflow Modified: trunk/experimental/common/main/finkinfo/kde/kdemultimedia3.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdemultimedia3.patch&rev=844&repname=user%3a+ranger ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdemultimedia3.patch (original) +++ trunk/experimental/common/main/finkinfo/kde/kdemultimedia3.patch Tue Jun 19 15:45:26 2007 @@ -1,104 +1,58 @@ -diff -uNr kdemultimedia-3.5.7/akode_artsplugin/Makefile.in kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.in ---- kdemultimedia-3.5.7/akode_artsplugin/Makefile.in 2007-05-14 04:37:18.000000000 -0700 -+++ kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.in 2007-06-15 14:57:18.000000000 -0700 -@@ -57,7 +57,7 @@ - *) f=$$p;; \ - esac; - am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mcopclassdir)" \ -+am__installdirs = "$(DESTDIR)$(libdir)/akode" "$(DESTDIR)$(mcopclassdir)" \ - "$(DESTDIR)$(mcoptypedir)" - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -496,7 +496,7 @@ +--- kdemultimedia-3.5.7/akode_artsplugin/Makefile.am 2006-07-22 01:10:53.000000000 -0700 ++++ kdemultimedia-3.5.7-new/akode_artsplugin/Makefile.am 2007-06-15 17:48:31.000000000 -0700 +@@ -1,8 +1,9 @@ + INCLUDES= $(akode_includes) -I$(kde_includes)/arts $(all_includes) - #>- libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined - #>+ 1 --libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -+libarts_akode_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) - libarts_akode_la_LIBADD = $(akode_libs) -lkmedia2_idl -lsoundserver_idl -lartsflow - #>- libarts_akode_la_METASOURCES = AUTO - libarts_akode_la_COMPILE_FIRST = akodearts.h -@@ -561,12 +561,12 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ test -z "$(libdir)/akode" || $(mkdir_p) "$(DESTDIR)$(libdir)/akode" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/akode/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/akode/$$f"; \ - else :; fi; \ - done +-noinst_HEADERS = akodePlayObject_impl.h ++akodedir = $(libdir)/akode ++akode_LTLIBRARIES = libarts_akode.la -@@ -590,7 +590,7 @@ - #>+ 2 - @[EMAIL PROTECTED]: libarts_akode.la.closure $(libarts_akode_la_OBJECTS) $(libarts_akode_la_DEPENDENCIES) - @[EMAIL PROTECTED]: $(libarts_akode_la_OBJECTS) $(libarts_akode_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libarts_akode_la_LDFLAGS) $(libarts_akode_la_OBJECTS) $(libarts_akode_la_LIBADD) $(LIBS) -+ $(CXXLINK) -rpath $(libdir)/akode $(libarts_akode_la_LDFLAGS) $(libarts_akode_la_OBJECTS) $(libarts_akode_la_LIBADD) $(LIBS) +-lib_LTLIBRARIES = libarts_akode.la ++noinst_HEADERS = akodePlayObject_impl.h - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -772,7 +772,7 @@ - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mcopclassdir)" "$(DESTDIR)$(mcoptypedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)/akode" "$(DESTDIR)$(mcopclassdir)" "$(DESTDIR)$(mcoptypedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done - install: install-am -diff -uNr kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.in kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.in ---- kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.in 2007-05-14 04:37:19.000000000 -0700 -+++ kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.in 2007-06-15 15:42:21.000000000 -0700 -@@ -486,7 +486,7 @@ + libarts_akode_la_SOURCES = akodearts.cc akodePlayObject_impl.cpp \ + akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp \ +--- kdemultimedia-3.5.7/audiofile_artsplugin/Makefile.am 2006-07-22 01:10:54.000000000 -0700 ++++ kdemultimedia-3.5.7-new/audiofile_artsplugin/Makefile.am 2007-06-15 17:46:38.000000000 -0700 +@@ -5,7 +5,7 @@ + lib_LTLIBRARIES = libarts_audiofile.la + libarts_audiofile_la_COMPILE_FIRST = audiofilearts.h libarts_audiofile_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp - #>- libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined - #>+ 1 --libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -+libarts_audiofile_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) - libarts_audiofile_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile - #>- libarts_audiofile_la_METASOURCES = AUTO - mcoptypedir = $(libdir)/mcop -diff -uNr kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.in kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.in ---- kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.in 2007-05-14 04:37:24.000000000 -0700 -+++ kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.in 2007-06-15 16:05:39.000000000 -0700 -@@ -497,7 +497,7 @@ +-libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined ++libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version + libarts_audiofile_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile + libarts_audiofile_la_METASOURCES = AUTO + +--- kdemultimedia-3.5.7/noatun/library/noatunarts/Makefile.am 2005-09-10 01:19:33.000000000 -0700 ++++ kdemultimedia-3.5.7-new/noatun/library/noatunarts/Makefile.am 2007-06-15 17:47:12.000000000 -0700 +@@ -6,7 +6,7 @@ + FFTScopes.cpp StereoEffectStack_impl.cpp \ + StereoVolumeControl_impl.cpp Session_impl.cpp libnoatunarts_la_COMPILE_FIRST = noatunarts.h - #>- libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined - #>+ 1 --libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined $(KDE_NO_UNDEFINED) -+libnoatunarts_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) - libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow - #>- libnoatunarts_la_METASOURCES = AUTO - mcoptypedir = $(libdir)/mcop -diff -uNr kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.in kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.in ---- kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.in 2007-05-14 04:37:26.000000000 -0700 -+++ kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.in 2007-06-15 16:11:19.000000000 -0700 -@@ -563,8 +563,7 @@ - #>- noatun_winskin_la_LDFLAGS = $(all_libraries) \ - #>- -module -avoid-version -no-undefined - #>+ 2 --noatun_winskin_la_LDFLAGS = $(all_libraries) \ -- -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) -+noatun_winskin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) +-libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined ++libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -version-info 1:0:0 + libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow + libnoatunarts_la_METASOURCES = AUTO - noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ - $(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la -diff -uNr kdemultimedia-3.5.7/xine_artsplugin/Makefile.in kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.in ---- kdemultimedia-3.5.7/xine_artsplugin/Makefile.in 2007-05-14 04:37:26.000000000 -0700 -+++ kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.in 2007-06-15 16:11:40.000000000 -0700 -@@ -510,7 +510,7 @@ +--- kdemultimedia-3.5.7/noatun/modules/winskin/Makefile.am 2005-09-10 01:19:37.000000000 -0700 ++++ kdemultimedia-3.5.7-new/noatun/modules/winskin/Makefile.am 2007-06-15 17:48:15.000000000 -0700 +@@ -8,7 +8,7 @@ + -I$(kde_includes)/arts \ + $(all_includes) - #>- libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread - #>+ 1 --libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_NO_UNDEFINED) -pthread -+libarts_xine_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) -pthread +-kde_module_LTLIBRARIES = noatun_winskin.la ++noatun_modules_winskin_LTLIBRARIES = noatun_winskin.la + + noatun_winskin_la_SOURCES = fileInfo.cpp \ + guiSpectrumAnalyser.cpp \ +--- kdemultimedia-3.5.7/xine_artsplugin/Makefile.am 2006-07-22 01:10:54.000000000 -0700 ++++ kdemultimedia-3.5.7-new/xine_artsplugin/Makefile.am 2007-06-15 17:48:55.000000000 -0700 +@@ -7,7 +7,7 @@ + libarts_xine_la_SOURCES = xinePlayObject.cc \ + xinePlayObject_impl.cpp \ + audio_fifo_out.c +-libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread ++libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread -avoid-version libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \ -lkmedia2_idl -lsoundserver_idl -lartsflow ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits