diff options
Diffstat (limited to 'multimedia/kdemultimedia3/patches')
63 files changed, 3455 insertions, 0 deletions
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa new file mode 100644 index 00000000000..1d26372cfde --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-aa @@ -0,0 +1,150 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 15:41:59 jmmv Exp $ + +--- configure.orig Thu May 8 00:05:31 2003 ++++ configure +@@ -27200,6 +27200,40 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'" ++ ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi ++ ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_lib_vm=no" ++ fi + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -28947,7 +28981,7 @@ fi; + + if test "x$au_enable_default" = xyes; then + case "$target" in +- *-*-linux*|*-*-freebsd*|*-*-netbsd|*-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?) ++ *-*-linux*|*-*-freebsd*|*-*-netbsd*|*-*-bsdi2.1|*-*-bsdi3.?|*-*-bsdi4.?) + au_enable_oss=yes + ;; + *-*-bsdi2.0) +@@ -33020,7 +33054,7 @@ fi + echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5 + echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6 + if test $ac_cv_lib_ossaudio_main = yes; then +- LIBOSSAUDIO="-lossaudio" ++ LIBOSSAUDIO="${LIBOSSAUDIO}" + fi + + +@@ -34105,8 +34139,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +- x11_dga2=yes +- ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then ++ x11_dga2=yes ++ fi ++ + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -34160,7 +34209,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xv ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xv=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -34215,7 +34279,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ++ lib=Xxf86vm ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then + x11_xvidmode=yes ++ fi + + else + echo "$as_me: failed program was:" >&5 +@@ -34807,10 +34886,10 @@ _ACEOF + ;; + + NetBSD) +- echo "$as_me:$LINENO: result: NetBSD :Unknown hardware. You will have problems!!" >&5 +-echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6 +- OS_TYPE="BSD" +- ++ echo "$as_me:$LINENO: result: using -lpthread" >&5 ++ echo $ECHO_N "using -lpthread... $ECHO_C" >&6 ++ OS_TYPE="BSD" ++ LIBPTHREAD="-lpthread" + cat >>confdefs.h <<\_ACEOF + #define OS_BSD 1 + _ACEOF diff --git a/multimedia/kdemultimedia3/patches/patch-ab b/multimedia/kdemultimedia3/patches/patch-ab new file mode 100644 index 00000000000..62c0b48922f --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ab @@ -0,0 +1,47 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 15:41:59 jmmv Exp $ + +--- kaboodle/Makefile.am.orig Mon Sep 16 09:14:51 2002 ++++ kaboodle/Makefile.am +@@ -2,7 +2,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde + + SUBDIRS = pics actions + +-lib_LTLIBRARIES = kaboodle.la ++lib_LTLIBRARIES = libkaboodle_main.la kaboodle.la + + kde_module_LTLIBRARIES = libkaboodlepart.la + +@@ -16,25 +16,24 @@ libkaboodlepart_la_SOURCES = conf.cpp \ + libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) + libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer + +-kaboodle_la_SOURCES = main.cpp \ ++libkaboodle_main_la_SOURCES = main.cpp \ + kaboodleapp.cpp \ + userinterface.cpp + +-kaboodle_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++kaboodle_la_SOURCES = kaboodle_main.cpp ++kaboodle_la_LIBADD = libkaboodle_main.la + kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + + bin_PROGRAMS = kaboodle + +-kaboodle_LDADD = kaboodle.la ++kaboodle_LDADD = libkaboodle_main.la + kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaboodle_SOURCES = dummy.cpp ++kaboodle_SOURCES = kaboodle_main.cpp + + libkaboodlepart_la_METASOURCES = AUTO +- +-CLEANFILES = dummy.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + applnk_DATA = kaboodle.desktop + applnkdir = $(kde_appsdir)/Multimedia diff --git a/multimedia/kdemultimedia3/patches/patch-ac b/multimedia/kdemultimedia3/patches/patch-ac new file mode 100644 index 00000000000..9c6af6f2b5d --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ac @@ -0,0 +1,332 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 15:42:04 jmmv Exp $ + +--- kaboodle/Makefile.in.orig 2003-12-29 11:29:36.000000000 +1300 ++++ kaboodle/Makefile.in +@@ -381,7 +381,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde + + SUBDIRS = pics actions + +-lib_LTLIBRARIES = kaboodle.la ++lib_LTLIBRARIES = libkaboodle_main.la kaboodle.la + + kde_module_LTLIBRARIES = libkaboodlepart.la + +@@ -396,24 +396,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \ + libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) + libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer + +-kaboodle_la_SOURCES = main.cpp \ ++libkaboodle_main_la_SOURCES = main.cpp \ + kaboodleapp.cpp \ + userinterface.cpp + + +-kaboodle_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LIBADD = libkaboodlepart.la ++libkaboodle_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++kaboodle_la_SOURCES = kaboodle_main.cpp ++kaboodle_la_LIBADD = libkaboodle_main.la + kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + + bin_PROGRAMS = kaboodle + +-kaboodle_LDADD = kaboodle.la ++kaboodle_LDADD = libkaboodle_main.la + kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaboodle_SOURCES = dummy.cpp ++kaboodle_SOURCES = kaboodle_main.cpp + + #>- libkaboodlepart_la_METASOURCES = AUTO + +-CLEANFILES = dummy.cpp +- + applnk_DATA = kaboodle.desktop + applnkdir = $(kde_appsdir)/Multimedia + +@@ -427,14 +429,19 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-kaboodle_la_DEPENDENCIES = libkaboodlepart.la +-am_kaboodle_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++kaboodle_la_DEPENDENCIES = libkaboodle_main.la ++am_kaboodle_la_OBJECTS = kaboodle_main.lo + #>- kaboodle_la_OBJECTS = $(am_kaboodle_la_OBJECTS) ++#>+ 1 ++kaboodle_la_OBJECTS = kaboodle_main.lo ++libkaboodle_main_la_DEPENDENCIES = libkaboodlepart.la ++am_libkaboodle_main_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++#>- libkaboodle_main_la_OBJECTS = $(am_libkaboodle_main_la_OBJECTS) + #>+ 4 +-kaboodle_la_final_OBJECTS = kaboodle_la.all_cpp.lo +-kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo +-@KDE_USE_FINAL_FALSE@kaboodle_la_OBJECTS = $(kaboodle_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kaboodle_la_OBJECTS = $(kaboodle_la_final_OBJECTS) ++libkaboodle_main_la_final_OBJECTS = libkaboodle_main_la.all_cpp.lo ++libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo ++@KDE_USE_FINAL_FALSE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_final_OBJECTS) + libkaboodlepart_la_DEPENDENCIES = + am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \ + kaboodle_factory.lo player.lo view.lo +@@ -448,31 +455,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con + bin_PROGRAMS = kaboodle$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kaboodle_OBJECTS = dummy.$(OBJEXT) ++am_kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) + #>- kaboodle_OBJECTS = $(am_kaboodle_OBJECTS) + #>+ 1 +-kaboodle_OBJECTS = dummy.$(OBJEXT) +-kaboodle_DEPENDENCIES = kaboodle.la ++kaboodle_OBJECTS = kaboodle_main.$(OBJEXT) ++kaboodle_DEPENDENCIES = libkaboodle_main.la + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/engine.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_factory.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/player.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo +-#>+ 13 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kaboodle_la.all_cpp.P $(DEPDIR)/libkaboodlepart_la.all_cpp.P ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/engine.Plo \ ++#>+ 17 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkaboodle_main_la.all_cpp.P $(DEPDIR)/libkaboodlepart_la.all_cpp.P ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_factory.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/player.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/engine.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_factory.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodle_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/player.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo +@@ -495,8 +508,8 @@ CXXLD = $(CXX) + #>+ 2 + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) \ +- $(kaboodle_SOURCES) ++DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) \ ++ $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) + DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA) + + +@@ -507,7 +520,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive + DIST_COMMON = AUTHORS Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) ++SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -582,6 +595,8 @@ clean-libLTLIBRARIES: + done + kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS) ++libkaboodle_main.la: $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkaboodle_main_la_LDFLAGS) $(libkaboodle_main_la_OBJECTS) $(libkaboodle_main_la_LIBADD) $(LIBS) + #>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) + #>+ 2 + @KDE_USE_CLOSURE_TRUE@libkaboodlepart.la: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) +@@ -628,9 +643,10 @@ distclean-compile: + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controls.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/engine.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaboodle_factory.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaboodle_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaboodle_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaboodleapp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Plo@am__quote@ +@@ -862,7 +878,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=uninstall.desktop kaboodle.desktop player.h controls.h kaboodle_component.desktop conf.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h view.h kaboodleui.rc engine.h userinterface.h kaboodlepartui.rc ++KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop Makefile.in.rej kaboodleengine.desktop conf.h uninstall.desktop player.h userinterface.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -936,7 +952,6 @@ install-strip: + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -1032,9 +1047,6 @@ uninstall-info: uninstall-info-recursive + uninstall-libLTLIBRARIES uninstall-recursive + + +-dummy.cpp: +- echo > dummy.cpp +- + install-data-local: uninstall.desktop + $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia/More + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/More/kaboodle.desktop +@@ -1055,17 +1067,11 @@ libkaboodlepart.la.closure: $(libkaboodl + + + #>+ 3 +-userinterface.moc: $(srcdir)/userinterface.h +- $(MOC) $(srcdir)/userinterface.h -o userinterface.moc +- +-#>+ 1 +-mocs: userinterface.moc +-#>+ 3 +-kaboodleapp.moc: $(srcdir)/kaboodleapp.h +- $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc ++view.moc: $(srcdir)/view.h ++ $(MOC) $(srcdir)/view.h -o view.moc + + #>+ 1 +-mocs: kaboodleapp.moc ++mocs: view.moc + #>+ 3 + controls.moc: $(srcdir)/controls.h + $(MOC) $(srcdir)/controls.h -o controls.moc +@@ -1073,11 +1079,17 @@ controls.moc: $(srcdir)/controls.h + #>+ 1 + mocs: controls.moc + #>+ 3 +-engine.moc: $(srcdir)/engine.h +- $(MOC) $(srcdir)/engine.h -o engine.moc ++kaboodleapp.moc: $(srcdir)/kaboodleapp.h ++ $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc + + #>+ 1 +-mocs: engine.moc ++mocs: kaboodleapp.moc ++#>+ 3 ++userinterface.moc: $(srcdir)/userinterface.h ++ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc ++ ++#>+ 1 ++mocs: userinterface.moc + #>+ 3 + kaboodle_factory.moc: $(srcdir)/kaboodle_factory.h + $(MOC) $(srcdir)/kaboodle_factory.h -o kaboodle_factory.moc +@@ -1097,14 +1109,14 @@ player.moc: $(srcdir)/player.h + #>+ 1 + mocs: player.moc + #>+ 3 +-view.moc: $(srcdir)/view.h +- $(MOC) $(srcdir)/view.h -o view.moc ++engine.moc: $(srcdir)/engine.h ++ $(MOC) $(srcdir)/engine.h -o engine.moc + + #>+ 1 +-mocs: view.moc ++mocs: engine.moc + #>+ 3 + clean-metasources: +- -rm -f userinterface.moc kaboodleapp.moc controls.moc engine.moc kaboodle_factory.moc conf.moc player.moc view.moc ++ -rm -f view.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc engine.moc + + #>+ 3 + clean-closures: +@@ -1121,19 +1133,19 @@ force-reedit: + + + #>+ 11 +-kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp userinterface.moc kaboodleapp.moc +- @echo 'creating kaboodle_la.all_cpp.cpp ...'; \ +- rm -f kaboodle_la.all_cpp.files kaboodle_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kaboodle_la.all_cpp.final; \ ++libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodleapp.moc userinterface.moc ++ @echo 'creating libkaboodle_main_la.all_cpp.cpp ...'; \ ++ rm -f libkaboodle_main_la.all_cpp.files libkaboodle_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkaboodle_main_la.all_cpp.final; \ + for file in main.cpp kaboodleapp.cpp userinterface.cpp ; do \ +- echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ ++ echo "#include \"$$file\"" >> libkaboodle_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaboodle_main_la.all_cpp.final; \ + done; \ +- cat kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files > kaboodle_la.all_cpp.cpp; \ +- rm -f kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files ++ cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ ++ rm -f libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files + + #>+ 11 +-libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp controls.moc engine.moc kaboodle_factory.moc conf.moc view.moc player.moc ++libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp view.moc controls.moc kaboodle_factory.moc conf.moc player.moc engine.moc + @echo 'creating libkaboodlepart_la.all_cpp.cpp ...'; \ + rm -f libkaboodlepart_la.all_cpp.files libkaboodlepart_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaboodlepart_la.all_cpp.final; \ +@@ -1146,20 +1158,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir + + #>+ 3 + clean-final: +- -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp ++ -rm -f libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_final_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kaboodle_la_OBJECTS="$(kaboodle_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -1169,19 +1181,19 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 17 +-kaboodleapp.lo: kaboodleapp.moc +-kaboodle_factory.o: kaboodle_factory.moc +-player.lo: player.moc +-engine.o: engine.moc + conf.o: conf.moc +-userinterface.lo: userinterface.moc +-engine.lo: engine.moc +-controls.lo: controls.moc + player.o: player.moc +-view.o: view.moc +-view.lo: view.moc + userinterface.o: userinterface.moc +-conf.lo: conf.moc ++view.o: view.moc + kaboodleapp.o: kaboodleapp.moc ++kaboodle_factory.o: kaboodle_factory.moc ++controls.lo: controls.moc ++engine.lo: engine.moc + kaboodle_factory.lo: kaboodle_factory.moc ++engine.o: engine.moc ++view.lo: view.moc + controls.o: controls.moc ++conf.lo: conf.moc ++kaboodleapp.lo: kaboodleapp.moc ++player.lo: player.moc ++userinterface.lo: userinterface.moc diff --git a/multimedia/kdemultimedia3/patches/patch-ae b/multimedia/kdemultimedia3/patches/patch-ae new file mode 100644 index 00000000000..8bdd77431f6 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 15:42:04 jmmv Exp $ + +--- kaboodle/main.cpp.orig Sun Oct 27 11:20:11 2002 ++++ kaboodle/main.cpp +@@ -42,7 +42,9 @@ static KCmdLineOptions options[] = + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char**); ++ ++int kdemain(int argc, char **argv) + { + KCmdLineArgs::init(argc, argv, Kaboodle::KaboodleFactory::aboutData()); + KCmdLineArgs::addCmdLineOptions(options); diff --git a/multimedia/kdemultimedia3/patches/patch-af b/multimedia/kdemultimedia3/patches/patch-af new file mode 100644 index 00000000000..3d476ce8db0 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1 2004/01/26 15:42:04 jmmv Exp $ + +--- kmidi/Makefile.in.orig Sat Dec 21 07:07:51 2002 ++++ kmidi/Makefile.in +@@ -407,7 +407,8 @@ kmidi_OBJECTS = kmidi.$(OBJEXT) playlist + resample_f.$(OBJEXT) midiapplication.$(OBJEXT) \ + kmidiframe.$(OBJEXT) kmidifiledlg.$(OBJEXT) \ + qttableview.$(OBJEXT) +-kmidi_LDADD = $(LDADD) ++kmidi_LDADD = $(LIBOSSAUDIO) $(LDADD) ++ + kmidi_DEPENDENCIES = + kmidi_LDFLAGS = + am_sf2cfg_OBJECTS = sf2cfg.$(OBJEXT) readsbk.$(OBJEXT) diff --git a/multimedia/kdemultimedia3/patches/patch-ag b/multimedia/kdemultimedia3/patches/patch-ag new file mode 100644 index 00000000000..799fc7fbcb9 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2004/01/26 15:42:04 jmmv Exp $ + +--- kmidi/TIMIDITY/Makefile.in.orig 2003-09-10 14:32:05.000000000 +1200 ++++ kmidi/TIMIDITY/Makefile.in +@@ -390,7 +390,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ + INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags` + AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS) + AM_LDFLAGS = `$(ARTSCCONFIG) --libs` +-LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm ++LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm + + # Where to install the patches, config files, and MIDI files. + # If you change this, it's a good idea to recompile the binary, diff --git a/multimedia/kdemultimedia3/patches/patch-aj b/multimedia/kdemultimedia3/patches/patch-aj new file mode 100644 index 00000000000..5577b9ea73c --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-aj @@ -0,0 +1,59 @@ +$NetBSD: patch-aj,v 1.1.1.1 2004/01/26 15:42:04 jmmv Exp $ + +--- kmix/Makefile.am.orig Wed May 7 23:46:50 2003 ++++ kmix/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = control pics + INCLUDES= $(all_includes) + + bin_PROGRAMS = kmix kmixctrl +-lib_LTLIBRARIES = kmix.la kmixctrl.la ++lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la + kde_module_LTLIBRARIES = kmix_panelapplet.la + + +@@ -12,22 +12,30 @@ noinst_HEADERS = kmix.h kmixdockwidget.h + + + METASOURCES = AUTO +-kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \ + volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface.skel +-kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LDFLAGS = $(all_libraries) ++ ++kmix_la_SOURCES = kmix_main.cpp ++kmix_la_LIBADD = libkmix_main.la + kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmix_SOURCES = dummy.cpp +-kmix_LDADD = kmix.la ++kmix_SOURCES = kmix_main.cpp ++kmix_LDADD = libkmix_main.la + kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel +-kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel ++libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_LDFLAGS = $(all_libraries) ++ ++kmixctrl_la_SOURCES = kmixctrl_main.cpp ++kmixctrl_la_LIBADD = libkmixctrl_main.la + kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmixctrl_SOURCES = dummy.cpp +-kmixctrl_LDADD = kmixctrl.la ++kmixctrl_SOURCES = kmixctrl_main.cpp ++kmixctrl_LDADD = libkmixctrl_main.la + kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \ +@@ -57,6 +65,3 @@ services_DATA = kmixctrl_restore.desktop + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kmix.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/multimedia/kdemultimedia3/patches/patch-ak b/multimedia/kdemultimedia3/patches/patch-ak new file mode 100644 index 00000000000..7990650e3e8 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ak @@ -0,0 +1,493 @@ +$NetBSD: patch-ak,v 1.1.1.1 2004/01/26 15:42:05 jmmv Exp $ + +--- kmix/Makefile.in.orig 2003-12-29 11:29:37.000000000 +1300 ++++ kmix/Makefile.in +@@ -381,7 +381,7 @@ SUBDIRS = control pics + INCLUDES = $(all_includes) + + bin_PROGRAMS = kmix kmixctrl +-lib_LTLIBRARIES = kmix.la kmixctrl.la ++lib_LTLIBRARIES = libkmix_main.la kmix.la libkmixctrl_main.la kmixctrl.la + kde_module_LTLIBRARIES = kmix_panelapplet.la + + noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \ +@@ -390,29 +390,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h + + + #>- METASOURCES = AUTO +-#>- kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++#>- libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + #>- kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \ + #>- volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface.skel + #>+ 3 +-kmix_la_SOURCES=main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ ++libkmix_main_la_SOURCES=main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ + kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \ + volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp + +-kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmix_main_la_LDFLAGS = $(all_libraries) ++ ++kmix_la_SOURCES = kmix_main.cpp ++kmix_la_LIBADD = libkmix_main.la + kmix_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmix_SOURCES = dummy.cpp +-kmix_LDADD = kmix.la ++kmix_SOURCES = kmix_main.cpp ++kmix_LDADD = libkmix_main.la + kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-#>- kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel ++#>- libkmixctrl_main_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface.skel + #>+ 1 +-kmixctrl_la_SOURCES=kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface_skel.cpp +-kmixctrl_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_SOURCES=kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface_skel.cpp ++libkmixctrl_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) ++libkmixctrl_main_la_LDFLAGS = $(all_libraries) ++ ++kmixctrl_la_SOURCES = kmixctrl_main.cpp ++kmixctrl_la_LIBADD = libkmixctrl_main.la + kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmixctrl_SOURCES = dummy.cpp +-kmixctrl_LDADD = kmixctrl.la ++kmixctrl_SOURCES = kmixctrl_main.cpp ++kmixctrl_LDADD = libkmixctrl_main.la + kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + #>- kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \ +@@ -446,18 +454,11 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-kmix_la_DEPENDENCIES = +-am_kmix_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ +- kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo \ +- VerticalText.lo volume.lo kledbutton.lo mixdevicewidget.lo ++kmix_la_DEPENDENCIES = libkmix_main.la ++am_kmix_la_OBJECTS = kmix_main.lo + #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS) +-#>+ 6 +-kmix_la_final_OBJECTS = kmix_la.all_cpp.lo +-kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ +- kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo \ +- VerticalText.lo volume.lo kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo +-@KDE_USE_FINAL_FALSE@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS) ++#>+ 1 ++kmix_la_OBJECTS = kmix_main.lo + kmix_panelapplet_la_DEPENDENCIES = + am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \ + channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \ +@@ -470,46 +471,73 @@ kmix_panelapplet_la_nofinal_OBJECTS = km + VerticalText.lo mixdevicewidget.lo mixerIface_skel.lo colorwidget.lo + @KDE_USE_FINAL_FALSE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS) +-kmixctrl_la_DEPENDENCIES = +-am_kmixctrl_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo ++kmixctrl_la_DEPENDENCIES = libkmixctrl_main.la ++am_kmixctrl_la_OBJECTS = kmixctrl_main.lo + #>- kmixctrl_la_OBJECTS = $(am_kmixctrl_la_OBJECTS) +-#>+ 4 +-kmixctrl_la_final_OBJECTS = kmixctrl_la.all_cpp.lo +-kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo mixerIface_skel.lo +-@KDE_USE_FINAL_FALSE@kmixctrl_la_OBJECTS = $(kmixctrl_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmixctrl_la_OBJECTS = $(kmixctrl_la_final_OBJECTS) ++#>+ 1 ++kmixctrl_la_OBJECTS = kmixctrl_main.lo ++libkmix_main_la_DEPENDENCIES = ++am_libkmix_main_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ ++ kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ ++ ksmallslider.lo VerticalText.lo volume.lo kledbutton.lo \ ++ mixdevicewidget.lo ++#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS) ++#>+ 7 ++libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo ++libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ ++ kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ ++ ksmallslider.lo VerticalText.lo volume.lo kledbutton.lo \ ++ mixdevicewidget.lo mixerIface_skel.lo ++@KDE_USE_FINAL_FALSE@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS) ++libkmixctrl_main_la_DEPENDENCIES = ++am_libkmixctrl_main_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ ++ volume.lo ++#>- libkmixctrl_main_la_OBJECTS = $(am_libkmixctrl_main_la_OBJECTS) ++#>+ 5 ++libkmixctrl_main_la_final_OBJECTS = libkmixctrl_main_la.all_cpp.lo ++libkmixctrl_main_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ ++ volume.lo mixerIface_skel.lo ++@KDE_USE_FINAL_FALSE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_final_OBJECTS) + bin_PROGRAMS = kmix$(EXEEXT) kmixctrl$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kmix_OBJECTS = dummy.$(OBJEXT) ++am_kmix_OBJECTS = kmix_main.$(OBJEXT) + #>- kmix_OBJECTS = $(am_kmix_OBJECTS) + #>+ 1 +-kmix_OBJECTS = dummy.$(OBJEXT) +-kmix_DEPENDENCIES = kmix.la +-am_kmixctrl_OBJECTS = dummy.$(OBJEXT) ++kmix_OBJECTS = kmix_main.$(OBJEXT) ++kmix_DEPENDENCIES = libkmix_main.la ++am_kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) + #>- kmixctrl_OBJECTS = $(am_kmixctrl_OBJECTS) + #>+ 1 +-kmixctrl_OBJECTS = dummy.$(OBJEXT) +-kmixctrl_DEPENDENCIES = kmixctrl.la ++kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT) ++kmixctrl_DEPENDENCIES = libkmixctrl_main.la + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/VerticalText.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixdockwidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixerwidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixprefdlg.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/ksmallslider.Plo ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/mixdevicewidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/mixer.Plo ./$(DEPDIR)/volume.Plo +-#>+ 21 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P ./$(DEPDIR)/VerticalText.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ ++#>+ 27 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P ./$(DEPDIR)/VerticalText.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixdockwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixerwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixprefdlg.Plo \ +@@ -517,9 +545,12 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mixdevicewidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mixer.Plo ./$(DEPDIR)/volume.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P ./$(DEPDIR)/VerticalText.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixctrl_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixdockwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixerwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixprefdlg.Plo \ +@@ -546,7 +577,9 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \ +- $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) ++ $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) \ ++ $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) \ ++ $(kmixctrl_SOURCES) + DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA) + + HEADERS = $(noinst_HEADERS) +@@ -559,7 +592,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive + DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) ++SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) $(libkmixctrl_main_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -641,6 +674,10 @@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE + $(CXXLINK) -rpath $(kde_moduledir) $(kmix_panelapplet_la_LDFLAGS) $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_LIBADD) $(LIBS) + kmixctrl.la: $(kmixctrl_la_OBJECTS) $(kmixctrl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kmixctrl_la_LDFLAGS) $(kmixctrl_la_OBJECTS) $(kmixctrl_la_LIBADD) $(LIBS) ++libkmix_main.la: $(libkmix_main_la_OBJECTS) $(libkmix_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmix_main_la_LDFLAGS) $(libkmix_main_la_OBJECTS) $(libkmix_main_la_LIBADD) $(LIBS) ++libkmixctrl_main.la: $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmixctrl_main_la_LDFLAGS) $(libkmixctrl_main_la_OBJECTS) $(libkmixctrl_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +@@ -685,11 +722,14 @@ distclean-compile: + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VerticalText.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kledbutton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmix.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmix_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmix_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixapplet.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixctrl.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixctrl_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixctrl_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixdockwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixerwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixprefdlg.Plo@am__quote@ +@@ -942,7 +982,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=mixer_irix.h configure.in.in mixer_sun.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp resource.h mixer_alsa.h mixer_none.h kmix-platforms.cpp mixer_alsa5.cpp mixer_alsa9.cpp mixer_irix.cpp colorwidget.ui mixer_hpux.cpp kmixapplet.desktop mixer_none.cpp mixer_oss.h mixer_hpux.h mixer_sun.cpp ++KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc Makefile.in.rej kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h kmixapplet.desktop mixer_alsa.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -1117,25 +1157,16 @@ $(srcdir)/version.h: VERSION + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kmix.pot +- +-dummy.cpp: +- echo > dummy.cpp + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: + +-#>+ 5 +-mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; false ) +-mixerIface_skel.cpp: mixerIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl +- + #>+ 3 +-kmix.moc: $(srcdir)/kmix.h +- $(MOC) $(srcdir)/kmix.h -o kmix.moc ++kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h ++ $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc + + #>+ 1 +-mocs: kmix.moc ++mocs: kmixdockwidget.moc + #>+ 3 + mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h + $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc +@@ -1143,17 +1174,11 @@ mixdevicewidget.moc: $(srcdir)/mixdevice + #>+ 1 + mocs: mixdevicewidget.moc + #>+ 3 +-kmixerwidget.moc: $(srcdir)/kmixerwidget.h +- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc +- +-#>+ 1 +-mocs: kmixerwidget.moc +-#>+ 3 +-kmixapplet.moc: $(srcdir)/kmixapplet.h +- $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc ++ksmallslider.moc: $(srcdir)/ksmallslider.h ++ $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc + + #>+ 1 +-mocs: kmixapplet.moc ++mocs: ksmallslider.moc + #>+ 3 + kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h + $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc +@@ -1161,29 +1186,41 @@ kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h + #>+ 1 + mocs: kmixprefdlg.moc + #>+ 3 +-kledbutton.moc: $(srcdir)/kledbutton.h +- $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc ++mixer.moc: $(srcdir)/mixer.h ++ $(MOC) $(srcdir)/mixer.h -o mixer.moc + + #>+ 1 +-mocs: kledbutton.moc ++mocs: mixer.moc + #>+ 3 +-ksmallslider.moc: $(srcdir)/ksmallslider.h +- $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc ++kmix.moc: $(srcdir)/kmix.h ++ $(MOC) $(srcdir)/kmix.h -o kmix.moc + + #>+ 1 +-mocs: ksmallslider.moc ++mocs: kmix.moc + #>+ 3 +-mixer.moc: $(srcdir)/mixer.h +- $(MOC) $(srcdir)/mixer.h -o mixer.moc ++kmixapplet.moc: $(srcdir)/kmixapplet.h ++ $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc + + #>+ 1 +-mocs: mixer.moc ++mocs: kmixapplet.moc + #>+ 3 +-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h +- $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc ++kledbutton.moc: $(srcdir)/kledbutton.h ++ $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc + + #>+ 1 +-mocs: kmixdockwidget.moc ++mocs: kledbutton.moc ++#>+ 3 ++kmixerwidget.moc: $(srcdir)/kmixerwidget.h ++ $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc ++ ++#>+ 1 ++mocs: kmixerwidget.moc ++#>+ 5 ++mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; false ) ++mixerIface_skel.cpp: mixerIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl ++ + #>+ 8 + kmix_panelapplet.la.closure: $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_DEPENDENCIES) + @echo "int main() {return 0;}" > kmix_panelapplet_la_closure.cpp +@@ -1210,7 +1247,7 @@ colorwidget.moc: colorwidget.h + + #>+ 3 + clean-metasources: +- -rm -f kmix.moc mixdevicewidget.moc kmixerwidget.moc kmixapplet.moc kmixprefdlg.moc kledbutton.moc ksmallslider.moc mixer.moc kmixdockwidget.moc ++ -rm -f kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc + + #>+ 6 + clean-idl: +@@ -1239,19 +1276,7 @@ force-reedit: + + + #>+ 11 +-kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmix.moc kmixerwidget.moc mixdevicewidget.moc kmixprefdlg.moc kledbutton.moc ksmallslider.moc mixer.moc kmixdockwidget.moc +- @echo 'creating kmix_la.all_cpp.cpp ...'; \ +- rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ +- for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ +- done; \ +- cat kmix_la.all_cpp.final kmix_la.all_cpp.files > kmix_la.all_cpp.cpp; \ +- rm -f kmix_la.all_cpp.final kmix_la.all_cpp.files +- +-#>+ 11 +-kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp kmixerwidget.moc mixdevicewidget.moc kmixapplet.moc kledbutton.moc ksmallslider.moc colorwidget.moc mixer.moc ++kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc + @echo 'creating kmix_panelapplet_la.all_cpp.cpp ...'; \ + rm -f kmix_panelapplet_la.all_cpp.files kmix_panelapplet_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmix_panelapplet_la.all_cpp.final; \ +@@ -1263,33 +1288,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi + rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files + + #>+ 11 +-kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixerIface_skel.cpp mixer.moc +- @echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ +- rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ ++libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc ++ @echo 'creating libkmix_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \ ++ for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \ ++ echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \ ++ done; \ ++ cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ ++ rm -f libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files ++ ++#>+ 11 ++libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixerIface_skel.cpp mixer.moc ++ @echo 'creating libkmixctrl_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmixctrl_main_la.all_cpp.files libkmixctrl_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmixctrl_main_la.all_cpp.final; \ + for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp mixerIface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ ++ echo "#include \"$$file\"" >> libkmixctrl_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmixctrl_main_la.all_cpp.final; \ + done; \ +- cat kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files > kmixctrl_la.all_cpp.cpp; \ +- rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files ++ cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ ++ rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files + + #>+ 3 + clean-final: +- -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp ++ -rm -f kmix_panelapplet_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" all-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_final_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_final_OBJECTS)" install-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_final_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_final_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" all-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kmix_la_OBJECTS="$(kmix_la_nofinal_OBJECTS)" kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" kmixctrl_la_OBJECTS="$(kmixctrl_la_nofinal_OBJECTS)" install-am ++ $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -1299,30 +1336,30 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 28 +-$(srcdir)/mixdevicewidget.cpp: colorwidget.h +-kmixapplet.o: kmixapplet.moc +-$(srcdir)/kledbutton.cpp: colorwidget.h +-$(srcdir)/VerticalText.cpp: colorwidget.h ++kmixerwidget.lo: kmixerwidget.moc ++mixer.lo: mixer.moc ++kmixapplet.lo: kmixapplet.moc + ksmallslider.lo: ksmallslider.moc +-kmixprefdlg.lo: kmixprefdlg.moc +-mixdevicewidget.lo: mixdevicewidget.moc +-mixdevicewidget.o: mixdevicewidget.moc + kmixerwidget.o: kmixerwidget.moc +-kmix.lo: kmix.moc ++mixdevicewidget.o: mixdevicewidget.moc + kmixdockwidget.lo: kmixdockwidget.moc +-kmixerwidget.lo: kmixerwidget.moc +-kmixapplet.lo: kmixapplet.moc +-kmixprefdlg.o: kmixprefdlg.moc +-kmixdockwidget.o: kmixdockwidget.moc ++$(srcdir)/mixdevicewidget.cpp: colorwidget.h + $(srcdir)/kmixerwidget.cpp: colorwidget.h ++kmix.o: kmix.moc + $(srcdir)/mixer.cpp: colorwidget.h +-kledbutton.lo: kledbutton.moc +-ksmallslider.o: ksmallslider.moc ++kmix.lo: kmix.moc + $(srcdir)/channel.cpp: colorwidget.h +-kledbutton.o: kledbutton.moc ++kmixprefdlg.o: kmixprefdlg.moc ++$(srcdir)/kledbutton.cpp: colorwidget.h ++mixdevicewidget.lo: mixdevicewidget.moc ++ksmallslider.o: ksmallslider.moc + mixer.o: mixer.moc ++kledbutton.o: kledbutton.moc ++$(srcdir)/VerticalText.cpp: colorwidget.h ++kmixprefdlg.lo: kmixprefdlg.moc ++kmixapplet.o: kmixapplet.moc ++kledbutton.lo: kledbutton.moc + $(srcdir)/volume.cpp: colorwidget.h +-mixer.lo: mixer.moc +-$(srcdir)/kmixapplet.cpp: colorwidget.h + $(srcdir)/ksmallslider.cpp: colorwidget.h +-kmix.o: kmix.moc ++$(srcdir)/kmixapplet.cpp: colorwidget.h ++kmixdockwidget.o: kmixdockwidget.moc diff --git a/multimedia/kdemultimedia3/patches/patch-am b/multimedia/kdemultimedia3/patches/patch-am new file mode 100644 index 00000000000..0f3a2fcdd08 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-am @@ -0,0 +1,15 @@ +$NetBSD: patch-am,v 1.1.1.1 2004/01/26 15:42:05 jmmv Exp $ + +--- kmix/kmixctrl.cpp.orig Sun Jan 6 04:17:43 2002 ++++ kmix/kmixctrl.cpp +@@ -44,7 +44,9 @@ + // INSERT YOUR COMMANDLINE OPTIONS HERE + }; + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KLocale::setMainCatalogue("kmix"); + KAboutData aboutData( "kmixctrl", I18N_NOOP("KMixCtrl"), diff --git a/multimedia/kdemultimedia3/patches/patch-ao b/multimedia/kdemultimedia3/patches/patch-ao new file mode 100644 index 00000000000..7a825e5a364 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ao @@ -0,0 +1,15 @@ +$NetBSD: patch-ao,v 1.1.1.1 2004/01/26 15:42:05 jmmv Exp $ + +--- kmix/main.cpp.orig Sun Jan 6 04:17:43 2002 ++++ kmix/main.cpp +@@ -37,7 +37,9 @@ + // INSERT YOUR COMMANDLINE OPTIONS HERE + }; + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int, char *[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData aboutData( "kmix", I18N_NOOP("KMix"), + APP_VERSION, description, KAboutData::License_GPL, diff --git a/multimedia/kdemultimedia3/patches/patch-ar b/multimedia/kdemultimedia3/patches/patch-ar new file mode 100644 index 00000000000..d9db381c46b --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1 2004/01/26 15:42:05 jmmv Exp $ + +--- mpeglib/lib/util/audio/Makefile.in.orig Tue May 14 01:53:27 2002 ++++ mpeglib/lib/util/audio/Makefile.in +@@ -311,7 +311,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + +-libaudio_la_LDFLAGS = ++libaudio_la_LDFLAGS = $(LIBOSSAUDIO) + libaudio_la_LIBADD = + am_libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo + #>- libaudio_la_OBJECTS = $(am_libaudio_la_OBJECTS) diff --git a/multimedia/kdemultimedia3/patches/patch-ay b/multimedia/kdemultimedia3/patches/patch-ay new file mode 100644 index 00000000000..22991ef3061 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ay @@ -0,0 +1,36 @@ +$NetBSD: patch-ay,v 1.1.1.1 2004/01/26 15:42:09 jmmv Exp $ + +--- noatun/Makefile.am.orig Sun Mar 3 07:50:51 2002 ++++ noatun/Makefile.am +@@ -4,22 +4,22 @@ + + KDE_ICON = AUTO + ++lib_LTLIBRARIES = libnoatun_main.la + kde_module_LTLIBRARIES = noatun.la +-noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun_core.la ++ ++noatun_la_SOURCES = noatun_main.cpp + noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++noatun_la_LIBADD = libnoatun_main.la + + bin_PROGRAMS = noatun +-noatun_SOURCES = dummy.cpp ++noatun_SOURCES = noatun_main.cpp + noatun_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-noatun_LDADD = $(LIB_KIO) noatun.la ++noatun_LDADD = libnoatun_main.la + + METASOURCES = AUTO +- +-CLEANFILES = dummy.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + applnk_DATA = noatun.desktop + applnkdir = $(kde_appsdir)/Multimedia diff --git a/multimedia/kdemultimedia3/patches/patch-az b/multimedia/kdemultimedia3/patches/patch-az new file mode 100644 index 00000000000..20f883d58a0 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-az @@ -0,0 +1,340 @@ +$NetBSD: patch-az,v 1.1.1.1 2004/01/26 15:42:09 jmmv Exp $ + +--- noatun/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/Makefile.in +@@ -383,22 +383,25 @@ SUBDIRS = pics library modules . + + KDE_ICON = AUTO + ++lib_LTLIBRARIES = libnoatun_main.la + kde_module_LTLIBRARIES = noatun.la +-#>- noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel ++#>- libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel + #>+ 1 +-noatun_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la_SOURCES=main.cpp joinhandler.cpp joinhandler_skel.cpp ++libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun_core.la ++ ++noatun_la_SOURCES = noatun_main.cpp + noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-noatun_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la ++noatun_la_LIBADD = libnoatun_main.la + + bin_PROGRAMS = noatun +-noatun_SOURCES = dummy.cpp ++noatun_SOURCES = noatun_main.cpp + noatun_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-noatun_LDADD = $(LIB_KIO) noatun.la ++noatun_LDADD = libnoatun_main.la + + #>- METASOURCES = AUTO + +-CLEANFILES = dummy.cpp +- + applnk_DATA = noatun.desktop + applnkdir = $(kde_appsdir)/Multimedia + +@@ -417,25 +420,31 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(kde_module_LTLIBRARIES) ++LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-noatun_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la +-am_noatun_la_OBJECTS = main.lo joinhandler.lo +-#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS) ++libnoatun_main_la_DEPENDENCIES = \ ++ $(top_builddir)/noatun/library/libnoatun_core.la ++am_libnoatun_main_la_OBJECTS = main.lo joinhandler.lo ++#>- libnoatun_main_la_OBJECTS = $(am_libnoatun_main_la_OBJECTS) + #>+ 4 +-noatun_la_final_OBJECTS = noatun_la.all_cpp.lo +-noatun_la_nofinal_OBJECTS = main.lo joinhandler.lo joinhandler_skel.lo +-@KDE_USE_FINAL_FALSE@noatun_la_OBJECTS = $(noatun_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@noatun_la_OBJECTS = $(noatun_la_final_OBJECTS) ++libnoatun_main_la_final_OBJECTS = libnoatun_main_la.all_cpp.lo ++libnoatun_main_la_nofinal_OBJECTS = main.lo joinhandler.lo joinhandler_skel.lo ++@KDE_USE_FINAL_FALSE@libnoatun_main_la_OBJECTS = $(libnoatun_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libnoatun_main_la_OBJECTS = $(libnoatun_main_la_final_OBJECTS) ++noatun_la_DEPENDENCIES = libnoatun_main.la ++am_noatun_la_OBJECTS = noatun_main.lo ++#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS) ++#>+ 1 ++noatun_la_OBJECTS = noatun_main.lo + bin_PROGRAMS = noatun$(EXEEXT) + update_PROGRAMS = noatun20update$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) $(update_PROGRAMS) + +-am_noatun_OBJECTS = dummy.$(OBJEXT) ++am_noatun_OBJECTS = noatun_main.$(OBJEXT) + #>- noatun_OBJECTS = $(am_noatun_OBJECTS) + #>+ 1 +-noatun_OBJECTS = dummy.$(OBJEXT) +-noatun_DEPENDENCIES = noatun.la ++noatun_OBJECTS = noatun_main.$(OBJEXT) ++noatun_DEPENDENCIES = libnoatun_main.la + am_noatun20update_OBJECTS = noatun20update.$(OBJEXT) + #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS) + #>+ 1 +@@ -445,13 +454,19 @@ noatun20update_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +-#>- @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 \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/noatun_main.Po ++#>+ 9 ++@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 \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(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 \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/noatun_main.Po + + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -471,8 +486,8 @@ CXXLD = $(CXX) + #>+ 2 + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) \ +- $(noatun20update_SOURCES) ++DIST_SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) \ ++ $(noatun_SOURCES) $(noatun20update_SOURCES) + DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA) + + +@@ -483,7 +498,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive + DIST_COMMON = COPYING Makefile.am Makefile.in TODO + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES) ++SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -528,6 +543,36 @@ clean-kde_moduleLTLIBRARIES: + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done ++libLTLIBRARIES_INSTALL = $(INSTALL) ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(libdir) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ 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; \ ++ else :; fi; \ ++ done ++ ++uninstall-libLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" = "$$p" && dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++libnoatun_main.la: $(libnoatun_main_la_OBJECTS) $(libnoatun_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libnoatun_main_la_LDFLAGS) $(libnoatun_main_la_OBJECTS) $(libnoatun_main_la_LIBADD) $(LIBS) + noatun.la: $(noatun_la_OBJECTS) $(noatun_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(noatun_la_LDFLAGS) $(noatun_la_OBJECTS) $(noatun_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +@@ -601,10 +646,11 @@ mostlyclean-compile: + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/joinhandler.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noatun20update.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noatun_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noatun_main.Po@am__quote@ + + distclean-depend: + -rm -rf ./$(DEPDIR) +@@ -831,7 +877,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=preset.eclecticguitar configure.in.in preset.dance preset.trance cr64-app-noatun.png cr128-app-noatun.png preset.zero cr32-app-noatun.png CHANGES preset.metal joinhandler.h avideoframe.cc cr16-app-noatun.png artsvideo.idl cr22-app-noatun.png noatun.desktop preset.jazz avideoframe.h noatun.upd FILES cr48-app-noatun.png ++KDE_DIST=preset.trance preset.eclecticguitar artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz cr22-app-noatun.png noatun.desktop FILES cr48-app-noatun.png avideoframe.h cr64-app-noatun.png preset.metal cr128-app-noatun.png Makefile.in.rej preset.zero cr16-app-noatun.png cr32-app-noatun.png preset.dance + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -882,9 +928,11 @@ distdir: $(DISTFILES) + check-am: all-am + check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ++install-binPROGRAMS: install-libLTLIBRARIES ++ + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(bindir) $(DESTDIR)$(updatedir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(presetsdir) $(DESTDIR)$(updatedir) ++ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(updatedir) $(DESTDIR)$(applnkdir) $(DESTDIR)$(presetsdir) $(DESTDIR)$(updatedir) + + install: install-recursive + install-exec: install-exec-recursive +@@ -903,7 +951,6 @@ install-strip: + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -916,10 +963,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 +-#>+ 2 ++#>- 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 ++ clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++ mostlyclean-am + + distclean: distclean-recursive + +@@ -940,9 +989,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-binPROGRAMS install-kde_moduleLTLIBRARIES ++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-recursive + +@@ -969,27 +1018,28 @@ ps-am: + + #>- 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 + #>+ 4 + uninstall-am: uninstall-kde-icons 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: uninstall-info-recursive + + .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ +- clean-libtool clean-recursive clean-updatePROGRAMS ctags \ +- ctags-recursive distclean distclean-compile distclean-depend \ +- distclean-generic distclean-libtool distclean-recursive \ +- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ +- info-recursive install install-am install-applnkDATA \ +- install-binPROGRAMS install-data install-data-am \ +- install-data-recursive install-exec install-exec-am \ +- install-exec-recursive install-info install-info-am \ +- install-info-recursive install-kde_moduleLTLIBRARIES \ ++ clean-libLTLIBRARIES clean-libtool clean-recursive \ ++ clean-updatePROGRAMS ctags ctags-recursive distclean \ ++ distclean-compile distclean-depend distclean-generic \ ++ distclean-libtool distclean-recursive distclean-tags distdir \ ++ dvi dvi-am dvi-recursive info info-am info-recursive install \ ++ install-am install-applnkDATA install-binPROGRAMS install-data \ ++ install-data-am install-data-recursive install-exec \ ++ install-exec-am install-exec-recursive install-info \ ++ install-info-am install-info-recursive \ ++ install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \ + install-man install-presetsDATA install-recursive install-strip \ + install-updateDATA install-updatePROGRAMS installcheck \ + installcheck-am installdirs installdirs-am \ +@@ -1000,13 +1050,11 @@ uninstall-info: uninstall-info-recursive + tags-recursive uninstall uninstall-am uninstall-applnkDATA \ + uninstall-binPROGRAMS uninstall-info-am \ + uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ +- uninstall-presetsDATA uninstall-recursive uninstall-updateDATA \ ++ uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++ uninstall-recursive uninstall-updateDATA \ + uninstall-updatePROGRAMS + + +-dummy.cpp: +- echo > dummy.cpp +- + messages: + $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` > rc.cpp + $(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/noatun.pot +@@ -1059,33 +1107,33 @@ force-reedit: + + + #>+ 11 +-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 \ +- 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 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 ++ -rm -f libnoatun_main_la.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_final_OBJECTS)" all-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_final_OBJECTS)" install-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) noatun_la_OBJECTS="$(noatun_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/multimedia/kdemultimedia3/patches/patch-ba b/multimedia/kdemultimedia3/patches/patch-ba new file mode 100644 index 00000000000..84fe54d89f7 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ba @@ -0,0 +1,35 @@ +$NetBSD: patch-ba,v 1.1.1.1 2004/01/26 15:42:09 jmmv Exp $ + +--- noatun/library/Makefile.am.orig Mon Sep 16 09:14:52 2002 ++++ noatun/library/Makefile.am +@@ -9,9 +9,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 \ +@@ -23,14 +23,14 @@ 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) + + libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp diff --git a/multimedia/kdemultimedia3/patches/patch-bb b/multimedia/kdemultimedia3/patches/patch-bb new file mode 100644 index 00000000000..1354524464f --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bb @@ -0,0 +1,272 @@ +$NetBSD: patch-bb,v 1.1.1.1 2004/01/26 15:42:33 jmmv 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 diff --git a/multimedia/kdemultimedia3/patches/patch-bc b/multimedia/kdemultimedia3/patches/patch-bc new file mode 100644 index 00000000000..9767e7919e3 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/library/noatuntags/Makefile.am.orig Wed Oct 24 02:59:44 2001 ++++ noatun/library/noatuntags/Makefile.am +@@ -4,7 +4,7 @@ + + libnoatuntags_la_SOURCES = tags.cpp + libnoatuntags_la_LDFLAGS = -L$(top_builddir)/noatun/library +-libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la ++libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la + + libnoatuntags_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-bd b/multimedia/kdemultimedia3/patches/patch-bd new file mode 100644 index 00000000000..25f2b4f087c --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bd @@ -0,0 +1,22 @@ +$NetBSD: patch-bd,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/library/noatuntags/Makefile.in.orig Sat Dec 28 14:04:00 2002 ++++ noatun/library/noatuntags/Makefile.in +@@ -294,7 +294,7 @@ lib_LTLIBRARIES = libnoatuntags.la + + libnoatuntags_la_SOURCES = tags.cpp + libnoatuntags_la_LDFLAGS = -L$(top_builddir)/noatun/library +-libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la ++libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la + + #>- libnoatuntags_la_METASOURCES = AUTO + +@@ -307,7 +307,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + + libnoatuntags_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_libnoatuntags_la_OBJECTS = tags.lo + #>- libnoatuntags_la_OBJECTS = $(am_libnoatuntags_la_OBJECTS) + #>+ 1 diff --git a/multimedia/kdemultimedia3/patches/patch-be b/multimedia/kdemultimedia3/patches/patch-be new file mode 100644 index 00000000000..a4d77b6a411 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-be @@ -0,0 +1,15 @@ +$NetBSD: patch-be,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/main.cpp.orig Wed May 8 19:29:25 2002 ++++ noatun/main.cpp +@@ -24,7 +24,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char **); ++ ++int kdemain(int argc, char **argv) + { + KAboutData aboutData("noatun", I18N_NOOP("Noatun"), + version, description, KAboutData::License_BSD, diff --git a/multimedia/kdemultimedia3/patches/patch-bf b/multimedia/kdemultimedia3/patches/patch-bf new file mode 100644 index 00000000000..8bbc31d6800 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/modules/dcopiface/Makefile.am.orig Wed May 8 19:29:26 2002 ++++ noatun/modules/dcopiface/Makefile.am +@@ -4,7 +4,7 @@ + noatun_dcopiface_la_SOURCES = dcopiface.cpp dcopiface.skel + + noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la ++noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la + + noatun_dcopiface_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-bg b/multimedia/kdemultimedia3/patches/patch-bg new file mode 100644 index 00000000000..738228de97d --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bg @@ -0,0 +1,22 @@ +$NetBSD: patch-bg,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/modules/dcopiface/Makefile.in.orig Sat Nov 30 12:05:10 2002 ++++ noatun/modules/dcopiface/Makefile.in +@@ -297,7 +297,7 @@ kde_module_LTLIBRARIES = noatun_dcopifac + noatun_dcopiface_la_SOURCES=dcopiface.cpp dcopiface_skel.cpp + + noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la ++noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la + + #>- noatun_dcopiface_la_METASOURCES = AUTO + +@@ -311,7 +311,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_dcopiface_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_dcopiface_la_OBJECTS = dcopiface.lo + #>- noatun_dcopiface_la_OBJECTS = $(am_noatun_dcopiface_la_OBJECTS) + #>+ 4 diff --git a/multimedia/kdemultimedia3/patches/patch-bi b/multimedia/kdemultimedia3/patches/patch-bi new file mode 100644 index 00000000000..2061cd2bf21 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bi @@ -0,0 +1,13 @@ +$NetBSD: patch-bi,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/modules/htmlexport/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/htmlexport/Makefile.am +@@ -6,7 +6,7 @@ + noinst_HEADERS = htmlexport.h + + noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + noatun_htmlexport_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-bj b/multimedia/kdemultimedia3/patches/patch-bj new file mode 100644 index 00000000000..023753d7e52 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bj @@ -0,0 +1,29 @@ +$NetBSD: patch-bj,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/htmlexport/Makefile.in.orig Sat Dec 28 14:04:00 2002 ++++ noatun/modules/htmlexport/Makefile.in +@@ -295,7 +295,7 @@ noatun_htmlexport_la_SOURCES = htmlexpor + noinst_HEADERS = htmlexport.h + + noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + +@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_htmlexport_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_htmlexport_la_OBJECTS = htmlexport.lo + #>- noatun_htmlexport_la_OBJECTS = $(am_noatun_htmlexport_la_OBJECTS) + #>+ 1 +@@ -657,5 +657,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-htmlexport.lo: htmlexport.moc + htmlexport.o: htmlexport.moc ++htmlexport.lo: htmlexport.moc diff --git a/multimedia/kdemultimedia3/patches/patch-bk b/multimedia/kdemultimedia3/patches/patch-bk new file mode 100644 index 00000000000..e31b05d7fba --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bk @@ -0,0 +1,13 @@ +$NetBSD: patch-bk,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/infrared/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/infrared/Makefile.am +@@ -6,7 +6,7 @@ + noinst_HEADERS = infrared.h lirc.h irprefs.h + + noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + noatun_infrared_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-bl b/multimedia/kdemultimedia3/patches/patch-bl new file mode 100644 index 00000000000..97a71cb724f --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bl @@ -0,0 +1,72 @@ +$NetBSD: patch-bl,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/infrared/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/modules/infrared/Makefile.in +@@ -385,7 +385,7 @@ noatun_infrared_la_SOURCES = infrared.cp + noinst_HEADERS = infrared.h lirc.h irprefs.h + + noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + +@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_infrared_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo + #>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS) + #>+ 4 +@@ -624,7 +624,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=infrared.plugin ++KDE_DIST=infrared.plugin Makefile.in.rej + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -779,20 +779,20 @@ irprefs.moc: $(srcdir)/irprefs.h + #>+ 1 + mocs: irprefs.moc + #>+ 3 +-lirc.moc: $(srcdir)/lirc.h +- $(MOC) $(srcdir)/lirc.h -o lirc.moc +- +-#>+ 1 +-mocs: lirc.moc +-#>+ 3 + infrared.moc: $(srcdir)/infrared.h + $(MOC) $(srcdir)/infrared.h -o infrared.moc + + #>+ 1 + mocs: infrared.moc + #>+ 3 ++lirc.moc: $(srcdir)/lirc.h ++ $(MOC) $(srcdir)/lirc.h -o lirc.moc ++ ++#>+ 1 ++mocs: lirc.moc ++#>+ 3 + clean-metasources: +- -rm -f irprefs.moc lirc.moc infrared.moc ++ -rm -f irprefs.moc infrared.moc lirc.moc + + #>+ 3 + clean-closures: +@@ -845,9 +845,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 ++infrared.o: infrared.moc + lirc.o: lirc.moc +-irprefs.o: irprefs.moc +-infrared.lo: infrared.moc + irprefs.lo: irprefs.moc ++infrared.lo: infrared.moc + lirc.lo: lirc.moc +-infrared.o: infrared.moc ++irprefs.o: irprefs.moc diff --git a/multimedia/kdemultimedia3/patches/patch-bm b/multimedia/kdemultimedia3/patches/patch-bm new file mode 100644 index 00000000000..1d493d93a74 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bm @@ -0,0 +1,13 @@ +$NetBSD: patch-bm,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/kaiman/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/kaiman/Makefile.am +@@ -9,7 +9,7 @@ + pref.cpp + + noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + noatun_kaiman_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-bn b/multimedia/kdemultimedia3/patches/patch-bn new file mode 100644 index 00000000000..2a6f04cc295 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bn @@ -0,0 +1,82 @@ +$NetBSD: patch-bn,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/kaiman/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/modules/kaiman/Makefile.in +@@ -389,7 +389,7 @@ noatun_kaiman_la_SOURCES = \ + + + noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + +@@ -410,7 +410,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_kaiman_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \ + pref.lo + #>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS) +@@ -714,7 +714,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kaimanui.rc SKIN-SPECS kaiman.plugin ++KDE_DIST=kaimanui.rc SKIN-SPECS Makefile.in.rej kaiman.plugin + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -886,12 +886,6 @@ noatun_kaiman.la.closure: $(noatun_kaima + + + #>+ 3 +-userinterface.moc: $(srcdir)/userinterface.h +- $(MOC) $(srcdir)/userinterface.h -o userinterface.moc +- +-#>+ 1 +-mocs: userinterface.moc +-#>+ 3 + style.moc: $(srcdir)/style.h + $(MOC) $(srcdir)/style.h -o style.moc + +@@ -904,8 +898,14 @@ pref.moc: $(srcdir)/pref.h + #>+ 1 + mocs: pref.moc + #>+ 3 ++userinterface.moc: $(srcdir)/userinterface.h ++ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc ++ ++#>+ 1 ++mocs: userinterface.moc ++#>+ 3 + clean-metasources: +- -rm -f userinterface.moc style.moc pref.moc ++ -rm -f style.moc pref.moc userinterface.moc + + #>+ 3 + clean-closures: +@@ -922,7 +922,7 @@ force-reedit: + + + #>+ 11 +-noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc style.moc pref.moc ++noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp style.moc pref.moc userinterface.moc + @echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \ + rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \ +@@ -958,9 +958,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-style.o: style.moc ++pref.lo: pref.moc + style.lo: style.moc +-userinterface.lo: userinterface.moc + userinterface.o: userinterface.moc ++style.o: style.moc + pref.o: pref.moc +-pref.lo: pref.moc ++userinterface.lo: userinterface.moc diff --git a/multimedia/kdemultimedia3/patches/patch-bo b/multimedia/kdemultimedia3/patches/patch-bo new file mode 100644 index 00000000000..556329fbdfd --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bo @@ -0,0 +1,13 @@ +$NetBSD: patch-bo,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/keyz/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/keyz/Makefile.am +@@ -4,7 +4,7 @@ + noatun_keyz_la_SOURCES = keyz.cpp + + noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la ++noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la + + noatun_keyz_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-bp b/multimedia/kdemultimedia3/patches/patch-bp new file mode 100644 index 00000000000..a3c53242632 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bp @@ -0,0 +1,31 @@ +$NetBSD: patch-bp,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/keyz/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/modules/keyz/Makefile.in +@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la + noatun_keyz_la_SOURCES = keyz.cpp + + noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la ++noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la + + #>- noatun_keyz_la_METASOURCES = AUTO + +@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_keyz_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_keyz_la_OBJECTS = keyz.lo + #>- noatun_keyz_la_OBJECTS = $(am_noatun_keyz_la_OBJECTS) + #>+ 1 +@@ -613,7 +613,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=keyz.plugin ++KDE_DIST=Makefile.in.rej keyz.plugin + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/multimedia/kdemultimedia3/patches/patch-bq b/multimedia/kdemultimedia3/patches/patch-bq new file mode 100644 index 00000000000..669b4c9538b --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bq @@ -0,0 +1,13 @@ +$NetBSD: patch-bq,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/kjofol-skin/Makefile.am.orig Tue Jul 2 06:59:17 2002 ++++ noatun/modules/kjofol-skin/Makefile.am +@@ -14,7 +14,7 @@ noatun_kjofol_la_SOURCES = kjloader.cpp + kjprefs.cpp kjskinselectorwidget.ui kjguisettingswidget.ui + + noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + $(LIB_KIO) -lm \ + $(top_builddir)/arts/modules/libartsmodules.la + diff --git a/multimedia/kdemultimedia3/patches/patch-br b/multimedia/kdemultimedia3/patches/patch-br new file mode 100644 index 00000000000..c41f75bcd80 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-br @@ -0,0 +1,124 @@ +$NetBSD: patch-br,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/kjofol-skin/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/modules/kjofol-skin/Makefile.in +@@ -401,7 +401,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj + + + noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + $(LIB_KIO) -lm \ + $(top_builddir)/arts/modules/libartsmodules.la + +@@ -423,7 +423,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_kjofol_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/arts/modules/libartsmodules.la + am_noatun_kjofol_la_OBJECTS = kjloader.lo kjwidget.lo kjbutton.lo \ + kjseeker.lo kjsliders.lo kjfont.lo kjtextdisplay.lo kjvis.lo \ +@@ -757,7 +757,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kjofolui.plugin kjskinselectorwidget.ui helpers.cpp kjguisettingswidget.ui ++KDE_DIST=kjskinselectorwidget.ui kjofolui.plugin Makefile.in.rej helpers.cpp kjguisettingswidget.ui + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -957,32 +957,32 @@ kjguisettingswidget.moc: kjguisettingswi + $(MOC) kjguisettingswidget.h -o kjguisettingswidget.moc + + #>+ 3 +-kjequalizer.moc: $(srcdir)/kjequalizer.h +- $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc +- +-#>+ 1 +-mocs: kjequalizer.moc +-#>+ 3 +-kjloader.moc: $(srcdir)/kjloader.h +- $(MOC) $(srcdir)/kjloader.h -o kjloader.moc +- +-#>+ 1 +-mocs: kjloader.moc +-#>+ 3 + kjtextdisplay.moc: $(srcdir)/kjtextdisplay.h + $(MOC) $(srcdir)/kjtextdisplay.h -o kjtextdisplay.moc + + #>+ 1 + mocs: kjtextdisplay.moc + #>+ 3 ++kjequalizer.moc: $(srcdir)/kjequalizer.h ++ $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc ++ ++#>+ 1 ++mocs: kjequalizer.moc ++#>+ 3 + kjprefs.moc: $(srcdir)/kjprefs.h + $(MOC) $(srcdir)/kjprefs.h -o kjprefs.moc + + #>+ 1 + mocs: kjprefs.moc + #>+ 3 ++kjloader.moc: $(srcdir)/kjloader.h ++ $(MOC) $(srcdir)/kjloader.h -o kjloader.moc ++ ++#>+ 1 ++mocs: kjloader.moc ++#>+ 3 + clean-metasources: +- -rm -f kjequalizer.moc kjloader.moc kjtextdisplay.moc kjprefs.moc ++ -rm -f kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc + + #>+ 5 + clean-ui: +@@ -1005,7 +1005,7 @@ force-reedit: + + + #>+ 11 +-noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjskinselectorwidget.cpp kjguisettingswidget.cpp kjskinselectorwidget.moc kjequalizer.moc kjguisettingswidget.moc kjloader.moc kjtextdisplay.moc kjprefs.moc ++noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjskinselectorwidget.cpp kjguisettingswidget.cpp kjtextdisplay.moc kjguisettingswidget.moc kjequalizer.moc kjskinselectorwidget.moc kjprefs.moc kjloader.moc + @echo 'creating noatun_kjofol_la.all_cpp.cpp ...'; \ + rm -f noatun_kjofol_la.all_cpp.files noatun_kjofol_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_kjofol_la.all_cpp.final; \ +@@ -1041,24 +1041,24 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 22 +-$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h + kjprefs.o: kjprefs.moc +-$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-kjtextdisplay.o: kjtextdisplay.moc ++$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h + $(srcdir)/kjseeker.cpp: kjskinselectorwidget.h kjguisettingswidget.h + $(srcdir)/kjloader.cpp: kjskinselectorwidget.h kjguisettingswidget.h + kjequalizer.lo: kjequalizer.moc ++$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h + kjtextdisplay.lo: kjtextdisplay.moc +-kjprefs.lo: kjprefs.moc ++$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++kjloader.lo: kjloader.moc ++$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++kjequalizer.o: kjequalizer.moc + $(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++kjtextdisplay.o: kjtextdisplay.moc + $(srcdir)/kjsliders.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h ++kjprefs.lo: kjprefs.moc + kjloader.o: kjloader.moc +-kjequalizer.o: kjequalizer.moc +-$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-kjloader.lo: kjloader.moc +-$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h +-$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h diff --git a/multimedia/kdemultimedia3/patches/patch-bs b/multimedia/kdemultimedia3/patches/patch-bs new file mode 100644 index 00000000000..8dbfc8ab97a --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bs @@ -0,0 +1,13 @@ +$NetBSD: patch-bs,v 1.1.1.1 2004/01/26 15:42:37 jmmv Exp $ + +--- noatun/modules/marquis/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/marquis/Makefile.am +@@ -4,7 +4,7 @@ + noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp + + noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + noatun_marquis_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-bt b/multimedia/kdemultimedia3/patches/patch-bt new file mode 100644 index 00000000000..9752b1cc51d --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bt @@ -0,0 +1,22 @@ +$NetBSD: patch-bt,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/marquis/Makefile.in.orig Sat Dec 28 14:04:00 2002 ++++ noatun/modules/marquis/Makefile.in +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_marquis. + noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp + + noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_marquis_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_marquis_la_OBJECTS = marquis.lo plugin.lo + #>- noatun_marquis_la_OBJECTS = $(am_noatun_marquis_la_OBJECTS) + #>+ 4 diff --git a/multimedia/kdemultimedia3/patches/patch-bu b/multimedia/kdemultimedia3/patches/patch-bu new file mode 100644 index 00000000000..842975808cf --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bu @@ -0,0 +1,13 @@ +$NetBSD: patch-bu,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/metatag/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/metatag/Makefile.am +@@ -4,7 +4,7 @@ + noatun_metatag_la_SOURCES = metatag.cpp edit.cpp + + noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la + + noatun_metatag_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-bv b/multimedia/kdemultimedia3/patches/patch-bv new file mode 100644 index 00000000000..1f930fe012a --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bv @@ -0,0 +1,68 @@ +$NetBSD: patch-bv,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/metatag/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/metatag/Makefile.in +@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_metatag. + noatun_metatag_la_SOURCES = metatag.cpp edit.cpp + + noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la + + +@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_metatag_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la + am_noatun_metatag_la_OBJECTS = metatag.lo edit.lo + #>- noatun_metatag_la_OBJECTS = $(am_noatun_metatag_la_OBJECTS) +@@ -621,7 +621,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=HANDLED_ITEMS metatag.plugin ++KDE_DIST=HANDLED_ITEMS Makefile.in.rej metatag.plugin + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -770,20 +770,20 @@ noatun_metatag.la.closure: $(noatun_meta + + + #>+ 3 +-metatag.moc: $(srcdir)/metatag.h +- $(MOC) $(srcdir)/metatag.h -o metatag.moc +- +-#>+ 1 +-mocs: metatag.moc +-#>+ 3 + edit.moc: $(srcdir)/edit.h + $(MOC) $(srcdir)/edit.h -o edit.moc + + #>+ 1 + mocs: edit.moc + #>+ 3 ++metatag.moc: $(srcdir)/metatag.h ++ $(MOC) $(srcdir)/metatag.h -o metatag.moc ++ ++#>+ 1 ++mocs: metatag.moc ++#>+ 3 + clean-metasources: +- -rm -f metatag.moc edit.moc ++ -rm -f edit.moc metatag.moc + + #>+ 3 + clean-closures: +@@ -836,7 +836,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 ++metatag.o: metatag.moc + edit.lo: edit.moc + metatag.lo: metatag.moc + edit.o: edit.moc +-metatag.o: metatag.moc diff --git a/multimedia/kdemultimedia3/patches/patch-bw b/multimedia/kdemultimedia3/patches/patch-bw new file mode 100644 index 00000000000..ad3255a23ab --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bw @@ -0,0 +1,13 @@ +$NetBSD: patch-bw,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/monoscope/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/monoscope/Makefile.am +@@ -5,7 +5,7 @@ + #prefs.cpp + + noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm ++noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm + + noatun_monoscope_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-bx b/multimedia/kdemultimedia3/patches/patch-bx new file mode 100644 index 00000000000..562b17ad1ad --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bx @@ -0,0 +1,22 @@ +$NetBSD: patch-bx,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/monoscope/Makefile.in.orig Sat Dec 28 14:04:00 2002 ++++ noatun/modules/monoscope/Makefile.in +@@ -295,7 +295,7 @@ noatun_monoscope_la_SOURCES = monoscope. + + #prefs.cpp + noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm ++noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm + + #>- noatun_monoscope_la_METASOURCES = AUTO + +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_monoscope_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_monoscope_la_OBJECTS = monoscope.lo + #>- noatun_monoscope_la_OBJECTS = $(am_noatun_monoscope_la_OBJECTS) + #>+ 1 diff --git a/multimedia/kdemultimedia3/patches/patch-by b/multimedia/kdemultimedia3/patches/patch-by new file mode 100644 index 00000000000..8f4893bf147 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-by @@ -0,0 +1,13 @@ +$NetBSD: patch-by,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/net/Makefile.am.orig Wed May 8 19:29:29 2002 ++++ noatun/modules/net/Makefile.am +@@ -4,7 +4,7 @@ + noatun_net_la_SOURCES = net.cpp + + noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la ++noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la + + noatun_net_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-bz b/multimedia/kdemultimedia3/patches/patch-bz new file mode 100644 index 00000000000..c43a40e3cc0 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-bz @@ -0,0 +1,32 @@ +$NetBSD: patch-bz,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/net/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/net/Makefile.in +@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_net.la + noatun_net_la_SOURCES = net.cpp + + noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la ++noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la + + #>- noatun_net_la_METASOURCES = AUTO + +@@ -397,7 +397,8 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-noatun_net_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la ++noatun_net_la_DEPENDENCIES = \ ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_net_la_OBJECTS = net.lo + #>- noatun_net_la_OBJECTS = $(am_noatun_net_la_OBJECTS) + #>+ 1 +@@ -612,7 +613,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=net.plugin ++KDE_DIST=Makefile.in.rej net.plugin + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/multimedia/kdemultimedia3/patches/patch-ca b/multimedia/kdemultimedia3/patches/patch-ca new file mode 100644 index 00000000000..450252a54f5 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ca @@ -0,0 +1,13 @@ +$NetBSD: patch-ca,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/noatunui/Makefile.am.orig Wed May 8 19:29:30 2002 ++++ noatun/modules/noatunui/Makefile.am +@@ -4,7 +4,7 @@ + noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp + + noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + diff --git a/multimedia/kdemultimedia3/patches/patch-cb b/multimedia/kdemultimedia3/patches/patch-cb new file mode 100644 index 00000000000..a42a5e94bf3 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cb @@ -0,0 +1,23 @@ +$NetBSD: patch-cb,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/noatunui/Makefile.in.orig Sat Dec 28 14:04:00 2002 ++++ noatun/modules/noatunui/Makefile.in +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_ui.la + noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp + + noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + +@@ -310,7 +310,8 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-noatun_ui_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_ui_la_DEPENDENCIES = \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la + am_noatun_ui_la_OBJECTS = noatunui.lo userinterface.lo + #>- noatun_ui_la_OBJECTS = $(am_noatun_ui_la_OBJECTS) diff --git a/multimedia/kdemultimedia3/patches/patch-cc b/multimedia/kdemultimedia3/patches/patch-cc new file mode 100644 index 00000000000..a975425da43 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cc @@ -0,0 +1,13 @@ +$NetBSD: patch-cc,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/splitplaylist/Makefile.am.orig Wed May 8 19:29:30 2002 ++++ noatun/modules/splitplaylist/Makefile.am +@@ -4,7 +4,7 @@ + noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp + + noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la ++noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la + + noatun_splitplaylist_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-cd b/multimedia/kdemultimedia3/patches/patch-cd new file mode 100644 index 00000000000..efea2ca2200 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cd @@ -0,0 +1,78 @@ +$NetBSD: patch-cd,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/splitplaylist/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/splitplaylist/Makefile.in +@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_splitpla + noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp + + noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la ++noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la + + #>- noatun_splitplaylist_la_METASOURCES = AUTO + +@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_splitplaylist_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \ + view.lo find.lo + #>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS) +@@ -646,7 +646,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=splui.rc LICENSE splitplaylist.plugin ++KDE_DIST=splitplaylist.plugin LICENSE splui.rc Makefile.in.rej + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -798,12 +798,6 @@ noatun_splitplaylist.la.closure: $(noatu + + + #>+ 3 +-playlist.moc: $(srcdir)/playlist.h +- $(MOC) $(srcdir)/playlist.h -o playlist.moc +- +-#>+ 1 +-mocs: playlist.moc +-#>+ 3 + find.moc: $(srcdir)/find.h + $(MOC) $(srcdir)/find.h -o find.moc + +@@ -816,8 +810,14 @@ view.moc: $(srcdir)/view.h + #>+ 1 + mocs: view.moc + #>+ 3 ++playlist.moc: $(srcdir)/playlist.h ++ $(MOC) $(srcdir)/playlist.h -o playlist.moc ++ ++#>+ 1 ++mocs: playlist.moc ++#>+ 3 + clean-metasources: +- -rm -f playlist.moc find.moc view.moc ++ -rm -f find.moc view.moc playlist.moc + + #>+ 3 + clean-closures: +@@ -834,7 +834,7 @@ force-reedit: + + + #>+ 11 +-noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp playlist.moc find.moc view.moc ++noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp find.moc view.moc playlist.moc + @echo 'creating noatun_splitplaylist_la.all_cpp.cpp ...'; \ + rm -f noatun_splitplaylist_la.all_cpp.files noatun_splitplaylist_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_splitplaylist_la.all_cpp.final; \ +@@ -872,7 +872,7 @@ kde-rpo-clean: + #>+ 7 + find.o: find.moc + playlist.lo: playlist.moc +-find.lo: find.moc + view.o: view.moc + playlist.o: playlist.moc ++find.lo: find.moc + view.lo: view.moc diff --git a/multimedia/kdemultimedia3/patches/patch-ce b/multimedia/kdemultimedia3/patches/patch-ce new file mode 100644 index 00000000000..66f523677c0 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ce @@ -0,0 +1,13 @@ +$NetBSD: patch-ce,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/systray/Makefile.am.orig Wed May 8 19:29:31 2002 ++++ noatun/modules/systray/Makefile.am +@@ -4,7 +4,7 @@ + noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp + + noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + noatun_systray_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-cf b/multimedia/kdemultimedia3/patches/patch-cf new file mode 100644 index 00000000000..ec2dfc83ab2 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cf @@ -0,0 +1,82 @@ +$NetBSD: patch-cf,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/systray/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/systray/Makefile.in +@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_systray. + noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp + + noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + + +@@ -403,7 +403,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_systray_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \ + cmodule.lo + #>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS) +@@ -633,7 +633,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=cr16-action-noatuntraypause.png systray.plugin cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntray.png cr16-action-noatuntrayplay.png ++KDE_DIST=cr16-action-noatuntrayplay.png Makefile.in.rej systray.plugin cr16-action-noatuntray.png cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntraypause.png + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -791,20 +791,20 @@ cmodule.moc: $(srcdir)/cmodule.h + #>+ 1 + mocs: cmodule.moc + #>+ 3 +-kitsystemtray.moc: $(srcdir)/kitsystemtray.h +- $(MOC) $(srcdir)/kitsystemtray.h -o kitsystemtray.moc +- +-#>+ 1 +-mocs: kitsystemtray.moc +-#>+ 3 + systray.moc: $(srcdir)/systray.h + $(MOC) $(srcdir)/systray.h -o systray.moc + + #>+ 1 + mocs: systray.moc + #>+ 3 ++kitsystemtray.moc: $(srcdir)/kitsystemtray.h ++ $(MOC) $(srcdir)/kitsystemtray.h -o kitsystemtray.moc ++ ++#>+ 1 ++mocs: kitsystemtray.moc ++#>+ 3 + clean-metasources: +- -rm -f cmodule.moc kitsystemtray.moc systray.moc ++ -rm -f cmodule.moc systray.moc kitsystemtray.moc + + #>+ 3 + clean-closures: +@@ -835,7 +835,7 @@ force-reedit: + + + #>+ 11 +-noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp cmodule.moc kitsystemtray.moc systray.moc ++noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp cmodule.moc systray.moc kitsystemtray.moc + @echo 'creating noatun_systray_la.all_cpp.cpp ...'; \ + rm -f noatun_systray_la.all_cpp.files noatun_systray_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_systray_la.all_cpp.final; \ +@@ -871,9 +871,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-systray.lo: systray.moc ++kitsystemtray.o: kitsystemtray.moc ++systray.o: systray.moc + cmodule.o: cmodule.moc +-kitsystemtray.lo: kitsystemtray.moc + cmodule.lo: cmodule.moc +-systray.o: systray.moc +-kitsystemtray.o: kitsystemtray.moc ++kitsystemtray.lo: kitsystemtray.moc ++systray.lo: systray.moc diff --git a/multimedia/kdemultimedia3/patches/patch-cg b/multimedia/kdemultimedia3/patches/patch-cg new file mode 100644 index 00000000000..99529ec294e --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cg @@ -0,0 +1,13 @@ +$NetBSD: patch-cg,v 1.1.1.1 2004/01/26 15:42:40 jmmv Exp $ + +--- noatun/modules/voiceprint/Makefile.am.orig Wed May 8 19:29:31 2002 ++++ noatun/modules/voiceprint/Makefile.am +@@ -4,7 +4,7 @@ + noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp + + noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm ++noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm + + noatun_voiceprint_la_METASOURCES = AUTO + diff --git a/multimedia/kdemultimedia3/patches/patch-ch b/multimedia/kdemultimedia3/patches/patch-ch new file mode 100644 index 00000000000..0bd528362d4 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ch @@ -0,0 +1,78 @@ +$NetBSD: patch-ch,v 1.1.1.1 2004/01/26 15:42:41 jmmv Exp $ + +--- noatun/modules/voiceprint/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/voiceprint/Makefile.in +@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_voicepri + noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp + + noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +-noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm ++noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm + + #>- noatun_voiceprint_la_METASOURCES = AUTO + +@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_voiceprint_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la ++ $(top_builddir)/noatun/library/libnoatun_core.la + am_noatun_voiceprint_la_OBJECTS = voiceprint.lo prefs.lo + #>- noatun_voiceprint_la_OBJECTS = $(am_noatun_voiceprint_la_OBJECTS) + #>+ 4 +@@ -618,7 +618,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=voiceprint.plugin ++KDE_DIST=voiceprint.plugin Makefile.in.rej + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -767,20 +767,20 @@ noatun_voiceprint.la.closure: $(noatun_v + + + #>+ 3 +-prefs.moc: $(srcdir)/prefs.h +- $(MOC) $(srcdir)/prefs.h -o prefs.moc +- +-#>+ 1 +-mocs: prefs.moc +-#>+ 3 + voiceprint.moc: $(srcdir)/voiceprint.h + $(MOC) $(srcdir)/voiceprint.h -o voiceprint.moc + + #>+ 1 + mocs: voiceprint.moc + #>+ 3 ++prefs.moc: $(srcdir)/prefs.h ++ $(MOC) $(srcdir)/prefs.h -o prefs.moc ++ ++#>+ 1 ++mocs: prefs.moc ++#>+ 3 + clean-metasources: +- -rm -f prefs.moc voiceprint.moc ++ -rm -f voiceprint.moc prefs.moc + + #>+ 3 + clean-closures: +@@ -797,7 +797,7 @@ force-reedit: + + + #>+ 11 +-noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp prefs.moc voiceprint.moc ++noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp voiceprint.moc prefs.moc + @echo 'creating noatun_voiceprint_la.all_cpp.cpp ...'; \ + rm -f noatun_voiceprint_la.all_cpp.files noatun_voiceprint_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_voiceprint_la.all_cpp.final; \ +@@ -833,7 +833,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 +-prefs.o: prefs.moc +-voiceprint.o: voiceprint.moc + prefs.lo: prefs.moc ++voiceprint.o: voiceprint.moc + voiceprint.lo: voiceprint.moc ++prefs.o: prefs.moc diff --git a/multimedia/kdemultimedia3/patches/patch-ci b/multimedia/kdemultimedia3/patches/patch-ci new file mode 100644 index 00000000000..7c9f7cc8455 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ci @@ -0,0 +1,13 @@ +$NetBSD: patch-ci,v 1.1.1.1 2004/01/26 15:42:41 jmmv Exp $ + +--- noatun/modules/winskin/Makefile.am.orig Sun Oct 27 11:20:56 2002 ++++ noatun/modules/winskin/Makefile.am +@@ -39,7 +39,7 @@ noatun_winskin_la_SOURCES = fileInfo. + noatun_winskin_la_LDFLAGS = $(all_libraries) \ + -module -avoid-version -no-undefined + +-noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la + + noatun_winskin_la_METASOURCES = AUTO diff --git a/multimedia/kdemultimedia3/patches/patch-cj b/multimedia/kdemultimedia3/patches/patch-cj new file mode 100644 index 00000000000..97556124e0e --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cj @@ -0,0 +1,301 @@ +$NetBSD: patch-cj,v 1.1.1.1 2004/01/26 15:42:41 jmmv Exp $ + +--- noatun/modules/winskin/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/winskin/Makefile.in +@@ -446,7 +446,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar + -module -avoid-version -no-undefined + + +-noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ ++noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la + + +@@ -459,7 +459,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_winskin_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la + am_noatun_winskin_la_OBJECTS = fileInfo.lo guiSpectrumAnalyser.lo \ + plugin.lo waBalanceSlider.lo waButton.lo waClutterbar.lo \ +@@ -841,7 +841,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=waVolumeSlider.h waIndicator.h waSkinModel.h waSkinMapping.h waSlider.h waBalanceSlider.h waColor.h waButton.h skinMap.h fileInfo.h waWidget.h waSkins.h guiSpectrumAnalyser.h winskin.plugin waDigit.h waSkin.h waJumpSlider.h waMain.h waTitleBar.h waShadeMapping.h waSkinManager.h waLabel.h waClutterbar.h winSkinConfig.h winSkinVis.h waRegion.h waInfo.h waStatus.h ++KDE_DIST=winSkinConfig.h waClutterbar.h waBalanceSlider.h waDigit.h waStatus.h winSkinVis.h waLabel.h waSlider.h fileInfo.h waWidget.h winskin.plugin waShadeMapping.h Makefile.in.rej waSkins.h waMain.h waInfo.h waRegion.h waSkinModel.h waSkinMapping.h skinMap.h waJumpSlider.h waIndicator.h waSkin.h waVolumeSlider.h waColor.h waSkinManager.h waTitleBar.h waButton.h guiSpectrumAnalyser.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -1019,65 +1019,65 @@ noatun_winskin.la.closure: $(noatun_wins + + + #>+ 3 +-waTitleBar.moc: $(srcdir)/waTitleBar.h +- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc ++waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h ++ $(MOC) $(srcdir)/waVolumeSlider.h -o waVolumeSlider.moc + + #>+ 1 +-mocs: waTitleBar.moc ++mocs: waVolumeSlider.moc + #>+ 3 +-waInfo.moc: $(srcdir)/waInfo.h +- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc ++guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h ++ $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc + + #>+ 1 +-mocs: waInfo.moc ++mocs: guiSpectrumAnalyser.moc + #>+ 3 +-waDigit.moc: $(srcdir)/waDigit.h +- $(MOC) $(srcdir)/waDigit.h -o waDigit.moc ++winSkinConfig.moc: $(srcdir)/winSkinConfig.h ++ $(MOC) $(srcdir)/winSkinConfig.h -o winSkinConfig.moc + + #>+ 1 +-mocs: waDigit.moc ++mocs: winSkinConfig.moc + #>+ 3 +-waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h +- $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc ++waButton.moc: $(srcdir)/waButton.h ++ $(MOC) $(srcdir)/waButton.h -o waButton.moc + + #>+ 1 +-mocs: waBalanceSlider.moc ++mocs: waButton.moc + #>+ 3 +-waSkin.moc: $(srcdir)/waSkin.h +- $(MOC) $(srcdir)/waSkin.h -o waSkin.moc ++waInfo.moc: $(srcdir)/waInfo.h ++ $(MOC) $(srcdir)/waInfo.h -o waInfo.moc + + #>+ 1 +-mocs: waSkin.moc ++mocs: waInfo.moc + #>+ 3 +-waSkinManager.moc: $(srcdir)/waSkinManager.h +- $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc ++waStatus.moc: $(srcdir)/waStatus.h ++ $(MOC) $(srcdir)/waStatus.h -o waStatus.moc + + #>+ 1 +-mocs: waSkinManager.moc ++mocs: waStatus.moc + #>+ 3 +-winSkinVis.moc: $(srcdir)/winSkinVis.h +- $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc ++waTitleBar.moc: $(srcdir)/waTitleBar.h ++ $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc + + #>+ 1 +-mocs: winSkinVis.moc ++mocs: waTitleBar.moc + #>+ 3 +-waSkinModel.moc: $(srcdir)/waSkinModel.h +- $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc ++waSkin.moc: $(srcdir)/waSkin.h ++ $(MOC) $(srcdir)/waSkin.h -o waSkin.moc + + #>+ 1 +-mocs: waSkinModel.moc ++mocs: waSkin.moc + #>+ 3 +-waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h +- $(MOC) $(srcdir)/waVolumeSlider.h -o waVolumeSlider.moc ++waDigit.moc: $(srcdir)/waDigit.h ++ $(MOC) $(srcdir)/waDigit.h -o waDigit.moc + + #>+ 1 +-mocs: waVolumeSlider.moc ++mocs: waDigit.moc + #>+ 3 +-winSkinConfig.moc: $(srcdir)/winSkinConfig.h +- $(MOC) $(srcdir)/winSkinConfig.h -o winSkinConfig.moc ++waWidget.moc: $(srcdir)/waWidget.h ++ $(MOC) $(srcdir)/waWidget.h -o waWidget.moc + + #>+ 1 +-mocs: winSkinConfig.moc ++mocs: waWidget.moc + #>+ 3 + waSlider.moc: $(srcdir)/waSlider.h + $(MOC) $(srcdir)/waSlider.h -o waSlider.moc +@@ -1085,62 +1085,62 @@ waSlider.moc: $(srcdir)/waSlider.h + #>+ 1 + mocs: waSlider.moc + #>+ 3 +-guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h +- $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc ++waClutterbar.moc: $(srcdir)/waClutterbar.h ++ $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc + + #>+ 1 +-mocs: guiSpectrumAnalyser.moc ++mocs: waClutterbar.moc + #>+ 3 +-waLabel.moc: $(srcdir)/waLabel.h +- $(MOC) $(srcdir)/waLabel.h -o waLabel.moc ++waJumpSlider.moc: $(srcdir)/waJumpSlider.h ++ $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc + + #>+ 1 +-mocs: waLabel.moc ++mocs: waJumpSlider.moc + #>+ 3 +-waButton.moc: $(srcdir)/waButton.h +- $(MOC) $(srcdir)/waButton.h -o waButton.moc ++waMain.moc: $(srcdir)/waMain.h ++ $(MOC) $(srcdir)/waMain.h -o waMain.moc + + #>+ 1 +-mocs: waButton.moc ++mocs: waMain.moc + #>+ 3 +-waWidget.moc: $(srcdir)/waWidget.h +- $(MOC) $(srcdir)/waWidget.h -o waWidget.moc ++waLabel.moc: $(srcdir)/waLabel.h ++ $(MOC) $(srcdir)/waLabel.h -o waLabel.moc + + #>+ 1 +-mocs: waWidget.moc ++mocs: waLabel.moc + #>+ 3 +-waMain.moc: $(srcdir)/waMain.h +- $(MOC) $(srcdir)/waMain.h -o waMain.moc ++winSkinVis.moc: $(srcdir)/winSkinVis.h ++ $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc + + #>+ 1 +-mocs: waMain.moc ++mocs: winSkinVis.moc + #>+ 3 +-waIndicator.moc: $(srcdir)/waIndicator.h +- $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc ++waSkinManager.moc: $(srcdir)/waSkinManager.h ++ $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc + + #>+ 1 +-mocs: waIndicator.moc ++mocs: waSkinManager.moc + #>+ 3 +-waJumpSlider.moc: $(srcdir)/waJumpSlider.h +- $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc ++waIndicator.moc: $(srcdir)/waIndicator.h ++ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc + + #>+ 1 +-mocs: waJumpSlider.moc ++mocs: waIndicator.moc + #>+ 3 +-waStatus.moc: $(srcdir)/waStatus.h +- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc ++waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h ++ $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc + + #>+ 1 +-mocs: waStatus.moc ++mocs: waBalanceSlider.moc + #>+ 3 +-waClutterbar.moc: $(srcdir)/waClutterbar.h +- $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc ++waSkinModel.moc: $(srcdir)/waSkinModel.h ++ $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc + + #>+ 1 +-mocs: waClutterbar.moc ++mocs: waSkinModel.moc + #>+ 3 + clean-metasources: +- -rm -f waTitleBar.moc waInfo.moc waDigit.moc waBalanceSlider.moc waSkin.moc waSkinManager.moc winSkinVis.moc waSkinModel.moc waVolumeSlider.moc winSkinConfig.moc waSlider.moc guiSpectrumAnalyser.moc waLabel.moc waButton.moc waWidget.moc waMain.moc waIndicator.moc waJumpSlider.moc waStatus.moc waClutterbar.moc ++ -rm -f waVolumeSlider.moc guiSpectrumAnalyser.moc winSkinConfig.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waClutterbar.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waSkinManager.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc + + #>+ 4 + clean-idl: +@@ -1162,7 +1162,7 @@ force-reedit: + + + #>+ 11 +-noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waLabel.moc waTitleBar.moc waButton.moc waWidget.moc waInfo.moc waDigit.moc waIndicator.moc waMain.moc waSkin.moc waBalanceSlider.moc waSkinManager.moc waJumpSlider.moc winSkinVis.moc waStatus.moc waSkinModel.moc waVolumeSlider.moc winSkinConfig.moc waSlider.moc waClutterbar.moc guiSpectrumAnalyser.moc ++noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waVolumeSlider.moc winSkinConfig.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waClutterbar.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waSkinManager.moc waBalanceSlider.moc waSkinModel.moc + @echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \ + rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \ +@@ -1198,43 +1198,43 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 41 +-waWidget.o: waWidget.moc +-waVolumeSlider.lo: waVolumeSlider.moc +-waTitleBar.o: waTitleBar.moc +-waInfo.o: waInfo.moc +-waClutterbar.o: waClutterbar.moc +-waStatus.o: waStatus.moc ++waClutterbar.lo: waClutterbar.moc + waWidget.lo: waWidget.moc +-waInfo.lo: waInfo.moc +-waMain.o: waMain.moc ++guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc ++guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc ++waClutterbar.o: waClutterbar.moc ++winSkinConfig.o: winSkinConfig.moc ++waMain.lo: waMain.moc + winSkinConfig.lo: winSkinConfig.moc + waSkinManager.lo: waSkinManager.moc +-waSkin.lo: waSkin.moc +-waStatus.lo: waStatus.moc +-waIndicator.lo: waIndicator.moc +-winSkinVis.lo: winSkinVis.moc +-waSlider.lo: waSlider.moc +-winSkinConfig.o: winSkinConfig.moc +-waBalanceSlider.lo: waBalanceSlider.moc +-waDigit.lo: waDigit.moc +-waDigit.o: waDigit.moc +-guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc +-waVolumeSlider.o: waVolumeSlider.moc + waBalanceSlider.o: waBalanceSlider.moc +-waSkinManager.o: waSkinManager.moc +-waIndicator.o: waIndicator.moc ++waInfo.lo: waInfo.moc + waSkinModel.lo: waSkinModel.moc +-waButton.lo: waButton.moc +-waButton.o: waButton.moc +-waClutterbar.lo: waClutterbar.moc +-waJumpSlider.o: waJumpSlider.moc ++waDigit.o: waDigit.moc ++waIndicator.lo: waIndicator.moc ++winSkinVis.o: winSkinVis.moc ++waStatus.o: waStatus.moc + waJumpSlider.lo: waJumpSlider.moc +-waLabel.lo: waLabel.moc + waLabel.o: waLabel.moc ++waSlider.o: waSlider.moc ++waWidget.o: waWidget.moc ++waButton.lo: waButton.moc ++waMain.o: waMain.moc ++waInfo.o: waInfo.moc ++waDigit.lo: waDigit.moc + waSkinModel.o: waSkinModel.moc ++waSkin.lo: waSkin.moc ++winSkinVis.lo: winSkinVis.moc + waTitleBar.lo: waTitleBar.moc +-guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc +-winSkinVis.o: winSkinVis.moc +-waMain.lo: waMain.moc +-waSlider.o: waSlider.moc ++waVolumeSlider.lo: waVolumeSlider.moc ++waIndicator.o: waIndicator.moc ++waJumpSlider.o: waJumpSlider.moc ++waBalanceSlider.lo: waBalanceSlider.moc + waSkin.o: waSkin.moc ++waVolumeSlider.o: waVolumeSlider.moc ++waStatus.lo: waStatus.moc ++waLabel.lo: waLabel.moc ++waSkinManager.o: waSkinManager.moc ++waTitleBar.o: waTitleBar.moc ++waSlider.lo: waSlider.moc ++waButton.o: waButton.moc diff --git a/multimedia/kdemultimedia3/patches/patch-cm b/multimedia/kdemultimedia3/patches/patch-cm new file mode 100644 index 00000000000..712b9833742 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cm @@ -0,0 +1,13 @@ +$NetBSD: patch-cm,v 1.1.1.1 2004/01/26 15:42:41 jmmv Exp $ + +--- noatun/modules/artseffects/Makefile.am.orig Fri Mar 22 14:05:57 2002 ++++ noatun/modules/artseffects/Makefile.am +@@ -5,7 +5,7 @@ + libartseffects_la_SOURCES = artseffects.cc extrastereo_impl.cc + libartseffects_la_LDFLAGS = -L$(top_builddir)/arts/gui/common $(all_libraries) \ + -module -avoid-version -no-undefined +-libartseffects_la_LIBADD = -lartsgui_idl -lkmedia2_idl -lsoundserver_idl -lartsflow ++libartseffects_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la -lkmedia2_idl -lsoundserver_idl -lartsflow + + #libartseffectsui_la_SOURCES = artseffects.cc + #libartseffectsui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/multimedia/kdemultimedia3/patches/patch-cn b/multimedia/kdemultimedia3/patches/patch-cn new file mode 100644 index 00000000000..6c69b129064 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cn @@ -0,0 +1,32 @@ +$NetBSD: patch-cn,v 1.1.1.1 2004/01/26 15:42:41 jmmv Exp $ + +--- noatun/modules/artseffects/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/modules/artseffects/Makefile.in +@@ -385,7 +385,7 @@ libartseffects_la_SOURCES = artseffects. + libartseffects_la_LDFLAGS = -L$(top_builddir)/arts/gui/common $(all_libraries) \ + -module -avoid-version -no-undefined + +-libartseffects_la_LIBADD = -lartsgui_idl -lkmedia2_idl -lsoundserver_idl -lartsflow ++libartseffects_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la -lkmedia2_idl -lsoundserver_idl -lartsflow + + mcoptypedir = $(libdir)/mcop + mcoptype_DATA = artseffects.mcoptype artseffects.mcopclass +@@ -399,7 +399,8 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-libartseffects_la_DEPENDENCIES = ++libartseffects_la_DEPENDENCIES = \ ++ $(top_builddir)/arts/gui/common/libartsgui_idl.la + am_libartseffects_la_OBJECTS = artseffects.lo extrastereo_impl.lo + #>- libartseffects_la_OBJECTS = $(am_libartseffects_la_OBJECTS) + #>+ 4 +@@ -638,7 +639,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=artseffects.mcoptype extrastereogui_impl.h RawWriter.mcopclass artseffects.mcopclass extrastereogui_impl.cc ExtraStereoGuiFactory.mcopclass effect.cpp VoiceRemoval.mcopclass artseffects.idl artseffects.h ExtraStereo.mcopclass ++KDE_DIST=effect.cpp ExtraStereo.mcopclass artseffects.idl Makefile.in.rej artseffects.mcoptype artseffects.h ExtraStereoGuiFactory.mcopclass RawWriter.mcopclass artseffects.mcopclass VoiceRemoval.mcopclass extrastereogui_impl.cc extrastereogui_impl.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/multimedia/kdemultimedia3/patches/patch-co b/multimedia/kdemultimedia3/patches/patch-co new file mode 100644 index 00000000000..a3c7d7666b7 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-co @@ -0,0 +1,13 @@ +$NetBSD: patch-co,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $ + +--- noatun/modules/excellent/Makefile.am.orig Sun Dec 1 13:45:29 2002 ++++ noatun/modules/excellent/Makefile.am +@@ -6,7 +6,7 @@ noatun_excellent_la_SOURCES = noatunui.c + + noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + noatun_excellent_la_LIBADD = $(LIB_KFILE) \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + diff --git a/multimedia/kdemultimedia3/patches/patch-cp b/multimedia/kdemultimedia3/patches/patch-cp new file mode 100644 index 00000000000..eaa0aec950c --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cp @@ -0,0 +1,13 @@ +$NetBSD: patch-cp,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $ + +--- noatun/modules/simple/Makefile.am.orig Thu Jun 6 22:42:13 2002 ++++ noatun/modules/simple/Makefile.am +@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatunsimple.la + + noatunsimple_la_SOURCES = propertiesdialog.ui noatunui.cpp userinterface.cpp + noatunsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +-noatunsimple_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ ++noatunsimple_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lkmedia2_idl -lsoundserver_idl -lartskde + diff --git a/multimedia/kdemultimedia3/patches/patch-cq b/multimedia/kdemultimedia3/patches/patch-cq new file mode 100644 index 00000000000..57722d013df --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cq @@ -0,0 +1,39 @@ +$NetBSD: patch-cq,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $ + +--- noatun/modules/simple/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300 ++++ noatun/modules/simple/Makefile.in +@@ -385,7 +385,7 @@ kde_module_LTLIBRARIES = noatunsimple.la + #>+ 1 + noatunsimple_la_SOURCES= noatunui.cpp userinterface.cpp propertiesdialog.cpp + noatunsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +-noatunsimple_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ ++noatunsimple_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lkmedia2_idl -lsoundserver_idl -lartskde + +@@ -403,7 +403,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatunsimple_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la + am_noatunsimple_la_OBJECTS = noatunui.lo userinterface.lo + #>- noatunsimple_la_OBJECTS = $(am_noatunsimple_la_OBJECTS) +@@ -627,7 +627,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=propertiesdialog.ui.h back.xpm forward.xpm simple.plugin pause.xpm playlist.xpm stop.xpm volume.xpm propertiesdialog.ui play.xpm ++KDE_DIST=pause.xpm stop.xpm back.xpm propertiesdialog.ui.h simple.plugin Makefile.in.rej playlist.xpm forward.xpm volume.xpm propertiesdialog.ui play.xpm + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -857,6 +857,6 @@ kde-rpo-clean: + + #>+ 5 + $(srcdir)/noatunui.cpp: propertiesdialog.h +-userinterface.lo: userinterface.moc + $(srcdir)/userinterface.cpp: propertiesdialog.h + userinterface.o: userinterface.moc ++userinterface.lo: userinterface.moc diff --git a/multimedia/kdemultimedia3/patches/patch-cr b/multimedia/kdemultimedia3/patches/patch-cr new file mode 100644 index 00000000000..fe2bddd84c4 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cr @@ -0,0 +1,12 @@ +$NetBSD: patch-cr,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $ + +--- mpeglib/lib/decoder/decoderPlugin.cpp.orig 2002-11-22 21:52:54.000000000 +0000 ++++ mpeglib/lib/decoder/decoderPlugin.cpp +@@ -337,6 +337,7 @@ int DecoderPlugin::runCheck() { + case _RUN_CHECK_CONTINUE: + break; + case _RUN_CHECK_FALSE: ++ shutdownLock(); + return false; + case _RUN_CHECK_TRUE: + return true; diff --git a/multimedia/kdemultimedia3/patches/patch-cs b/multimedia/kdemultimedia3/patches/patch-cs new file mode 100644 index 00000000000..0d399620d3f --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cs @@ -0,0 +1,22 @@ +$NetBSD: patch-cs,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $ + +--- mpeglib/lib/util/audio/audioIO_SDL.cpp.orig 2003-11-08 13:24:41.000000000 +0100 ++++ mpeglib/lib/util/audio/audioIO_SDL.cpp 2003-11-08 13:24:58.000000000 +0100 +@@ -11,7 +11,7 @@ + */ + #include "../../input/bufferInputStream.h" + #include <assert.h> +-#include <iostream.h> ++#include <iostream> + #if defined WIN32 + #include <SDL.h> + #include <SDL_audio.h> +@@ -20,6 +20,8 @@ + #include <SDL/SDL_audio.h> + #endif + ++using namespace std; ++ + //static SDL_AudioSpec actual; + static BufferInputStream* audioRing; + static TimeStamp* dummy; diff --git a/multimedia/kdemultimedia3/patches/patch-ct b/multimedia/kdemultimedia3/patches/patch-ct new file mode 100644 index 00000000000..cb0f0d58472 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-ct @@ -0,0 +1,21 @@ +$NetBSD: patch-ct,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- mpeglib/example/yaf/yafvorbis/vorbis_control.cpp.orig 2003-11-08 13:30:14.000000000 +0100 ++++ mpeglib/example/yaf/yafvorbis/vorbis_control.cpp 2003-11-08 13:29:46.000000000 +0100 +@@ -19,7 +19,7 @@ + + + +-#include <iostream.h> ++#include <iostream> + #include <stdio.h> + #include <stdlib.h> + #include <math.h> +@@ -33,6 +33,7 @@ + #include <getopt.h> + #endif + ++using namespace std; + + + diff --git a/multimedia/kdemultimedia3/patches/patch-cu b/multimedia/kdemultimedia3/patches/patch-cu new file mode 100644 index 00000000000..de8d63b7242 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cu @@ -0,0 +1,13 @@ +$NetBSD: patch-cu,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- arts/runtime/artsbuilderloader_impl.cc.orig 2003-11-08 14:02:27.000000000 +0100 ++++ arts/runtime/artsbuilderloader_impl.cc 2003-11-08 14:02:37.000000000 +0100 +@@ -22,7 +22,7 @@ + + #include "artsbuilder.h" + #include "debug.h" +-#include <fstream.h> ++#include <fstream> + #include <sys/types.h> + #include <sys/stat.h> + #include <stdio.h> diff --git a/multimedia/kdemultimedia3/patches/patch-cv b/multimedia/kdemultimedia3/patches/patch-cv new file mode 100644 index 00000000000..e52b7a02bd8 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cv @@ -0,0 +1,18 @@ +$NetBSD: patch-cv,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- arts/modules/env_mixeritem_impl.cc.orig 2003-11-08 14:03:31.000000000 +0100 ++++ arts/modules/env_mixeritem_impl.cc 2003-11-08 14:03:42.000000000 +0100 +@@ -4,10 +4,12 @@ + #include "connect.h" + #include "../runtime/sequenceutils.h" + #include <stdio.h> +-#include <vector.h> ++#include <vector> + + #include <klocale.h> + ++using namespace std; ++ + namespace Arts { + namespace Environment { + diff --git a/multimedia/kdemultimedia3/patches/patch-cw b/multimedia/kdemultimedia3/patches/patch-cw new file mode 100644 index 00000000000..915628ba28b --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cw @@ -0,0 +1,17 @@ +$NetBSD: patch-cw,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- arts/tools/environmentview.cpp.orig 2003-11-08 14:04:20.000000000 +0100 ++++ arts/tools/environmentview.cpp 2003-11-08 14:04:30.000000000 +0100 +@@ -29,10 +29,11 @@ + #include "main.h" + #include <stdio.h> + #include <fstream> +-#include <vector.h> ++#include <vector> + + #define DEFAULT_ENV_FILENAME "~/default.arts-env" + ++using namespace std; + using namespace Arts; + using Environment::Container; + using Environment::Item; diff --git a/multimedia/kdemultimedia3/patches/patch-cx b/multimedia/kdemultimedia3/patches/patch-cx new file mode 100644 index 00000000000..b1395e09061 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cx @@ -0,0 +1,19 @@ +$NetBSD: patch-cx,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- mpeglib/lib/mpegplay/recon.h.orig 2003-11-08 14:08:31.000000000 +0100 ++++ mpeglib/lib/mpegplay/recon.h 2003-11-08 14:08:41.000000000 +0100 +@@ -15,11 +15,13 @@ + #define __RECON_H + + +-#include <iostream.h> ++#include <iostream> + #include "../util/render/pictureArray.h" + #include "copyFunctions.h" + #include "videoDecoder.h" + ++using namespace std; ++ + class Recon { + + diff --git a/multimedia/kdemultimedia3/patches/patch-cy b/multimedia/kdemultimedia3/patches/patch-cy new file mode 100644 index 00000000000..21914432f26 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cy @@ -0,0 +1,17 @@ +$NetBSD: patch-cy,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- mpeglib/lib/mpegplay/copyFunctions.h.orig 2003-11-08 14:08:58.000000000 +0100 ++++ mpeglib/lib/mpegplay/copyFunctions.h 2003-11-08 14:09:07.000000000 +0100 +@@ -17,9 +17,11 @@ + #define MAX_NEG_CROP 32768 + #define NUM_CROP_ENTRIES (2048+2*MAX_NEG_CROP) + +-#include <iostream.h> ++#include <iostream> + #include "../util/mmx/mmx.h" + ++using namespace std; ++ + extern "C" { + #include <string.h> + } diff --git a/multimedia/kdemultimedia3/patches/patch-cz b/multimedia/kdemultimedia3/patches/patch-cz new file mode 100644 index 00000000000..f71969c4224 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-cz @@ -0,0 +1,15 @@ +$NetBSD: patch-cz,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ + +--- mpeglib/lib/mpegplay/copyFunctions_asm.h.orig 2003-11-08 14:09:16.000000000 +0100 ++++ mpeglib/lib/mpegplay/copyFunctions_asm.h 2003-11-08 14:09:26.000000000 +0100 +@@ -18,7 +18,9 @@ + #include "config.h" + #endif + +-#include <iostream.h> ++#include <iostream> ++ ++using namespace std; + + class CopyFunctions_ASM { + diff --git a/multimedia/kdemultimedia3/patches/patch-da b/multimedia/kdemultimedia3/patches/patch-da new file mode 100644 index 00000000000..0683d8eceff --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-da @@ -0,0 +1,31 @@ +$NetBSD: patch-da,v 1.1.1.1 2004/01/26 15:42:33 jmmv Exp $ + +--- noatun/modules/excellent/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 ++++ noatun/modules/excellent/Makefile.in +@@ -386,7 +386,7 @@ noatun_excellent_la_SOURCES = noatunui.c + + noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + noatun_excellent_la_LIBADD = $(LIB_KFILE) \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + +@@ -404,7 +404,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + + noatun_excellent_la_DEPENDENCIES = \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la + am_noatun_excellent_la_OBJECTS = noatunui.lo userinterface.lo + #>- noatun_excellent_la_OBJECTS = $(am_noatun_excellent_la_OBJECTS) +@@ -628,7 +628,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=excellent.plugin excellentui.rc ++KDE_DIST=Makefile.in.rej excellent.plugin excellentui.rc + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + |