head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.52 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.50 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.48 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.46 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.44 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.42 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.40 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.38 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.36 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.34 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.32 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.30 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.28 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.26 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.24 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.22 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.20 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.18 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.16 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.14 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.12 pkgsrc-2005Q2-base:1.9 pkgsrc-2005Q1:1.9.0.10 pkgsrc-2005Q1-base:1.9 pkgsrc-2004Q4:1.9.0.8 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.6 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.9.0.4 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.9.0.2 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.2.0.6 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.2 pkgviews-base:1.2 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2004.01.26.15.45.22; author jmmv; state dead; branches; next 1.8; 1.8 date 2004.01.15.10.30.03; author markd; state Exp; branches; next 1.7; 1.7 date 2003.07.30.14.56.03; author markd; state Exp; branches; next 1.6; 1.6 date 2003.05.22.03.05.41; author markd; state Exp; branches; next 1.5; 1.5 date 2003.03.11.13.33.54; author markd; state Exp; branches; next 1.4; 1.4 date 2003.01.02.09.12.21; author skrll; state Exp; branches; next 1.3; 1.3 date 2002.10.03.11.21.29; author markd; state Exp; branches; next 1.2; 1.2 date 2002.06.25.06.34.34; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.14.46.49; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.14.46.49; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.14.46.49; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.38.19; author jlam; state Exp; branches; next ; desc @@ 1.9 log @kdemultimedia[23] moved to the multimedia category. @ text @$NetBSD: patch-bb,v 1.8 2004/01/15 10:30:03 markd Exp $ --- noatun/library/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 +++ noatun/library/Makefile.in @@@@ -389,9 +389,9 @@@@ INCLUDES = -I$(top_srcdir)/noatun/librar SUBDIRS = noatunarts noatun . noatuntags -lib_LTLIBRARIES = libnoatun.la libnoatuncontrols.la +lib_LTLIBRARIES = libnoatun_core.la libnoatuncontrols.la -libnoatun_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \ +libnoatun_core_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \ playlist.cpp pref.cpp \ player.cpp playlistsaver.cpp app.cpp \ pluginloader.cpp plugin.cpp \ @@@@ -404,15 +404,15 @@@@ libnoatun_la_SOURCES = pluginmodule.cpp include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h -libnoatun_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \ +libnoatun_core_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \ $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \ -L$(top_builddir)/arts/gui/kde -libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \ +libnoatun_core_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ $(top_builddir)/arts/modules/libartsmodules.la \ - -lkio -lqtmcop -lkmedia2_idl -lnoatunarts \ + -lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG) @@@@ -435,27 +435,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -libnoatun_la_DEPENDENCIES = \ +libnoatun_core_la_DEPENDENCIES = \ $(top_builddir)/arts/gui/common/libartsgui.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ - $(top_builddir)/arts/modules/libartsmodules.la -am_libnoatun_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ + $(top_builddir)/arts/modules/libartsmodules.la \ + $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la +am_libnoatun_core_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \ pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \ noatunui.lo effectview.lo equalizerview.lo equalizer.lo \ effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo \ video.lo -#>- libnoatun_la_OBJECTS = $(am_libnoatun_la_OBJECTS) +#>- libnoatun_core_la_OBJECTS = $(am_libnoatun_core_la_OBJECTS) #>+ 9 -libnoatun_la_final_OBJECTS = libnoatun_la.all_cpp.lo -libnoatun_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ +libnoatun_core_la_final_OBJECTS = libnoatun_core_la.all_cpp.lo +libnoatun_core_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \ pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \ noatunui.lo effectview.lo equalizerview.lo equalizer.lo \ effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo \ video.lo -@@KDE_USE_FINAL_FALSE@@libnoatun_la_OBJECTS = $(libnoatun_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@libnoatun_la_OBJECTS = $(libnoatun_la_final_OBJECTS) +@@KDE_USE_FINAL_FALSE@@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_final_OBJECTS) libnoatuncontrols_la_DEPENDENCIES = am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo #>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS) @@@@ -495,7 +496,7 @@@@ am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/stereobuttonaction.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/video.Plo #>+ 35 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libnoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P ./$(DEPDIR)/app.Plo ./$(DEPDIR)/cmodule.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libnoatun_core_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P ./$(DEPDIR)/app.Plo ./$(DEPDIR)/cmodule.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/controls.Plo ./$(DEPDIR)/conversion.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/downloader.Plo ./$(DEPDIR)/effects.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/effectview.Plo ./$(DEPDIR)/engine.Plo \ @@@@ -548,8 +549,8 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) \ - $(gentable_SOURCES) +DIST_SOURCES = $(libnoatun_core_la_SOURCES) \ + $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES) DATA = $(magictable_DATA) HEADERS = $(include_HEADERS) @@@@ -562,7 +563,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES) +SOURCES = $(libnoatun_core_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -607,8 +608,8 @@@@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libnoatun.la: $(libnoatun_la_OBJECTS) $(libnoatun_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libnoatun_la_LDFLAGS) $(libnoatun_la_OBJECTS) $(libnoatun_la_LIBADD) $(LIBS) +libnoatun_core.la: $(libnoatun_core_la_OBJECTS) $(libnoatun_core_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libnoatun_core_la_LDFLAGS) $(libnoatun_core_la_OBJECTS) $(libnoatun_core_la_LIBADD) $(LIBS) libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS) @@@@ -861,7 +862,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=fft.h pluginmodule.h fft.c noatunlistview.h globalvideo.h +KDE_DIST=fft.h Makefile.in.rej noatunlistview.h pluginmodule.h globalvideo.h fft.c DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1024,50 +1025,50 @@@@ magictable: gentable .NOEXPORT: #>+ 3 -cmodule.moc: $(srcdir)/cmodule.h - $(MOC) $(srcdir)/cmodule.h -o cmodule.moc +equalizerview.moc: $(srcdir)/equalizerview.h + $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc #>+ 1 -mocs: cmodule.moc +mocs: equalizerview.moc #>+ 3 -effectview.moc: $(srcdir)/effectview.h - $(MOC) $(srcdir)/effectview.h -o effectview.moc +plugin_deps.moc: $(srcdir)/plugin_deps.h + $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc #>+ 1 -mocs: effectview.moc +mocs: plugin_deps.moc #>+ 3 -globalvideo.moc: $(srcdir)/globalvideo.h - $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc +cmodule.moc: $(srcdir)/cmodule.h + $(MOC) $(srcdir)/cmodule.h -o cmodule.moc #>+ 1 -mocs: globalvideo.moc +mocs: cmodule.moc #>+ 3 -pluginmodule.moc: $(srcdir)/pluginmodule.h - $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc +mimetypetree.moc: $(srcdir)/mimetypetree.h + $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc #>+ 1 -mocs: pluginmodule.moc +mocs: mimetypetree.moc #>+ 3 -equalizerview.moc: $(srcdir)/equalizerview.h - $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc +pluginmodule.moc: $(srcdir)/pluginmodule.h + $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc #>+ 1 -mocs: equalizerview.moc +mocs: pluginmodule.moc #>+ 3 -mimetypetree.moc: $(srcdir)/mimetypetree.h - $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc +effectview.moc: $(srcdir)/effectview.h + $(MOC) $(srcdir)/effectview.h -o effectview.moc #>+ 1 -mocs: mimetypetree.moc +mocs: effectview.moc #>+ 3 -plugin_deps.moc: $(srcdir)/plugin_deps.h - $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc +globalvideo.moc: $(srcdir)/globalvideo.h + $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc #>+ 1 -mocs: plugin_deps.moc +mocs: globalvideo.moc #>+ 3 clean-metasources: - -rm -f cmodule.moc effectview.moc globalvideo.moc pluginmodule.moc equalizerview.moc mimetypetree.moc plugin_deps.moc + -rm -f equalizerview.moc plugin_deps.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc globalvideo.moc #>+ 2 docs-am: @@@@ -1080,16 +1081,16 @@@@ force-reedit: #>+ 11 -libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp cmodule.moc globalvideo.moc effectview.moc pluginmodule.moc plugin_deps.moc mimetypetree.moc equalizerview.moc - @@echo 'creating libnoatun_la.all_cpp.cpp ...'; \ - rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \ +libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp equalizerview.moc cmodule.moc plugin_deps.moc mimetypetree.moc pluginmodule.moc globalvideo.moc effectview.moc + @@echo 'creating libnoatun_core_la.all_cpp.cpp ...'; \ + rm -f libnoatun_core_la.all_cpp.files libnoatun_core_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libnoatun_core_la.all_cpp.final; \ for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp video.cpp ; do \ - echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libnoatun_core_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_core_la.all_cpp.final; \ done; \ - cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \ - rm -f libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files + cat libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files > libnoatun_core_la.all_cpp.cpp; \ + rm -f libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files #>+ 11 libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp @@@@ -1105,20 +1106,20 @@@@ libnoatuncontrols_la.all_cpp.cpp: $(srcd #>+ 3 clean-final: - -rm -f libnoatun_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp + -rm -f libnoatun_core_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp #>+ 2 final: - $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" all-am + $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" install-am + $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" all-am + $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am + $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1128,17 +1129,17 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 15 -plugin.lo: plugin_deps.moc -effectview.lo: effectview.moc -pluginmodule.o: pluginmodule.moc +equalizerview.lo: equalizerview.moc +pluginmodule.lo: pluginmodule.moc +video.o: globalvideo.moc +cmodule.lo: cmodule.moc video.lo: globalvideo.moc effectview.o: effectview.moc -mimetypetree.o: mimetypetree.moc +pluginmodule.o: pluginmodule.moc plugin.o: plugin_deps.moc -cmodule.o: cmodule.moc -video.o: globalvideo.moc -pluginmodule.lo: pluginmodule.moc -cmodule.lo: cmodule.moc equalizerview.o: equalizerview.moc +cmodule.o: cmodule.moc +mimetypetree.o: mimetypetree.moc +effectview.lo: effectview.moc mimetypetree.lo: mimetypetree.moc -equalizerview.lo: equalizerview.moc +plugin.lo: plugin_deps.moc @ 1.8 log @Update to KDE-3.1.5. Also move patch-bh to patch-da so it applies after patch-co so autoconf doesn't kick in to redo it. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update kdemultimedia to 3.1.3. Changes: * kscd: add method to determine if KsCD is playing * noatun: memory leak and memory corruption fixes * noatun: Add volume slider for "simple" module * artsbuilder: fix several corruptsions and other crashes @ text @d3 1 a3 1 --- noatun/library/Makefile.in.orig 2003-07-15 22:13:59.000000000 +1200 d5 1 a5 1 @@@@ -388,9 +388,9 @@@@ INCLUDES = -I$(top_srcdir)/noatun/librar d17 1 a17 1 @@@@ -403,15 +403,15 @@@@ libnoatun_la_SOURCES = pluginmodule.cpp d36 1 a36 1 @@@@ -433,27 +433,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d73 1 a73 1 @@@@ -493,7 +494,7 @@@@ am__depfiles_maybe = depfiles d82 1 a82 1 @@@@ -546,8 +547,8 @@@@ CXXLD = $(CXX) d93 1 a93 1 @@@@ -560,7 +561,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d102 1 a102 1 @@@@ -605,8 +606,8 @@@@ clean-libLTLIBRARIES: d113 1 a113 1 @@@@ -853,7 +854,7 @@@@ distclean-tags: d117 1 a117 1 -KDE_DIST=fft.c globalvideo.h pluginmodule.h noatunlistview.h fft.h d122 1 a122 1 @@@@ -1016,29 +1017,29 @@@@ magictable: gentable d126 2 a127 2 -plugin_deps.moc: $(srcdir)/plugin_deps.h - $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc d132 1 a132 1 -mocs: plugin_deps.moc d135 2 a136 2 -mimetypetree.moc: $(srcdir)/mimetypetree.h - $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc d141 1 a141 1 -mocs: mimetypetree.moc d144 2 a145 2 -effectview.moc: $(srcdir)/effectview.h - $(MOC) $(srcdir)/effectview.h -o effectview.moc d150 1 a150 1 -mocs: effectview.moc d153 2 a154 2 -equalizerview.moc: $(srcdir)/equalizerview.h - $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc d159 1 a159 1 -mocs: equalizerview.moc d162 5 a166 3 pluginmodule.moc: $(srcdir)/pluginmodule.h $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc @@@@ -1046,11 +1047,11 @@@@ pluginmodule.moc: $(srcdir)/pluginmodule d168 2 a169 1 mocs: pluginmodule.moc d171 2 a172 2 -cmodule.moc: $(srcdir)/cmodule.h - $(MOC) $(srcdir)/cmodule.h -o cmodule.moc d177 1 a177 1 -mocs: cmodule.moc d180 8 a187 4 globalvideo.moc: $(srcdir)/globalvideo.h $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc @@@@ -1059,7 +1060,7 @@@@ globalvideo.moc: $(srcdir)/globalvideo.h mocs: globalvideo.moc d190 1 a190 1 - -rm -f plugin_deps.moc mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc globalvideo.moc d195 1 a195 1 @@@@ -1072,16 +1073,16 @@@@ force-reedit: d199 1 a199 1 -libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp plugin_deps.moc mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc globalvideo.moc d220 1 a220 1 @@@@ -1097,20 +1098,20 @@@@ libnoatuncontrols_la.all_cpp.cpp: $(srcd d246 1 a246 1 @@@@ -1120,17 +1121,17 @@@@ kde-rpo-clean: d250 1 a250 1 -mimetypetree.o: mimetypetree.moc d252 1 a252 3 -equalizerview.o: equalizerview.moc -effectview.o: effectview.moc -video.lo: globalvideo.moc d254 8 a261 3 pluginmodule.lo: pluginmodule.moc video.o: globalvideo.moc -plugin.lo: plugin_deps.moc d263 4 a266 9 -equalizerview.lo: equalizerview.moc -plugin.o: plugin_deps.moc -mimetypetree.lo: mimetypetree.moc cmodule.lo: cmodule.moc +video.lo: globalvideo.moc +effectview.o: effectview.moc pluginmodule.o: pluginmodule.moc +plugin.o: plugin_deps.moc +equalizerview.o: equalizerview.moc d270 2 a271 1 +mimetypetree.lo: mimetypetree.moc @ 1.6 log @Update KDE to 3.1.2. Changes: kdemultimedia: * Ogg Vorbis Info List view column titles were incorrect. * kmix: Vertical label widget to sliders in replacement of large horizontal labels * kmix: Fixed alsa 0.9x to restore current volumes * kmix: Fixed multiple alsa 0.9x cards detection @ text @d3 1 a3 1 --- noatun/library/Makefile.in.orig Thu May 8 00:05:29 2003 d5 1 a5 1 @@@@ -387,9 +387,9 @@@@ INCLUDES = -I$(top_srcdir)/noatun/librar d17 1 a17 1 @@@@ -402,15 +402,15 @@@@ libnoatun_la_SOURCES = pluginmodule.cpp d36 1 a36 1 @@@@ -432,27 +432,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d73 1 a73 1 @@@@ -492,7 +493,7 @@@@ am__depfiles_maybe = depfiles d82 1 a82 1 @@@@ -545,8 +546,8 @@@@ CXXLD = $(CXX) d93 1 a93 1 @@@@ -559,7 +560,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d102 1 a102 1 @@@@ -604,8 +605,8 @@@@ clean-libLTLIBRARIES: d113 1 a113 1 @@@@ -852,7 +853,7 @@@@ distclean-tags: d118 1 a118 1 +KDE_DIST=fft.h noatunlistview.h pluginmodule.h globalvideo.h fft.c d122 1 a122 1 @@@@ -1015,28 +1016,28 @@@@ magictable: gentable d131 3 d140 3 d149 3 d158 3 d164 3 a166 1 d173 3 d178 3 a180 2 @@@@ -1044,7 +1045,7 @@@@ globalvideo.moc: $(srcdir)/globalvideo.h d188 1 a188 1 @@@@ -1057,16 +1058,16 @@@@ force-reedit: d213 1 a213 1 @@@@ -1082,20 +1083,20 @@@@ libnoatuncontrols_la.all_cpp.cpp: $(srcd d239 1 a239 1 @@@@ -1105,17 +1106,17 @@@@ kde-rpo-clean: @ 1.5 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdemultimedia Started a video framework More consistent internationalisation in many applications. NEW IN KDE: KAudioCreator, a CD ripper and audio encoder frontend. NEW IN KDE: KRec, an audio recorder using aRts. KMediaPlayer interface added to kdelibs to reuse Kaboodle. Noatun: Added option to clear the playlist when running with a file as command line option. Added video thumbnail creator using xine-arts. KMix: Added mute control support. @ text @d3 1 a3 1 --- noatun/library/Makefile.in.orig Fri Jan 17 08:49:41 2003 d5 1 a5 1 @@@@ -336,9 +336,9 @@@@ INCLUDES = -I$(top_srcdir)/noatun/librar d17 1 a17 1 @@@@ -351,15 +351,15 @@@@ libnoatun_la_SOURCES = pluginmodule.cpp d36 1 a36 1 @@@@ -381,27 +381,28 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d73 1 a73 1 @@@@ -444,7 +445,7 @@@@ am__depfiles_maybe = depfiles d82 2 a83 1 @@@@ -498,8 +499,8 @@@@ CXXLD = $(CXX) a85 1 CXXFLAGS = @@CXXFLAGS@@ d93 2 a94 2 @@@@ -511,7 +512,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive d102 1 a102 1 @@@@ -556,8 +557,8 @@@@ clean-libLTLIBRARIES: d113 2 a114 2 @@@@ -768,7 +769,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d122 1 a122 1 @@@@ -916,28 +917,28 @@@@ magictable: gentable d161 1 a161 1 @@@@ -945,7 +946,7 @@@@ globalvideo.moc: $(srcdir)/globalvideo.h d170 1 a170 1 @@@@ -958,16 +959,16 @@@@ force-reedit: d195 1 a195 1 @@@@ -983,20 +984,20 @@@@ libnoatuncontrols_la.all_cpp.cpp: $(srcd d221 1 a221 1 @@@@ -1006,17 +1007,17 @@@@ kde-rpo-clean: @ 1.4 log @Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or 1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely. @ text @d3 1 a3 1 --- noatun/library/Makefile.in.orig Sat Dec 28 14:04:00 2002 d5 1 a5 1 @@@@ -300,9 +300,9 @@@@ INCLUDES = -I$(top_srcdir)/noatun/librar d17 1 a17 1 @@@@ -314,15 +314,15 @@@@ libnoatun_la_SOURCES = pluginmodule.cpp d33 1 a33 1 -lartsflow -lsoundserver_idl -lartskde $(LIBDL) d36 1 a36 1 @@@@ -344,26 +344,27 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d52 2 a53 1 effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo d64 2 a65 2 effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo\ plugin_deps.moc.lo d73 10 a82 10 @@@@ -403,7 +404,7 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d #>- @@AMDEP_TRUE@@ $(DEPDIR)/scrollinglabel.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/stereobuttonaction.Plo #>+ 29 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_core_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/controls.Plo $(DEPDIR)/conversion.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/downloader.Plo $(DEPDIR)/effects.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/effectview.Plo $(DEPDIR)/engine.Plo \ @@@@ -451,8 +452,8 @@@@ CXXLD = $(CXX) d93 1 a93 1 @@@@ -464,7 +465,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d102 4 a105 4 @@@@ -511,8 +512,8 @@@@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d113 2 a114 2 @@@@ -704,7 +705,7 @@@@ distclean-tags: d117 2 a118 2 -KDE_DIST=fft.c pluginmodule.h noatunlistview.h video.cpp fft.h +KDE_DIST=video.cpp fft.h noatunlistview.h pluginmodule.h fft.c d122 1 a122 1 @@@@ -846,32 +847,32 @@@@ magictable: gentable d126 2 a127 2 -plugin_deps.moc.cpp: $(srcdir)/plugin_deps.h - $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc.cpp d134 2 a135 2 +plugin_deps.moc.cpp: $(srcdir)/plugin_deps.h + $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc.cpp d160 4 d165 2 a166 2 - -rm -f plugin_deps.moc.cpp mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc + -rm -f equalizerview.moc plugin_deps.moc.cpp cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc d170 1 a170 1 @@@@ -884,16 +885,16 @@@@ force-reedit: d174 1 a174 1 -libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc d178 1 a178 1 +libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc d182 1 a182 1 for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp plugin_deps.moc.cpp ; do \ d194 2 a195 2 libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp plugin_deps.moc.cpp @@@@ -921,20 +922,20 @@@@ gentable.all_cpp.cpp: $(srcdir)/Makefile d199 2 a200 2 - -rm -f libnoatun_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp gentable.all_cpp.cpp + -rm -f libnoatun_core_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp gentable.all_cpp.cpp d221 1 a221 1 @@@@ -944,13 +945,13 @@@@ kde-rpo-clean: d224 1 a224 2 #>+ 11 -cmodule.o: cmodule.moc a226 1 equalizerview.lo: equalizerview.moc d229 8 a237 2 +cmodule.o: cmodule.moc pluginmodule.lo: pluginmodule.moc d239 1 d242 4 a246 2 +mimetypetree.o: mimetypetree.moc +equalizerview.o: equalizerview.moc d248 1 @ 1.3 log @buildlink1 -> buildlink2 Expand on the DESCR. Partially addresses pkg/18374 @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.2 2002/06/25 06:34:34 skrll Exp $ d3 1 a3 1 --- noatun/library/Makefile.in.orig Sun Jun 9 10:13:00 2002 d5 1 a5 1 @@@@ -301,9 +301,9 @@@@ d17 1 a17 1 @@@@ -315,15 +315,15 @@@@ d23 2 a24 2 $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \ -L$(top_builddir)/arts/gui/kde d36 1 a36 1 @@@@ -345,27 +345,27 @@@@ d44 1 a44 1 $(top_builddir)/arts/modules/libartsmodules.la d46 2 d55 1 a55 1 #>+ 10 d64 1 a64 2 plugin_deps.moc.lo \ - libnoatun_la_meta_unload.lo a66 1 + libnoatun_core_la_meta_unload.lo d72 10 a81 1 @@@@ -423,8 +423,8 @@@@ d92 1 a92 1 @@@@ -436,7 +436,7 @@@@ d101 1 a101 1 @@@@ -483,8 +483,8 @@@@ d112 1 a112 1 @@@@ -676,7 +676,7 @@@@ d116 2 a117 2 -KDE_DIST=fft.h noatunlistview.h pluginmodule.h video.cpp fft.c +KDE_DIST=video.cpp fft.h noatunlistview.h pluginmodule.h magictable fft.c d121 2 a122 1 @@@@ -856,33 +856,33 @@@@ d124 5 d130 5 a134 20 #>+ 12 -libnoatun_la_meta_unload.cpp: equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc - @@echo 'creating libnoatun_la_meta_unload.cpp' - @@-rm -f libnoatun_la_meta_unload.cpp +libnoatun_core_la_meta_unload.cpp: equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc + @@echo 'creating libnoatun_core_la_meta_unload.cpp' + @@-rm -f libnoatun_core_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_libnoatun_la[] = {' > libnoatun_la_meta_unload.cpp ;\ - cat equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_la_meta_unload.cpp ;\ - echo '0};' >> libnoatun_la_meta_unload.cpp ;\ - echo '#include ' >> libnoatun_la_meta_unload.cpp ;\ - echo '_UNLOAD(libnoatun_la)' >> libnoatun_la_meta_unload.cpp ;\ - else echo > libnoatun_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libnoatun_core_la[] = {' > libnoatun_core_la_meta_unload.cpp ;\ + cat equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_core_la_meta_unload.cpp ;\ + echo '0};' >> libnoatun_core_la_meta_unload.cpp ;\ + echo '#include ' >> libnoatun_core_la_meta_unload.cpp ;\ + echo '_UNLOAD(libnoatun_core_la)' >> libnoatun_core_la_meta_unload.cpp ;\ + else echo > libnoatun_core_la_meta_unload.cpp; fi d136 21 d159 8 a166 3 clean-moc-classes: - -rm -f libnoatun_la_meta_unload.cpp + -rm -f libnoatun_core_la_meta_unload.cpp d169 1 a169 1 -libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libnoatun_la_meta_unload.cpp plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc d173 1 a173 4 - for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_la_meta_unload.cpp plugin_deps.moc.cpp; do \ - echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \ +libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libnoatun_core_la_meta_unload.cpp plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc d177 3 a179 1 + for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_core_la_meta_unload.cpp plugin_deps.moc.cpp; do \ d183 1 a183 1 - cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \ d185 1 a185 1 + cat libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files > libnoatun_core_la.all_cpp.cpp; \ d189 2 a190 2 libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp @@@@ -910,20 +910,20 @@@@ d215 21 a235 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.2 log @Fix the noatun.la lossage. @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.1 2002/05/31 14:46:49 skrll Exp $ d17 1 a17 1 @@@@ -315,12 +315,12 @@@@ d31 5 a35 1 -lkio -lqtmcop -lkmedia2_idl -lnoatunarts \ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 184 a186 31 --- noatun/noatun_main.cpp.orig Thu May 30 20:46:08 2002 +++ noatun/noatun_main.cpp @@@@ -0,0 +1,28 @@@@ +/* + * + * Copyright (c) 2001 Nick Hudson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +extern "C" int kdemain(int, char* []); + +int main( int argc, char* argv[] ) +{ + return kdemain(argc, argv); +} @ 1.1.1.1 log @Initial import of a kdemultimedia3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-bb was added on branch buildlink2 on 2002-06-23 18:38:19 +0000 @ text @d1 33 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 33 $NetBSD: patch-bb,v 1.1.1.1.2.1 2002/06/23 18:38:19 jlam Exp $ --- noatun/noatun_main.cpp.orig Thu May 30 20:46:08 2002 +++ noatun/noatun_main.cpp @@@@ -0,0 +1,28 @@@@ +/* + * + * Copyright (c) 2001 Nick Hudson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +extern "C" int kdemain(int, char* []); + +int main( int argc, char* argv[] ) +{ + return kdemain(argc, argv); +} @