diff options
Diffstat (limited to 'audio/kdemultimedia3/patches/patch-az')
| -rw-r--r-- | audio/kdemultimedia3/patches/patch-az | 145 |
1 files changed, 69 insertions, 76 deletions
diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az index d215dff6e50..d7be4923e9f 100644 --- a/audio/kdemultimedia3/patches/patch-az +++ b/audio/kdemultimedia3/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ +$NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $ ---- noatun/Makefile.in.orig Tue May 14 01:53:28 2002 +--- noatun/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/Makefile.in -@@ -295,22 +295,25 @@ +@@ -294,22 +294,25 @@ SUBDIRS = pics library modules . KDE_ICON = AUTO @@ -35,7 +35,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ applnk_DATA = noatun.desktop applnkdir = $(kde_appsdir)/Multimedia -@@ -328,25 +331,31 @@ +@@ -327,25 +330,31 @@ subdir = noatun mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -78,19 +78,31 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ am_noatun20update_OBJECTS = noatun20update.$(OBJEXT) #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS) #>+ 1 -@@ -359,8 +368,9 @@ +@@ -358,13 +367,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/noatun_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po ++#>+ 7 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/libnoatun_main_la.all_cpp.P $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -380,8 +390,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -385,8 +397,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -101,7 +113,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA) -@@ -391,7 +401,7 @@ +@@ -396,7 +408,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = COPYING Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -110,7 +122,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -438,6 +448,27 @@ +@@ -443,6 +455,27 @@ uninstall-kde_moduleLTLIBRARIES: clean-kde_moduleLTLIBRARIES: -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) @@ -118,17 +130,17 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ -+ else :; fi; \ ++ if test -f $$p; then \ ++ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ ++ else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +clean-libLTLIBRARIES: @@ -138,7 +150,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ noatun.la: $(noatun_la_OBJECTS) $(noatun_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(noatun_la_LDFLAGS) $(noatun_la_OBJECTS) $(noatun_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) -@@ -501,10 +532,11 @@ +@@ -506,10 +539,11 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -151,16 +163,16 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -674,7 +706,7 @@ +@@ -679,7 +713,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=avideoframe.cc hi22-app-noatun.png hi48-app-noatun.png noatun.desktop hi32-app-noatun.png preset.dance CHANGES preset.jazz FILES preset.metal hi16-app-noatun.png preset.trance joinhandler.h noatun.upd configure.in.in avideoframe.h preset.zero artsvideo.idl -+KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png noatun hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal joinhandler.kidl hi16-app-noatun.png noatun20update preset.zero hi32-app-noatun.png preset.dance +-KDE_DIST=artsvideo.idl preset.jazz hi22-app-noatun.png preset.trance joinhandler.h hi16-app-noatun.png FILES hi48-app-noatun.png avideoframe.h CHANGES preset.metal configure.in.in noatun.upd noatun.desktop preset.dance hi32-app-noatun.png preset.zero avideoframe.cc ++KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal hi16-app-noatun.png preset.zero hi32-app-noatun.png preset.dance DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -714,9 +746,11 @@ +@@ -719,9 +753,11 @@ distdir: $(DISTFILES) check-am: all-am check: check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) @@ -173,7 +185,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ install: install-recursive install-exec: install-exec-recursive -@@ -734,7 +768,6 @@ +@@ -739,7 +775,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -181,14 +193,14 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -747,10 +780,12 @@ +@@ -752,10 +787,12 @@ maintainer-clean-generic: clean: kde-rpo-clean clean-recursive #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ --#>- clean-libtool clean-updatePROGRAMS mostlyclean-am +-#>- clean-libtool clean-updatePROGRAMS mostlyclean-am -#>+ 2 -+#>- clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ -+#>- mostlyclean-am ++#>- clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++#>- mostlyclean-am +#>+ 3 clean-am: clean-idl clean-final clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ - clean-libtool clean-updatePROGRAMS mostlyclean-am @@ -197,26 +209,26 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ distclean: distclean-recursive -@@ -773,9 +808,9 @@ - install-data-am: install-kde-icons install-applnkDATA \ +@@ -776,9 +813,9 @@ info-am: + install-data-am: install-kde-icons install-applnkDATA \ install-presetsDATA install-updateDATA install-updatePROGRAMS -#>- install-exec-am: install-binPROGRAMS +#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS -+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES +-install-exec-am: install-binPROGRAMS install-kde_moduleLTLIBRARIES ++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES install-info: install-info-recursive -@@ -794,43 +829,42 @@ +@@ -797,43 +834,42 @@ mostlyclean-am: mostlyclean-compile most #>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \ - #>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ --#>- uninstall-presetsDATA uninstall-updateDATA \ --#>- uninstall-updatePROGRAMS -+#>- uninstall-libLTLIBRARIES uninstall-presetsDATA \ -+#>- uninstall-updateDATA uninstall-updatePROGRAMS + #>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +-#>- uninstall-presetsDATA uninstall-updateDATA \ +-#>- uninstall-updatePROGRAMS ++#>- uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++#>- uninstall-updateDATA uninstall-updatePROGRAMS #>+ 4 uninstall-am: uninstall-kde-icons uninstall-applnkDATA uninstall-binPROGRAMS \ uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ @@ -274,52 +286,33 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ messages: $(EXTRACTRC) `find . -name "*.rc"` > rc.cpp $(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -print` -o $(podir)/noatun.pot -@@ -877,11 +911,23 @@ +@@ -880,33 +916,33 @@ force-reedit: #>+ 11 --noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp -+libnoatun_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp $(srcdir)/joinhandler_skel.cpp +-noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp +- @echo 'creating noatun_la.all_cpp.cpp ...'; \ +- rm -f noatun_la.all_cpp.files noatun_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> noatun_la.all_cpp.final; \ ++libnoatun_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp + @echo 'creating libnoatun_main_la.all_cpp.cpp ...'; \ + rm -f libnoatun_main_la.all_cpp.files libnoatun_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libnoatun_main_la.all_cpp.final; \ -+ for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ + for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ +- echo "#include \"$$file\"" >> noatun_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libnoatun_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_main_la.all_cpp.final; \ -+ done; \ -+ cat libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files > libnoatun_main_la.all_cpp.cpp; \ -+ rm -f libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files -+ -+#>+ 11 -+noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp - @echo 'creating noatun_la.all_cpp.cpp ...'; \ - rm -f noatun_la.all_cpp.files noatun_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_la.all_cpp.final; \ -- for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ -+ for file in noatun_main.cpp ; do \ - echo "#include \"$$file\"" >> noatun_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun_la.all_cpp.final; \ done; \ -@@ -889,11 +935,11 @@ - rm -f noatun_la.all_cpp.final noatun_la.all_cpp.files - - #>+ 11 --noatun.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+noatun.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp - @echo 'creating noatun.all_cpp.cpp ...'; \ - rm -f noatun.all_cpp.files noatun.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in noatun_main.cpp ; do \ - echo "#include \"$$file\"" >> noatun.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun.all_cpp.final; \ - done; \ -@@ -914,20 +960,20 @@ +- cat noatun_la.all_cpp.final noatun_la.all_cpp.files > noatun_la.all_cpp.cpp; \ +- rm -f noatun_la.all_cpp.final noatun_la.all_cpp.files ++ cat libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files > libnoatun_main_la.all_cpp.cpp; \ ++ rm -f libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp -+ -rm -f libnoatun_main_la.all_cpp.cpp noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp +- -rm -f noatun_la.all_cpp.cpp ++ -rm -f libnoatun_main_la.all_cpp.cpp #>+ 2 final: @@ -339,4 +332,4 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ + $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean |