kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update KDE to 3.1.

Browse source 
Many bugfixes and functionality enhancements including:

kdemultimedia

 Started a video framework
 More consistent internationalisation in many applications.
 NEW IN KDE: KAudioCreator, a CD ripper and audio encoder frontend.
 NEW IN KDE: KRec, an audio recorder using aRts.
 KMediaPlayer interface added to kdelibs to reuse Kaboodle.
 Noatun: Added option to clear the playlist when running with a file as
 command line option.
 Added video thumbnail creator using xine-arts.
 KMix: Added mute control support.
This commit is contained in:
markd 2003-03-11 13:33:44 +00:00
parent aa7a252435
commit 8558153aad
42 changed files with 1030 additions and 1109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio/arts/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:20 skrll Exp $
# $NetBSD: Makefile,v 1.12 2003/03/11 13:33:44 markd Exp $
DISTNAME= arts-1.0.5a
DISTNAME= arts-1.1
CATEGORIES= audio
COMMENT= Analog Real-Time Synthesizer

34
audio/arts/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2003/01/20 10:03:40 skrll Exp $
@comment $NetBSD: PLIST,v 1.3 2003/03/11 13:33:44 markd Exp $
bin/artsc-config
bin/artscat
bin/artsd
@ -8,6 +8,7 @@ bin/artsrec
bin/artsshell
bin/artswrapper
bin/mcopidl
bin/testdhandle
include/arts/anyref.h
include/arts/artsflow.h
include/arts/artsflow.idl
@ -36,6 +37,29 @@ include/arts/extensionloader.h
include/arts/factory.h
include/arts/fft.h
include/arts/flowsystem.h
include/arts/gsl/gslartsthreads.h
include/arts/gsl/gslcommon.h
include/arts/gsl/gslconfig.h
include/arts/gsl/gslconvert.h
include/arts/gsl/gsldatacache.h
include/arts/gsl/gsldatahandle-mad.h
include/arts/gsl/gsldatahandle-vorbis.h
include/arts/gsl/gsldatahandle.h
include/arts/gsl/gsldatautils.h
include/arts/gsl/gsldefs.h
include/arts/gsl/gslengine.h
include/arts/gsl/gslfft.h
include/arts/gsl/gslfilter.h
include/arts/gsl/gslglib.h
include/arts/gsl/gslieee754.h
include/arts/gsl/gslloader.h
include/arts/gsl/gslmagic.h
include/arts/gsl/gslmath.h
include/arts/gsl/gsloscillator.h
include/arts/gsl/gslosctable.h
include/arts/gsl/gslsignal.h
include/arts/gsl/gslwavechunk.h
include/arts/gsl/gslwaveosc.h
include/arts/idlfilereg.h
include/arts/ifacerepo_impl.h
include/arts/iomanager.h
@ -90,6 +114,10 @@ lib/libartsflow_idl.la
lib/libartsflow_idl.so
lib/libartsflow_idl.so.1
lib/libartsflow_idl.so.1.0
lib/libartsgslplayobject.la
lib/libartsgslplayobject.so
lib/libartsgslplayobject.so.0
lib/libartsgslplayobject.so.0.0
lib/libartswavplayobject.la
lib/libartswavplayobject.so
lib/libartswavplayobject.so.0
@ -118,7 +146,9 @@ lib/libx11globalcomm.la
lib/libx11globalcomm.so
lib/libx11globalcomm.so.1
lib/libx11globalcomm.so.1.0
lib/mcop/Arts/DataHandlePlay.mcopclass
lib/mcop/Arts/FileInputStream.mcopclass
lib/mcop/Arts/GSLPlayObject.mcopclass
lib/mcop/Arts/Synth_ADD.mcopclass
lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
@ -132,6 +162,7 @@ lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
lib/mcop/Arts/Synth_RECORD.mcopclass
lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
lib/mcop/Arts/WavPlayObject.mcopclass
lib/mcop/Arts/WaveDataHandle.mcopclass
lib/mcop/Arts/X11GlobalComm.mcopclass
lib/mcop/artsflow.mcopclass
lib/mcop/artsflow.mcoptype
@ -144,4 +175,5 @@ lib/mcop/x11globalcomm.mcoptype
@dirrm lib/mcop/Arts
@dirrm lib/mcop
@dirrm include/artsc
@dirrm include/arts/gsl
@dirrm include/arts

4
audio/arts/buildlink2.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink2.mk,v 1.4 2002/10/07 05:09:58 jlam Exp $
# $NetBSD: buildlink2.mk,v 1.5 2003/03/11 13:33:45 markd Exp $
.if !defined(ARTS_BUILDLINK2_MK)
ARTS_BUILDLINK2_MK= # defined
@ -6,7 +6,7 @@ ARTS_BUILDLINK2_MK= # defined
.include "../../mk/bsd.prefs.mk"
BUILDLINK_PACKAGES+= arts
BUILDLINK_DEPENDS.arts?= arts>=1.0.0
BUILDLINK_DEPENDS.arts?= arts>=1.1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
EVAL_PREFIX+= BUILDLINK_PREFIX.arts=arts

14
audio/arts/distinfo
View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.7 2003/01/02 09:12:20 skrll Exp $
$NetBSD: distinfo,v 1.8 2003/03/11 13:33:45 markd Exp $
SHA1 (arts-1.0.5a.tar.bz2) = 93e884e4b657b7a61bae51d4ffd30b1050ae2943
Size (arts-1.0.5a.tar.bz2) = 1021229 bytes
SHA1 (patch-aa) = 23dd79c83f7e0905cef66e002387f44c18438fed
SHA1 (arts-1.1.tar.bz2) = e7c46c32cbee0b6575c940bdbd3d646032180815
Size (arts-1.1.tar.bz2) = 969894 bytes
SHA1 (patch-aa) = 55a91d3a0e3be942c741e77c2a6b8833208d691e
SHA1 (patch-ab) = 06265879020edf24ff51403565fd422c3b7a17e5
SHA1 (patch-ac) = 73cc8b5398d4191dfbf817d4b2e03917ab2ba6f6
SHA1 (patch-ad) = f030e7f34e4c32d0df6e1c0bcdb9e1bd82e687c5
SHA1 (patch-ae) = 4913eab125a37e2cb95d1574cad5c7eb84e80956
SHA1 (patch-ad) = e57d73093d3623a5fd73399427517235ce8d1204
SHA1 (patch-ae) = abca632bdf5ec1c0415d14ded25720f1cc94d051
SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
SHA1 (patch-ag) = eea4e04b778ae74d92ae9f5e60f9a51aa01431cf
SHA1 (patch-ag) = 3e16b105d1cfdcb4c219ec43346818aadbe3aa1b

12
audio/arts/patches/patch-aa
View file

@ -1,13 +1,13 @@
$NetBSD: patch-aa,v 1.2 2002/08/25 19:21:44 jlam Exp $
$NetBSD: patch-aa,v 1.3 2003/03/11 13:33:46 markd Exp $
--- Makefile.in.orig Wed May 8 19:59:26 2002
--- Makefile.in.orig Sat Jan 4 06:07:18 2003
+++ Makefile.in
@@ -271,7 +271,7 @@
@@ -297,7 +297,7 @@
x_libraries = @x_libraries@
AUTOMAKE_OPTIONS = foreign 1.4
AUTOMAKE_OPTIONS = foreign 1.5
-COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt soundserver artsc examples tests doc
+COMPILE_FIRST = libltdl mcop mcopidl flow soundserver artsc examples tests doc
SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS)
EXTRA_DIST = admin
subdir = .
#DIST_SUBDIRS = mcop mcop_mt mcopidl flow soundserver artsc examples tests doc

8
audio/arts/patches/patch-ad
View file

@ -1,13 +1,13 @@
$NetBSD: patch-ad,v 1.2 2002/08/25 19:21:45 jlam Exp $
$NetBSD: patch-ad,v 1.3 2003/03/11 13:33:46 markd Exp $
--- soundserver/Makefile.am.orig Wed May 8 19:57:54 2002
--- soundserver/Makefile.am.orig Sun Sep 22 23:28:12 2002
+++ soundserver/Makefile.am
@@ -45,7 +45,7 @@
@@ -52,7 +52,7 @@
bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec
artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS)
+ $(top_builddir)/mcop/libmcop.la $(USE_THREADS)
artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc
artsd_COMPILE_FIRST = soundserver.h artsversion.h
artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS)

14
audio/arts/patches/patch-ae
View file

@ -1,17 +1,17 @@
$NetBSD: patch-ae,v 1.2 2002/08/25 19:21:45 jlam Exp $
$NetBSD: patch-ae,v 1.3 2003/03/11 13:33:46 markd Exp $
--- soundserver/Makefile.in.orig Wed May 8 19:59:27 2002
--- soundserver/Makefile.in.orig Sat Jan 4 06:07:18 2003
+++ soundserver/Makefile.in
@@ -303,7 +303,7 @@
@@ -337,7 +337,7 @@
bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec
artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS)
+ $(top_builddir)/mcop/libmcop.la $(USE_THREADS)
- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS)
+ $(top_builddir)/mcop/libmcop.la $(USE_THREADS)
artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc
@@ -395,7 +395,7 @@
artsd_COMPILE_FIRST = soundserver.h artsversion.h
@@ -443,7 +443,7 @@
@KDE_USE_FINAL_TRUE@artsd_OBJECTS = $(artsd_final_OBJECTS)
artsd_DEPENDENCIES = libsoundserver_idl.la \
$(top_builddir)/flow/libartsflow.la \

19
audio/arts/patches/patch-ag
View file

@ -1,13 +1,22 @@
$NetBSD: patch-ag,v 1.1 2002/10/03 10:22:35 jlam Exp $
$NetBSD: patch-ag,v 1.2 2003/03/11 13:33:46 markd Exp $
--- configure.orig Thu Oct 3 02:11:16 2002
--- configure.orig Sat Jan 4 06:07:20 2003
+++ configure
@@ -23952,7 +23952,7 @@ fi
echo "$as_me:23952: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
@@ -30085,7 +30085,7 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
- LIBOSSAUDIO="-lossaudio"
+ LIBOSSAUDIO="${LIBOSSAUDIO}"
fi
MCOPIDL='$(top_builddir)/mcopidl/mcopidl'
@@ -31509,7 +31509,7 @@
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
+DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin mcop_mt"
if test ! -s $srcdir/subdirs; then
TOPSUBDIRS=""

4
audio/kdemultimedia3/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.13 2003/02/26 09:57:27 dmcmahill Exp $
# $NetBSD: Makefile,v 1.14 2003/03/11 13:33:46 markd Exp $
DISTNAME= kdemultimedia-3.0.5a
DISTNAME= kdemultimedia-3.1
CATEGORIES= audio
COMMENT= Audio tools for the KDE integrated X11 desktop

433
audio/kdemultimedia3/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2003/01/20 10:03:41 skrll Exp $
@comment $NetBSD: PLIST,v 1.4 2003/03/11 13:33:47 markd Exp $
bin/aktion
bin/artsbuilder
bin/artscontrol
@ -7,6 +7,7 @@ bin/kmid
bin/kmidi
bin/kmix
bin/kmixctrl
bin/krec
bin/kscd
bin/midisend
bin/mpeglibartsplay
@ -90,6 +91,9 @@ include/mpeglib/util/abstract/abs_thread.h
include/mpeglib/util/abstract/threadQueue.h
include/mpeglib/util/dynBuffer.h
include/mpeglib/util/file/fileAccess.h
include/mpeglib/util/mmx/mm_accel.h
include/mpeglib/util/mmx/mmx.h
include/mpeglib/util/mmx/mmx_asm.h
include/mpeglib/util/render/pictureArray.h
include/mpeglib/util/render/yuvPicture.h
include/mpeglib/util/syncClock.h
@ -128,12 +132,17 @@ include/noatun/scrollinglabel.h
include/noatun/stdaction.h
include/noatun/stereobuttonaction.h
include/noatun/tags.h
include/noatun/video.h
include/noatun/winskinvis.h
include/plugin_deps.h
lib/kaboodle.la
lib/kaboodle.so
lib/kde3/kcm_kmix.la
lib/kde3/kcm_kmix.so
lib/kde3/kfile_au.la
lib/kde3/kfile_au.so
lib/kde3/kfile_avi.la
lib/kde3/kfile_avi.so
lib/kde3/kfile_m3u.la
lib/kde3/kfile_m3u.so
lib/kde3/kfile_mp3.la
@ -142,8 +151,10 @@ lib/kde3/kfile_wav.la
lib/kde3/kfile_wav.so
lib/kde3/kmix_panelapplet.la
lib/kde3/kmix_panelapplet.so
lib/kde3/kmix_panelapplet.so.1
lib/kde3/kmix_panelapplet.so.1.0
lib/kde3/libkaboodlepart.la
lib/kde3/libkaboodlepart.so
lib/kde3/libkmidpart.la
lib/kde3/libkmidpart.so
lib/kde3/noatun.la
lib/kde3/noatun.so
lib/kde3/noatun_dcopiface.la
@ -178,10 +189,14 @@ lib/kde3/noatun_voiceprint.la
lib/kde3/noatun_voiceprint.so
lib/kde3/noatun_winskin.la
lib/kde3/noatun_winskin.so
lib/kde3/noatunsimple.la
lib/kde3/noatunsimple.so
lib/kmix.la
lib/kmix.so
lib/kmixctrl.la
lib/kmixctrl.so
lib/krec.la
lib/krec.so
lib/libaktion.la
lib/libaktion.so
lib/libaktion.so.1
@ -227,20 +242,10 @@ lib/libartsmodules.so.0
lib/libartsmodules.so.0.0
lib/libaudiofilearts.la
lib/libaudiofilearts.so
lib/libdummy.la
lib/libdummy.so
lib/libdummy.so.0
lib/libdummy.so.0.0
lib/libkaboodle_main.la
lib/libkaboodle_main.so
lib/libkaboodle_main.so.0
lib/libkaboodle_main.so.0.0
lib/libkaboodlepart.la
lib/libkaboodlepart.so
lib/libkmidpart.la
lib/libkmidpart.so
lib/libkmidpart.so.1
lib/libkmidpart.so.1.0
lib/libkmix_main.la
lib/libkmix_main.so
lib/libkmix_main.so.0
@ -306,6 +311,7 @@ lib/mcop/Arts/Poti.mcopclass
lib/mcop/Arts/SimpleMixerChannel.mcopclass
lib/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
lib/mcop/Arts/SpinBox.mcopclass
lib/mcop/Arts/StereoCompressorGuiFactory.mcopclass
lib/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
lib/mcop/Arts/StructureBuilder.mcopclass
lib/mcop/Arts/StructureDesc.mcopclass
@ -327,15 +333,19 @@ lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
lib/mcop/Arts/Synth_MOOG_VCF.mcopclass
lib/mcop/Arts/Synth_NIL.mcopclass
lib/mcop/Arts/Synth_NOISE.mcopclass
lib/mcop/Arts/Synth_OSC.mcopclass
lib/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
lib/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
lib/mcop/Arts/Synth_PLAY_PAT.mcopclass
lib/mcop/Arts/Synth_PSCALE.mcopclass
lib/mcop/Arts/Synth_RC.mcopclass
lib/mcop/Arts/Synth_SEQUENCE.mcopclass
lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
lib/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
lib/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
lib/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
lib/mcop/Arts/Synth_TREMOLO.mcopclass
lib/mcop/Arts/Synth_WAVE_PULSE.mcopclass
lib/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
@ -349,7 +359,6 @@ lib/mcop/CDDAPlayObject.mcopclass
lib/mcop/ExtraStereo.mcopclass
lib/mcop/ExtraStereoGuiFactory.mcopclass
lib/mcop/MP3PlayObject.mcopclass
lib/mcop/MPGPlayObject.mcopclass
lib/mcop/NULLPlayObject.mcopclass
lib/mcop/Noatun/Equalizer.mcopclass
lib/mcop/Noatun/EqualizerSSE.mcopclass
@ -366,7 +375,6 @@ lib/mcop/Noatun/WinSkinFFT.mcopclass
lib/mcop/OGGPlayObject.mcopclass
lib/mcop/RawWriter.mcopclass
lib/mcop/SplayPlayObject.mcopclass
lib/mcop/VCDPlayObject.mcopclass
lib/mcop/VoiceRemoval.mcopclass
lib/mcop/WAVPlayObject.mcopclass
lib/mcop/artsbuilder.mcopclass
@ -455,6 +463,12 @@ share/doc/kde/HTML/en/artsbuilder/modules.docbook
share/doc/kde/HTML/en/artsbuilder/porting.docbook
share/doc/kde/HTML/en/artsbuilder/references.docbook
share/doc/kde/HTML/en/artsbuilder/tools.docbook
share/doc/kde/HTML/en/kaboodle/common
share/doc/kde/HTML/en/kaboodle/index.cache.bz2
share/doc/kde/HTML/en/kaboodle/index.docbook
share/doc/kde/HTML/en/kcontrol/kmixcfg/common
share/doc/kde/HTML/en/kcontrol/kmixcfg/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/kmixcfg/index.docbook
share/doc/kde/HTML/en/kmid/common
share/doc/kde/HTML/en/kmid/index.cache.bz2
share/doc/kde/HTML/en/kmid/index.docbook
@ -465,6 +479,10 @@ share/doc/kde/HTML/en/kmidi/index.docbook
share/doc/kde/HTML/en/kmix/common
share/doc/kde/HTML/en/kmix/index.cache.bz2
share/doc/kde/HTML/en/kmix/index.docbook
share/doc/kde/HTML/en/krec/common
share/doc/kde/HTML/en/krec/index.cache.bz2
share/doc/kde/HTML/en/krec/index.docbook
share/doc/kde/HTML/en/krec/krec-hicolor.png
share/doc/kde/HTML/en/kscd/common
share/doc/kde/HTML/en/kscd/index.cache.bz2
share/doc/kde/HTML/en/kscd/index.docbook
@ -489,6 +507,14 @@ share/doc/kde/HTML/en/kscd/kscd9.png
share/doc/kde/HTML/en/noatun/common
share/doc/kde/HTML/en/noatun/index.cache.bz2
share/doc/kde/HTML/en/noatun/index.docbook
share/kde/applnk/.hidden/kmixcfg.desktop
share/kde/applnk/Multimedia/More/aktion.desktop
share/kde/applnk/Multimedia/More/artsbuilder.desktop
share/kde/applnk/Multimedia/More/artscontrol.desktop
share/kde/applnk/Multimedia/More/kaboodle.desktop
share/kde/applnk/Multimedia/More/kmid.desktop
share/kde/applnk/Multimedia/More/kmidi.desktop
share/kde/applnk/Multimedia/More/timidity.desktop
share/kde/applnk/Multimedia/aktion.desktop
share/kde/applnk/Multimedia/artsbuilder.desktop
share/kde/applnk/Multimedia/artscontrol.desktop
@ -496,10 +522,10 @@ share/kde/applnk/Multimedia/kaboodle.desktop
share/kde/applnk/Multimedia/kmid.desktop
share/kde/applnk/Multimedia/kmidi.desktop
share/kde/applnk/Multimedia/kmix.desktop
share/kde/applnk/Multimedia/krec.desktop
share/kde/applnk/Multimedia/kscd.desktop
share/kde/applnk/Multimedia/noatun.desktop
share/kde/applnk/Multimedia/timidity.desktop
share/kde/applnk/Settings/Sound/kmixcfg.desktop
share/kde/apps/aktion/aktion_part.rc
share/kde/apps/aktion/toolbar/ak_maximize.png
share/kde/apps/aktion/toolbar/ak_setup.png
@ -603,8 +629,8 @@ share/kde/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
share/kde/apps/artsbuilder/pics/Synth_XFADE.xpm
share/kde/apps/artscontrol/artscontrol.rc
share/kde/apps/artscontrol/artsmidimanagerview.rc
share/kde/apps/kaboodle/icons/hicolor/16x16/actions/kaboodleloop.png
share/kde/apps/kaboodle/icons/hicolor/22x22/actions/kaboodleloop.png
share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
share/kde/apps/kaboodle/kaboodlepartui.rc
share/kde/apps/kaboodle/kaboodleui.rc
share/kde/apps/kconf_update/noatun.upd
@ -620,12 +646,12 @@ share/kde/apps/kmid/fm/std.o3
share/kde/apps/kmid/fm/std.sb
share/kde/apps/kmid/icons/button1.xpm
share/kde/apps/kmid/icons/button2.xpm
share/kde/apps/kmid/icons/hicolor/16x16/actions/piano.png
share/kde/apps/kmid/icons/hicolor/16x16/actions/volume.png
share/kde/apps/kmid/icons/hicolor/22x22/actions/piano.png
share/kde/apps/kmid/icons/hicolor/22x22/actions/volume.png
share/kde/apps/kmid/icons/hicolor/32x32/actions/piano.png
share/kde/apps/kmid/icons/hicolor/32x32/actions/volume.png
share/kde/apps/kmid/icons/crystalsvg/16x16/actions/piano.png
share/kde/apps/kmid/icons/crystalsvg/16x16/actions/volume.png
share/kde/apps/kmid/icons/crystalsvg/22x22/actions/piano.png
share/kde/apps/kmid/icons/crystalsvg/22x22/actions/volume.png
share/kde/apps/kmid/icons/crystalsvg/32x32/actions/piano.png
share/kde/apps/kmid/icons/crystalsvg/32x32/actions/volume.png
share/kde/apps/kmid/icons/keyboard.xpm
share/kde/apps/kmid/kmid_partui.rc
share/kde/apps/kmid/kmidui.rc
@ -687,10 +713,14 @@ share/kde/apps/kmidi/config/wowpats.cfg
share/kde/apps/kmidi/pics/kmidilogo.png
share/kde/apps/kmix/kmixui.rc
share/kde/apps/kmix/pics/kmixdocked.png
share/kde/apps/kmix/pics/kmixdocked_mute.png
share/kde/apps/kmix/pics/mix_ac97.png
share/kde/apps/kmix/pics/mix_audio.png
share/kde/apps/kmix/pics/mix_bass.png
share/kde/apps/kmix/pics/mix_cd.png
share/kde/apps/kmix/pics/mix_digital.png
share/kde/apps/kmix/pics/mix_ext.png
share/kde/apps/kmix/pics/mix_headphone.png
share/kde/apps/kmix/pics/mix_microphone.png
share/kde/apps/kmix/pics/mix_midi.png
share/kde/apps/kmix/pics/mix_recmon.png
@ -699,6 +729,14 @@ share/kde/apps/kmix/pics/mix_treble.png
share/kde/apps/kmix/pics/mix_unknown.png
share/kde/apps/kmix/pics/mix_video.png
share/kde/apps/kmix/pics/mix_volume.png
share/kde/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
share/kde/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
share/kde/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png
share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileempty.png
share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileplay.png
share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_filerec.png
share/kde/apps/krec/krecui.rc
share/kde/apps/krec/tips
share/kde/apps/kscd/pics/cdsmall.xpm
share/kde/apps/kscd/pics/kscdlogo.xpm
share/kde/apps/noatun/dcopiface.plugin
@ -710,114 +748,44 @@ share/kde/apps/noatun/eq.preset/preset.zero
share/kde/apps/noatun/excellent.plugin
share/kde/apps/noatun/excellentui.rc
share/kde/apps/noatun/htmlexport.plugin
share/kde/apps/noatun/icons/hicolor/16x16/actions/effect.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunback.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunforward.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunpause.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunplay.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunplaylist.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatunstop.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntray.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntraypause.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntrayplay.png
share/kde/apps/noatun/icons/hicolor/16x16/actions/noatuntraystop.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunback.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunfback.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunfforward.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunforward.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopnone.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopplaylist.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunlooprandom.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunloopsong.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunpause.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunplay.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunplaylist.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatunstop.png
share/kde/apps/noatun/icons/hicolor/22x22/actions/noatuntiny.png
share/kde/apps/noatun/icons/hicolor/32x32/actions/effect.png
share/kde/apps/noatun/icons/hicolor/48x48/actions/effect.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/effect.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunback.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunforward.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunpause.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunplay.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunplaylist.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatunstop.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatuntray.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatuntraypause.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatuntrayplay.png
share/kde/apps/noatun/icons/crystalsvg/16x16/actions/noatuntraystop.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunback.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunfback.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunfforward.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunforward.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopnone.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopplaylist.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunlooprandom.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopsong.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunpause.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunplay.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunplaylist.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatunstop.png
share/kde/apps/noatun/icons/crystalsvg/22x22/actions/noatuntiny.png
share/kde/apps/noatun/icons/crystalsvg/32x32/actions/effect.png
share/kde/apps/noatun/icons/crystalsvg/48x48/actions/effect.png
share/kde/apps/noatun/infrared.plugin
share/kde/apps/noatun/kaiman.plugin
share/kde/apps/noatun/kaimanui.rc
share/kde/apps/noatun/keyz.plugin
share/kde/apps/noatun/kjofolui.plugin
share/kde/apps/noatun/kjskins/HexoBronx/HexoBronx.rc
share/kde/apps/noatun/kjskins/HexoBronx/Makefile.am
share/kde/apps/noatun/kjskins/HexoBronx/README.txt
share/kde/apps/noatun/kjskins/HexoBronx/active.png
share/kde/apps/noatun/kjskins/HexoBronx/eckig_font.png
share/kde/apps/noatun/kjskins/HexoBronx/font.png
share/kde/apps/noatun/kjskins/HexoBronx/inactive.png
share/kde/apps/noatun/kjskins/HexoBronx/mask.png
share/kde/apps/noatun/kjskins/HexoBronx/pitch.png
share/kde/apps/noatun/kjskins/HexoBronx/splash.png
share/kde/apps/noatun/kjskins/HexoBronx/time_font.png
share/kde/apps/noatun/kjskins/HexoBronx/volume.png
share/kde/apps/noatun/kjskins/HexoBronx/volume_pitch_font.png
share/kde/apps/noatun/kjskins/kjofol/Makefile.am
share/kde/apps/noatun/kjskins/kjofol/kjofol.dck
share/kde/apps/noatun/kjskins/kjofol/kjofol.pl
share/kde/apps/noatun/kjskins/kjofol/kjofol.rc
share/kde/apps/noatun/kjskins/kjofol/kjofol.wsh
share/kde/apps/noatun/kjskins/kjofol/sg.png
share/kde/apps/noatun/kjskins/kjofol/sg_num.png
share/kde/apps/noatun/kjskins/kjofol/sg_seek.bmp
share/kde/apps/noatun/kjskins/kjofol/sg_seek.png
share/kde/apps/noatun/kjskins/kjofol/sg_text.png
share/kde/apps/noatun/kjskins/kjofol/sgdock.png
share/kde/apps/noatun/kjskins/kjofol/sgdock2.png
share/kde/apps/noatun/kjskins/kjofol/sgdocksk.png
share/kde/apps/noatun/kjskins/kjofol/sgdockvp.png
share/kde/apps/noatun/kjskins/kjofol/sgeq.png
share/kde/apps/noatun/kjskins/kjofol/sgpitch.png
share/kde/apps/noatun/kjskins/kjofol/sgpitchp.png
share/kde/apps/noatun/kjskins/kjofol/sgplist.png
share/kde/apps/noatun/kjskins/kjofol/sgplist2.png
share/kde/apps/noatun/kjskins/kjofol/sgpres1.png
share/kde/apps/noatun/kjskins/kjofol/sgpres2.png
share/kde/apps/noatun/kjskins/kjofol/sgpres3.png
share/kde/apps/noatun/kjskins/kjofol/sgvol.png
share/kde/apps/noatun/kjskins/kjofol/sgvolnum.png
share/kde/apps/noatun/kjskins/kjofol/sgvolpos.png
share/kde/apps/noatun/kjskins/kjofol/sgwshad.png
share/kde/apps/noatun/kjskins/kjofol/sgwshad2.png
share/kde/apps/noatun/kjskins/kjofol/sgwshdsk.png
share/kde/apps/noatun/kjskins/kjofol/sgwshvol.png
share/kde/apps/noatun/kjskins/kjofol/sgwshvp.png
share/kde/apps/noatun/kjskins/phong/p_eq.png
share/kde/apps/noatun/kjskins/phong/p_main.png
share/kde/apps/noatun/kjskins/phong/p_mainback.png
share/kde/apps/noatun/kjskins/phong/p_numbers.png
share/kde/apps/noatun/kjskins/phong/p_playback.png
share/kde/apps/noatun/kjskins/phong/p_playlist.png
share/kde/apps/noatun/kjskins/phong/p_propos.png
share/kde/apps/noatun/kjskins/phong/p_text.png
share/kde/apps/noatun/kjskins/phong/p_volbar.png
share/kde/apps/noatun/kjskins/phong/p_volpos.png
share/kde/apps/noatun/kjskins/phong/phong.dck
share/kde/apps/noatun/kjskins/phong/phong.rc
share/kde/apps/noatun/kjskins/phong/phong.wsh
share/kde/apps/noatun/kjskins/phong/phong_readme.txt
share/kde/apps/noatun/kjskins/vibrocentric/i_base.png
share/kde/apps/noatun/kjskins/vibrocentric/i_base2.png
share/kde/apps/noatun/kjskins/vibrocentric/i_eq.png
share/kde/apps/noatun/kjskins/vibrocentric/i_font.png
share/kde/apps/noatun/kjskins/vibrocentric/i_pl.png
share/kde/apps/noatun/kjskins/vibrocentric/i_pl2.png
share/kde/apps/noatun/kjskins/vibrocentric/i_pro.png
share/kde/apps/noatun/kjskins/vibrocentric/i_text.png
share/kde/apps/noatun/kjskins/vibrocentric/i_vol.png
share/kde/apps/noatun/kjskins/vibrocentric/i_volpos.png
share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.dck
share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.rc
share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric.wsh
share/kde/apps/noatun/kjskins/vibrocentric/vibrocentric_readme.txt
share/kde/apps/noatun/magictable
share/kde/apps/noatun/marquis.plugin
share/kde/apps/noatun/metatag.plugin
share/kde/apps/noatun/monoscope.plugin
share/kde/apps/noatun/net.plugin
share/kde/apps/noatun/noatunui.plugin
share/kde/apps/noatun/simple.plugin
share/kde/apps/noatun/skins/kaiman/car-preset/btn_exit.png
share/kde/apps/noatun/skins/kaiman/car-preset/btn_iconify.png
share/kde/apps/noatun/skins/kaiman/car-preset/btn_list.png
@ -913,6 +881,75 @@ share/kde/apps/noatun/skins/kaiman/k9/status.png
share/kde/apps/noatun/skins/kaiman/k9/stop.jpg
share/kde/apps/noatun/skins/kaiman/k9/trans-pos.png
share/kde/apps/noatun/skins/kaiman/k9/trans-slide.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/HexoBronx.rc
share/kde/apps/noatun/skins/kjofol/HexoBronx/README.txt
share/kde/apps/noatun/skins/kjofol/HexoBronx/active.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/eckig_font.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/font.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/inactive.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/mask.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/pitch.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/splash.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/time_font.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/volume.png
share/kde/apps/noatun/skins/kjofol/HexoBronx/volume_pitch_font.png
share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.dck
share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.pl
share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.rc
share/kde/apps/noatun/skins/kjofol/kjofol/kjofol.wsh
share/kde/apps/noatun/skins/kjofol/kjofol/sg.png
share/kde/apps/noatun/skins/kjofol/kjofol/sg_num.png
share/kde/apps/noatun/skins/kjofol/kjofol/sg_seek.bmp
share/kde/apps/noatun/skins/kjofol/kjofol/sg_seek.png
share/kde/apps/noatun/skins/kjofol/kjofol/sg_text.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgdock.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgdock2.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgdocksk.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgdockvp.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgeq.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgpitch.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgpitchp.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgplist.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgplist2.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgpres1.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgpres2.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgpres3.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgvol.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgvolnum.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgvolpos.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgwshad.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgwshad2.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgwshdsk.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgwshvol.png
share/kde/apps/noatun/skins/kjofol/kjofol/sgwshvp.png
share/kde/apps/noatun/skins/kjofol/phong/p_eq.png
share/kde/apps/noatun/skins/kjofol/phong/p_main.png
share/kde/apps/noatun/skins/kjofol/phong/p_mainback.png
share/kde/apps/noatun/skins/kjofol/phong/p_numbers.png
share/kde/apps/noatun/skins/kjofol/phong/p_playback.png
share/kde/apps/noatun/skins/kjofol/phong/p_playlist.png
share/kde/apps/noatun/skins/kjofol/phong/p_propos.png
share/kde/apps/noatun/skins/kjofol/phong/p_text.png
share/kde/apps/noatun/skins/kjofol/phong/p_volbar.png
share/kde/apps/noatun/skins/kjofol/phong/p_volpos.png
share/kde/apps/noatun/skins/kjofol/phong/phong.dck
share/kde/apps/noatun/skins/kjofol/phong/phong.rc
share/kde/apps/noatun/skins/kjofol/phong/phong.wsh
share/kde/apps/noatun/skins/kjofol/phong/phong_readme.txt
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_base.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_base2.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_eq.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_font.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_pl.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_pl2.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_pro.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_text.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_vol.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/i_volpos.png
share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.dck
share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.rc
share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.wsh
share/kde/apps/noatun/skins/kjofol/vibrocentric/vibrocentric_readme.txt
share/kde/apps/noatun/skins/winamp/Winamp/BALANCE.BMP
share/kde/apps/noatun/skins/winamp/Winamp/CBUTTONS.BMP
share/kde/apps/noatun/skins/winamp/Winamp/FONT.BMP
@ -928,42 +965,54 @@ share/kde/apps/noatun/skins/winamp/Winamp/TITLEBAR.BMP
share/kde/apps/noatun/skins/winamp/Winamp/VISCOLOR.TXT
share/kde/apps/noatun/skins/winamp/Winamp/VOLUME.BMP
share/kde/apps/noatun/splitplaylist.plugin
share/kde/apps/noatun/splui.rc
share/kde/apps/noatun/systray.plugin
share/kde/apps/noatun/systrayui.rc
share/kde/apps/noatun/voiceprint.plugin
share/kde/apps/noatun/winskin.plugin
share/kde/config/aktionrc
share/kde/icons/hicolor/16x16/actions/artsbuilderexecute.png
share/kde/icons/hicolor/16x16/apps/aktion.png
share/kde/icons/hicolor/16x16/apps/artsbuilder.png
share/kde/icons/hicolor/16x16/apps/artscontrol.png
share/kde/icons/hicolor/16x16/apps/kaboodle.png
share/kde/icons/hicolor/16x16/apps/kmid.png
share/kde/icons/hicolor/16x16/apps/kmidi.png
share/kde/icons/hicolor/16x16/apps/kmix.png
share/kde/icons/hicolor/16x16/apps/kscd.png
share/kde/icons/hicolor/16x16/apps/noatun.png
share/kde/icons/hicolor/22x22/actions/artsbuilderexecute.png
share/kde/icons/hicolor/22x22/apps/kaboodle.png
share/kde/icons/hicolor/22x22/apps/noatun.png
share/kde/icons/hicolor/32x32/apps/aktion.png
share/kde/icons/hicolor/32x32/apps/kaboodle.png
share/kde/icons/hicolor/32x32/apps/kmid.png
share/kde/icons/hicolor/32x32/apps/kmidi.png
share/kde/icons/hicolor/32x32/apps/kmix.png
share/kde/icons/hicolor/32x32/apps/kscd.png
share/kde/icons/hicolor/32x32/apps/noatun.png
share/kde/icons/hicolor/48x48/apps/kaboodle.png
share/kde/icons/hicolor/48x48/apps/kmid.png
share/kde/icons/hicolor/48x48/apps/kmidi.png
share/kde/icons/hicolor/48x48/apps/kmix.png
share/kde/icons/hicolor/48x48/apps/kscd.png
share/kde/icons/hicolor/48x48/apps/noatun.png
share/kde/icons/locolor/32x32/apps/kaboodle.png
share/kde/icons/crystalsvg/128x128/apps/kaboodle.png
share/kde/icons/crystalsvg/128x128/apps/kmix.png
share/kde/icons/crystalsvg/128x128/apps/kscd.png
share/kde/icons/crystalsvg/128x128/apps/noatun.png
share/kde/icons/crystalsvg/16x16/actions/artsbuilderexecute.png
share/kde/icons/crystalsvg/16x16/apps/aktion.png
share/kde/icons/crystalsvg/16x16/apps/artsbuilder.png
share/kde/icons/crystalsvg/16x16/apps/artscontrol.png
share/kde/icons/crystalsvg/16x16/apps/kaboodle.png
share/kde/icons/crystalsvg/16x16/apps/kmid.png
share/kde/icons/crystalsvg/16x16/apps/kmidi.png
share/kde/icons/crystalsvg/16x16/apps/kmix.png
share/kde/icons/crystalsvg/16x16/apps/kscd.png
share/kde/icons/crystalsvg/16x16/apps/noatun.png
share/kde/icons/crystalsvg/22x22/actions/artsbuilderexecute.png
share/kde/icons/crystalsvg/22x22/apps/kaboodle.png
share/kde/icons/crystalsvg/22x22/apps/noatun.png
share/kde/icons/crystalsvg/32x32/apps/aktion.png
share/kde/icons/crystalsvg/32x32/apps/kaboodle.png
share/kde/icons/crystalsvg/32x32/apps/kmid.png
share/kde/icons/crystalsvg/32x32/apps/kmidi.png
share/kde/icons/crystalsvg/32x32/apps/kmix.png
share/kde/icons/crystalsvg/32x32/apps/kscd.png
share/kde/icons/crystalsvg/32x32/apps/noatun.png
share/kde/icons/crystalsvg/48x48/apps/kaboodle.png
share/kde/icons/crystalsvg/48x48/apps/kmid.png
share/kde/icons/crystalsvg/48x48/apps/kmidi.png
share/kde/icons/crystalsvg/48x48/apps/kmix.png
share/kde/icons/crystalsvg/48x48/apps/krec.png
share/kde/icons/crystalsvg/48x48/apps/kscd.png
share/kde/icons/crystalsvg/48x48/apps/noatun.png
share/kde/icons/crystalsvg/64x64/apps/kaboodle.png
share/kde/icons/crystalsvg/64x64/apps/kmix.png
share/kde/icons/crystalsvg/64x64/apps/kscd.png
share/kde/icons/crystalsvg/64x64/apps/noatun.png
share/kde/mimelnk/application/x-artsbuilder.desktop
share/kde/mimelnk/audio/x-karaoke.desktop
share/kde/mimelnk/interface/x-winamp-skin.desktop
share/kde/mimelnk/text/xmcd.desktop
share/kde/services/kaboodle_component.desktop
share/kde/services/kfile_au.desktop
share/kde/services/kfile_avi.desktop
share/kde/services/kfile_m3u.desktop
share/kde/services/kfile_mp3.desktop
share/kde/services/kfile_wav.desktop
@ -972,37 +1021,40 @@ share/kde/servicetypes/audiomidi.desktop
@comment dirrm share/kde/servicetypes
@comment dirrm share/kde/services
@comment dirrm share/kde/mimelnk/text
@comment dirrm share/kde/mimelnk/interface
@comment dirrm share/kde/mimelnk/audio
@comment dirrm share/kde/mimelnk/application
@comment dirrm share/kde/icons/locolor/32x32/apps
@comment dirrm share/kde/icons/hicolor/48x48/apps
@comment dirrm share/kde/icons/hicolor/32x32/apps
@comment dirrm share/kde/icons/hicolor/22x22/apps
@comment dirrm share/kde/icons/hicolor/22x22/actions
@comment dirrm share/kde/icons/hicolor/16x16/apps
@comment dirrm share/kde/icons/hicolor/16x16/actions
@comment dirrm share/kde/mimelnk
@comment dirrm share/kde/icons/crystalsvg/64x64/apps
@comment dirrm share/kde/icons/crystalsvg/48x48/apps
@comment dirrm share/kde/icons/crystalsvg/32x32/apps
@comment dirrm share/kde/icons/crystalsvg/22x22/apps
@comment dirrm share/kde/icons/crystalsvg/22x22/actions
@comment dirrm share/kde/icons/crystalsvg/16x16/apps
@comment dirrm share/kde/icons/crystalsvg/16x16/actions
@comment dirrm share/kde/icons/crystalsvg/128x128/apps
@comment dirrm share/kde/config
@dirrm share/kde/apps/noatun/skins/winamp/Winamp
@dirrm share/kde/apps/noatun/skins/winamp
@dirrm share/kde/apps/noatun/skins/kjofol/vibrocentric
@dirrm share/kde/apps/noatun/skins/kjofol/phong
@dirrm share/kde/apps/noatun/skins/kjofol/kjofol
@dirrm share/kde/apps/noatun/skins/kjofol/HexoBronx
@dirrm share/kde/apps/noatun/skins/kjofol
@dirrm share/kde/apps/noatun/skins/kaiman/k9
@dirrm share/kde/apps/noatun/skins/kaiman/circle
@dirrm share/kde/apps/noatun/skins/kaiman/car-preset
@dirrm share/kde/apps/noatun/skins/kaiman
@dirrm share/kde/apps/noatun/skins
@dirrm share/kde/apps/noatun/kjskins/vibrocentric
@dirrm share/kde/apps/noatun/kjskins/phong
@dirrm share/kde/apps/noatun/kjskins/kjofol
@dirrm share/kde/apps/noatun/kjskins/HexoBronx
@dirrm share/kde/apps/noatun/kjskins
@dirrm share/kde/apps/noatun/icons/hicolor/48x48/actions
@dirrm share/kde/apps/noatun/icons/hicolor/48x48
@dirrm share/kde/apps/noatun/icons/hicolor/32x32/actions
@dirrm share/kde/apps/noatun/icons/hicolor/32x32
@dirrm share/kde/apps/noatun/icons/hicolor/22x22/actions
@dirrm share/kde/apps/noatun/icons/hicolor/22x22
@dirrm share/kde/apps/noatun/icons/hicolor/16x16/actions
@dirrm share/kde/apps/noatun/icons/hicolor/16x16
@dirrm share/kde/apps/noatun/icons/hicolor
@dirrm share/kde/apps/noatun/icons/crystalsvg/48x48/actions
@dirrm share/kde/apps/noatun/icons/crystalsvg/48x48
@dirrm share/kde/apps/noatun/icons/crystalsvg/32x32/actions
@dirrm share/kde/apps/noatun/icons/crystalsvg/32x32
@dirrm share/kde/apps/noatun/icons/crystalsvg/22x22/actions
@dirrm share/kde/apps/noatun/icons/crystalsvg/22x22
@dirrm share/kde/apps/noatun/icons/crystalsvg/16x16/actions
@dirrm share/kde/apps/noatun/icons/crystalsvg/16x16
@dirrm share/kde/apps/noatun/icons/crystalsvg
@dirrm share/kde/apps/noatun/icons
@dirrm share/kde/apps/noatun/eq.preset
@dirrm share/kde/apps/noatun
@ -1029,8 +1081,17 @@ share/kde/servicetypes/audiomidi.desktop
@dirrm share/kde/apps/kscd/cddb/classical
@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/blues
@dirrm share/kde/apps/kscd/cddb/blues
@dirrm share/kde/apps/kscd/cddb
@dirrm share/kde/apps/kscd
@dirrm share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes
@dirrm share/kde/apps/krec/icons/crystalsvg/32x32/actions
@dirrm share/kde/apps/krec/icons/crystalsvg/32x32
@dirrm share/kde/apps/krec/icons/crystalsvg/22x22/actions
@dirrm share/kde/apps/krec/icons/crystalsvg/22x22
@dirrm share/kde/apps/krec/icons/crystalsvg/16x16/actions
@dirrm share/kde/apps/krec/icons/crystalsvg/16x16
@dirrm share/kde/apps/krec/icons/crystalsvg
@dirrm share/kde/apps/krec/icons
@dirrm share/kde/apps/krec
@dirrm share/kde/apps/kmix/pics
@dirrm share/kde/apps/kmix
@dirrm share/kde/apps/kmidi/pics
@ -1039,23 +1100,23 @@ share/kde/servicetypes/audiomidi.desktop
@dirrm share/kde/apps/kmidi/config
@dirrm share/kde/apps/kmidi
@dirrm share/kde/apps/kmid/maps
@dirrm share/kde/apps/kmid/icons/hicolor/32x32/actions
@dirrm share/kde/apps/kmid/icons/hicolor/32x32
@dirrm share/kde/apps/kmid/icons/hicolor/22x22/actions
@dirrm share/kde/apps/kmid/icons/hicolor/22x22
@dirrm share/kde/apps/kmid/icons/hicolor/16x16/actions
@dirrm share/kde/apps/kmid/icons/hicolor/16x16
@dirrm share/kde/apps/kmid/icons/hicolor
@dirrm share/kde/apps/kmid/icons/crystalsvg/32x32/actions
@dirrm share/kde/apps/kmid/icons/crystalsvg/32x32
@dirrm share/kde/apps/kmid/icons/crystalsvg/22x22/actions
@dirrm share/kde/apps/kmid/icons/crystalsvg/22x22
@dirrm share/kde/apps/kmid/icons/crystalsvg/16x16/actions
@dirrm share/kde/apps/kmid/icons/crystalsvg/16x16
@dirrm share/kde/apps/kmid/icons/crystalsvg
@dirrm share/kde/apps/kmid/icons
@dirrm share/kde/apps/kmid/fm
@dirrm share/kde/apps/kmid
@comment dirrm share/kde/apps/kicker/applets
@comment dirrm share/kde/apps/kconf_update
@dirrm share/kde/apps/kaboodle/icons/hicolor/22x22/actions
@dirrm share/kde/apps/kaboodle/icons/hicolor/22x22
@dirrm share/kde/apps/kaboodle/icons/hicolor/16x16/actions
@dirrm share/kde/apps/kaboodle/icons/hicolor/16x16
@dirrm share/kde/apps/kaboodle/icons/hicolor
@dirrm share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions
@dirrm share/kde/apps/kaboodle/icons/crystalsvg/22x22
@dirrm share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions
@dirrm share/kde/apps/kaboodle/icons/crystalsvg/16x16
@dirrm share/kde/apps/kaboodle/icons/crystalsvg
@dirrm share/kde/apps/kaboodle/icons
@dirrm share/kde/apps/kaboodle
@dirrm share/kde/apps/artscontrol
@ -1066,13 +1127,18 @@ share/kde/servicetypes/audiomidi.desktop
@dirrm share/kde/apps/aktion/toolbar
@dirrm share/kde/apps/aktion
@comment dirrm share/kde/apps
@comment dirrm share/kde/applnk/Settings/Sound
@comment dirrm share/kde/applnk/Multimedia/More
@comment dirrm share/kde/applnk/Multimedia
@comment dirrm share/kde/applnk/.hidden
@dirrm share/doc/kde/HTML/en/noatun
@dirrm share/doc/kde/HTML/en/kscd
@dirrm share/doc/kde/HTML/en/krec
@dirrm share/doc/kde/HTML/en/kmix
@dirrm share/doc/kde/HTML/en/kmidi
@dirrm share/doc/kde/HTML/en/kmid
@dirrm share/doc/kde/HTML/en/kcontrol/kmixcfg
@dirrm share/doc/kde/HTML/en/kcontrol
@dirrm share/doc/kde/HTML/en/kaboodle
@dirrm share/doc/kde/HTML/en/artsbuilder/images
@dirrm share/doc/kde/HTML/en/artsbuilder
@dirrm share/doc/kde/HTML/en/aktion
@ -1088,6 +1154,7 @@ share/kde/servicetypes/audiomidi.desktop
@dirrm include/mpeglib/util/yaf/yafcore
@dirrm include/mpeglib/util/yaf
@dirrm include/mpeglib/util/render
@dirrm include/mpeglib/util/mmx
@dirrm include/mpeglib/util/file
@dirrm include/mpeglib/util/abstract
@dirrm include/mpeglib/util

56
audio/kdemultimedia3/distinfo
View file

@ -1,48 +1,38 @@
$NetBSD: distinfo,v 1.11 2003/02/04 02:27:11 hubertf Exp $
$NetBSD: distinfo,v 1.12 2003/03/11 13:33:47 markd Exp $
SHA1 (kdemultimedia-3.0.5a.tar.bz2) = c6e9a02b318281e2a1c10210fda8150674f641c9
Size (kdemultimedia-3.0.5a.tar.bz2) = 5791676 bytes
SHA1 (patch-aa) = 5a5947018fa205554fbc5848a9480199b873cfc6
SHA1 (patch-ab) = 85b8216b50ab22435835b07e068d326563d0e217
SHA1 (patch-ac) = aa414e044517ef2cd97a99af8acde09e1d24608c
SHA1 (patch-ae) = 23ccdd4f77aae953bc0ab3ab88c73dbcb3d2ba62
SHA1 (kdemultimedia-3.1.tar.bz2) = cc17513c418a8953a9be1168f2c8e2ae64171dcf
Size (kdemultimedia-3.1.tar.bz2) = 5970329 bytes
SHA1 (patch-aa) = 4335268e770fa302b708ca2673f1e3404682bca9
SHA1 (patch-ab) = 4f022376559ea30fee9f88aebb65d7f2b89c6c25
SHA1 (patch-ac) = 63b2d73b200725b7cb6f8363e624e4c8834682b7
SHA1 (patch-ae) = 17fdcfa2d0861bf53404d7ce315a2a315a68a459
SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0
SHA1 (patch-ag) = aee2716c219e7e6c977cf74b0640ae7528f0755e
SHA1 (patch-ah) = 1dd023976df014a217fcaf39f7ea4280b9f011d8
SHA1 (patch-ai) = 6d4ff2feecbe66380dc3d08f7a95076c0b0524e2
SHA1 (patch-aj) = 4da67d4d4a509f933335baa4395d08ae406958ab
SHA1 (patch-ak) = 2e16f0a9cfb8da9790b80135392382b57dd2044a
SHA1 (patch-ag) = 8063a62c4c5a2fa5f9cedef0758092d3e06cee2a
SHA1 (patch-aj) = 8e8c418b247fb67b17f625ba22a09150edcb5526
SHA1 (patch-ak) = 0d71901467f29c225020e53e0ba75ea8d840500c
SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa
SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927
SHA1 (patch-ap) = 3f072d45cfe5b0d57eab27c90a37afec3bd0d5c0
SHA1 (patch-aq) = 6918d9ff057873dc0e25fa8e37c64160d4a19302
SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472
SHA1 (patch-as) = 434f297212876a0f189221a2b09fbb2c04676fd7
SHA1 (patch-at) = 65b99e788d04f3fdc777e88314cd60518b88e20b
SHA1 (patch-au) = 877c2150000dc7c7344f5e4ab86ebc3b691f3e34
SHA1 (patch-av) = 1b14a5c0bb9ae5979cc6e07c34dffe0fbefdc2be
SHA1 (patch-aw) = 87444988e9109f2d59dc7168c4f2337d0c1a7168
SHA1 (patch-ax) = efd01de997033aa2cebd0ba5d875b4d547bfd624
SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8
SHA1 (patch-az) = 95fdda7ebda3acc658767cf7e8a2eff6d87761dc
SHA1 (patch-ba) = 0ba40584fd1859bf809c1ecb8b2493a01b6328df
SHA1 (patch-bb) = fed6648c8bdae43b9fde3e58466a9e25ad5bc458
SHA1 (patch-az) = 0da639b495d188d45317ceae0b0708dcd198bcf9
SHA1 (patch-ba) = 5a096a6639867541b8ad11baa798b1ba8c856e10
SHA1 (patch-bb) = 191486a8559bcf6e0d958b6943c8fd390274c2dd
SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6
SHA1 (patch-bd) = 7cd66c4d019bb2c944ae94fd9b600d9131797047
SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c
SHA1 (patch-bf) = 1f8b40c914d27c34b0fff876682b9402c6815d42
SHA1 (patch-bg) = 2b421f103773c6f2bb3ce6c51134a78c5ac20412
SHA1 (patch-bh) = c1eba941456abe7a313c5e9b80f8adadd27439f5
SHA1 (patch-bh) = 3b2f7af8209caccd4e73565d1d94a1e534e50740
SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e
SHA1 (patch-bj) = 160aebbe402d7ecfc91a22717a3a3813be0c29e9
SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766
SHA1 (patch-bl) = 6d2f6026fb233b43352d53acc7c82ec699cc6337
SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303
SHA1 (patch-bn) = ffa3312c5a08a53b5583db13e2ab3cda82214b35
SHA1 (patch-bn) = 1aacb47569c217dea5d8610fc5a739c896c6450d
SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88
SHA1 (patch-bp) = b59ce7619ea0bdfdd375cf5691650026ef27e176
SHA1 (patch-bq) = 98d57a7c1c9b7c061ae44aad27edbedb8eaee4d9
SHA1 (patch-br) = 66141727f687fffa91ab4c2f00037452dd60f191
SHA1 (patch-bq) = 996c97dd2da67b481cf5101a220e35850009abc8
SHA1 (patch-br) = 48d543fadeb5a6a559788fe9f4d0ddd616880719
SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3
SHA1 (patch-bt) = b59041f0f87e2b92e8838f9868e5d33ae97fa689
SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947
@ -54,13 +44,15 @@ SHA1 (patch-bz) = 1f24fa478f7f7544719e04a427d4d61a0eef9f1e
SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7
SHA1 (patch-cb) = 3a82b1fc52e8e32fb99e7427e24bd497ad323334
SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af
SHA1 (patch-cd) = ec47a25e246432d212b29e821ad428f788d40343
SHA1 (patch-cd) = 9a3e9c285221cca769f2431fa10d991d093590b8
SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b
SHA1 (patch-cf) = 889bb230e3e83f4738c4a565b9101de6d23ae4cb
SHA1 (patch-cf) = 46d1e9cf52a3a0bd48069064f2692cb59094f54c
SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d
SHA1 (patch-ch) = 78d86400c2b4d51fe1363ccc770b4cbab56b45eb
SHA1 (patch-ci) = 49d1caddd97ba8f00a78561f7fd3813c109b95ed
SHA1 (patch-cj) = eac82dbcb32a28dd51cc59227214b4988e53d07a
SHA1 (patch-ci) = 905b15e9e8de4954174dab769b3a2c634b094288
SHA1 (patch-cj) = 5e2a992726b0a861218e70903855e76b0db048f9
SHA1 (patch-cm) = 2d539df6011c977c0b984233f45b99eeb838e7b3
SHA1 (patch-cn) = f6f1f196f1a17cc9135f0d7f1fa9555592185ed1
SHA1 (patch-cn) = 7c85df6d35477d2bec38b16efb884f89f791fb69
SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f
SHA1 (patch-cp) = 8b16a472b150d54810c09126a01723d9a9d9f0d5
SHA1 (patch-cq) = 76106cf3fabff4df4f8bc7bb642336707e2d57f2

92
audio/kdemultimedia3/patches/patch-aa
View file

@ -1,9 +1,9 @@
$NetBSD: patch-aa,v 1.3 2003/01/02 09:12:21 skrll Exp $
$NetBSD: patch-aa,v 1.4 2003/03/11 13:33:47 markd Exp $
--- configure.orig Sat Dec 21 07:07:59 2002
--- configure.orig Fri Jan 17 08:49:45 2003
+++ configure
@@ -21913,6 +21913,40 @@ if { (eval echo "$as_me:21904: \"$ac_lin
echo "$as_me:21913: \$? = $ac_status" >&5
@@ -26406,6 +26406,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'"
+
@ -43,52 +43,26 @@ $NetBSD: patch-aa,v 1.3 2003/01/02 09:12:21 skrll Exp $
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
@@ -22664,7 +22698,7 @@ if test "x$au_enable_default" = xyes; th
au_enable_sun=yes
@@ -28047,7 +28081,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
;;
*-*-netbsd*)
- au_enable_sun=yes
+ au_enable_oss=yes
;;
*-*-openbsd*)
au_enable_sun=yes
@@ -22685,7 +22719,7 @@ if test "x$au_enable_oss" = xyes; then
echo "${ECHO_T}yes - <sys/soundcard.h>" >&6
else
case "$target" in
- *linux*|*freebsd*|*bsdi*)
+ *linux*|*freebsd*|*bsdi*|*netbsd*)
echo "$as_me:22689: result: yes" >&5
echo "${ECHO_T}yes" >&6
;;
@@ -26223,7 +26257,7 @@ fi
echo "$as_me:26223: result: $ac_cv_lib_ossaudio_main" >&5
*-*-bsdi2.0)
@@ -32038,7 +32072,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
echo "$as_me:26229: checking for main in -lasound" >&5
@@ -26570,6 +26604,7 @@ case "$host" in
*-*-*bsdi*) kscd_compile=yes;;
*-*-*freebsd*) kscd_compile=yes;;
*-*-*openbsd*) kscd_compile=yes;;
+ *-*-*netbsd*) kscd_compile=yes;;
*-*-*bsd*) kscd_compile=no;;
*) kscd_compile=yes;;
esac
@@ -26633,7 +26668,7 @@ EOF
fi
done
-for ac_header in sys/soundcard.h machine/soundcard.h linux/soundcard.h
+for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h linux/soundcard.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:26639: checking for $ac_header" >&5
@@ -26952,8 +26987,23 @@ if { (eval echo "$as_me:26943: \"$ac_com
echo "$as_me:26952: \$? = $ac_status" >&5
@@ -33074,8 +33108,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- x11_dga2=yes
@ -113,8 +87,8 @@ $NetBSD: patch-aa,v 1.3 2003/01/02 09:12:21 skrll Exp $
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
@@ -27001,7 +27051,22 @@ if { (eval echo "$as_me:26992: \"$ac_com
echo "$as_me:27001: \$? = $ac_status" >&5
@@ -33130,7 +33179,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
+ lib=Xv
@ -136,8 +110,8 @@ $NetBSD: patch-aa,v 1.3 2003/01/02 09:12:21 skrll Exp $
else
echo "$as_me: failed program was:" >&5
@@ -27050,7 +27115,22 @@ if { (eval echo "$as_me:27041: \"$ac_com
echo "$as_me:27050: \$? = $ac_status" >&5
@@ -33186,7 +33250,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
+ lib=Xxf86vm
@ -159,28 +133,18 @@ $NetBSD: patch-aa,v 1.3 2003/01/02 09:12:21 skrll Exp $
else
echo "$as_me: failed program was:" >&5
@@ -27326,6 +27406,9 @@ esac
kde_mpeglib_compiles=no
case "$OS_TYPE" in
+ NetBSD)
+ kde_mpeglib_compiles=yes
+ ;;
FreeBSD)
kde_mpeglib_compiles=yes
;;
@@ -27592,10 +27675,10 @@ EOF
@@ -33785,10 +33864,10 @@ _ACEOF
;;
NetBSD)
- echo "$as_me:27595: result: NetBSD :Unknown hardware. You will have problems!!" >&5
- 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:27650: result: using -lpthread" >&5
+ echo $ECHO_N "using -lpthread... $ECHO_C" >&6
+ OS_TYPE="BSD"
+ LIBPTHREAD="-lpthread"
cat >>confdefs.h <<\EOF
+ 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
EOF
_ACEOF

33
audio/kdemultimedia3/patches/patch-ab
View file

@ -1,33 +1,32 @@
$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $
$NetBSD: patch-ab,v 1.2 2003/03/11 13:33:47 markd Exp $
--- kaboodle/Makefile.am.orig Fri Jul 27 01:53:45 2001
--- kaboodle/Makefile.am.orig Mon Sep 16 09:14:51 2002
+++ kaboodle/Makefile.am
@@ -2,7 +2,7 @@
@@ -2,7 +2,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
SUBDIRS = pics actions
-lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la
+lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la
-lib_LTLIBRARIES = kaboodle.la
+lib_LTLIBRARIES = libkaboodle_main.la kaboodle.la
libkaboodlepart_la_SOURCES = conf.cpp \
controls.cpp \
@@ -15,25 +15,24 @@
libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde
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 \
+kaboodle_la_SOURCES = kaboodle_main.cpp
+kaboodle_la_LIBADD = libkaboodle_main.la
+kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+
+libkaboodle_main_la_SOURCES = main.cpp \
kaboodleapp.cpp \
userinterface.cpp
kaboodleapp.cpp \
userinterface.cpp
-kaboodle_la_LIBADD = libkaboodlepart.la
-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+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

235
audio/kdemultimedia3/patches/patch-ac
View file

@ -1,34 +1,33 @@
$NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
$NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
--- kaboodle/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- kaboodle/Makefile.in.orig Fri Jan 17 08:49:39 2003
+++ kaboodle/Makefile.in
@@ -292,7 +292,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
@@ -328,7 +328,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
SUBDIRS = pics actions
-lib_LTLIBRARIES = libkaboodlepart.la kaboodle.la
+lib_LTLIBRARIES = libkaboodlepart.la libkaboodle_main.la kaboodle.la
-lib_LTLIBRARIES = kaboodle.la
+lib_LTLIBRARIES = libkaboodle_main.la kaboodle.la
libkaboodlepart_la_SOURCES = conf.cpp \
controls.cpp \
@@ -306,24 +306,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)
libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde
kde_module_LTLIBRARIES = libkaboodlepart.la
@@ -343,24 +343,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 \
+kaboodle_la_SOURCES = kaboodle_main.cpp
+kaboodle_la_LIBADD = libkaboodle_main.la
+kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+
+libkaboodle_main_la_SOURCES = main.cpp \
kaboodleapp.cpp \
userinterface.cpp
kaboodleapp.cpp \
userinterface.cpp
-kaboodle_la_LIBADD = libkaboodlepart.la
-kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+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
@ -45,9 +44,9 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
applnk_DATA = kaboodle.desktop
applnkdir = $(kde_appsdir)/Multimedia
@@ -336,14 +338,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
@@ -373,14 +375,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kaboodle_la_DEPENDENCIES = libkaboodlepart.la
-am_kaboodle_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo
@ -70,8 +69,8 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
+@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 kaboodle_part.lo player.lo videoembed.lo
@@ -357,11 +364,11 @@ libkaboodlepart_la_nofinal_OBJECTS = con
kaboodle_factory.lo player.lo view.lo
@@ -394,11 +401,11 @@ libkaboodlepart_la_nofinal_OBJECTS = con
bin_PROGRAMS = kaboodle$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@ -86,42 +85,40 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -370,23 +377,26 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -407,21 +414,27 @@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \
#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/videoembed.Plo
-#>+ 15
-@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 \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \
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 $(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)/kaboodle_part.Plo \
@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 $(DEPDIR)/userinterface.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/videoembed.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)/kaboodle_factory.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(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)/kaboodle_part.Plo \
@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 $(DEPDIR)/userinterface.Plo \
@@ -411,8 +421,8 @@ CXXLD = $(CXX)
+@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
@@ -445,8 +458,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
@ -132,7 +129,7 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA)
@@ -422,7 +432,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
@@ -456,7 +469,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = AUTHORS Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@ -141,8 +138,8 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
#>- all: all-recursive
#>+ 1
@@ -471,6 +481,8 @@ clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@@ -531,6 +544,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)
@ -150,53 +147,55 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
#>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
#>+ 2
@KDE_USE_CLOSURE_TRUE@libkaboodlepart.la: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
@@ -512,9 +524,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)/kaboodle_part.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodleapp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@
@@ -690,7 +703,7 @@ distclean-tags:
@@ -577,9 +592,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@
@@ -769,7 +785,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=engine.h kaboodle_factory.h kaboodleapp.h kaboodle_part.h userinterface.h controls.h conf.h player.h kaboodleui.rc videoembed.h kaboodle.desktop README-USERS kaboodlepartui.rc kaboodle_component.desktop
+KDE_DIST=kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h userinterface.h
-KDE_DIST=engine.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h userinterface.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h kaboodlepartui.rc uninstall.desktop kaboodle_component.desktop
+KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop kaboodleengine.desktop conf.h uninstall.desktop player.h userinterface.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -752,7 +765,6 @@ install-strip:
@@ -837,7 +853,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
@@ -831,9 +843,6 @@ uninstall-info: uninstall-info-recursive
uninstall-libLTLIBRARIES uninstall-recursive
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -924,9 +939,6 @@ uninstall-info: uninstall-info-recursive
uninstall-recursive
-dummy.cpp:
- echo > dummy.cpp
-
messages: rc.cpp
$(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot
# Tell versions [3.59,3.63) of GNU make to not export all variables.
@@ -850,26 +859,30 @@ libkaboodlepart.la.closure: $(libkaboodl
install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia/More
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/More/kaboodle.desktop
@@ -947,40 +959,40 @@ libkaboodlepart.la.closure: $(libkaboodl
#>+ 3
-engine.moc: $(srcdir)/engine.h
- $(MOC) $(srcdir)/engine.h -o engine.moc
+kaboodle_part.moc: $(srcdir)/kaboodle_part.h
+ $(MOC) $(srcdir)/kaboodle_part.h -o kaboodle_part.moc
-
-#>+ 3
view.moc: $(srcdir)/view.h
$(MOC) $(srcdir)/view.h -o view.moc
#>+ 3
-userinterface.moc: $(srcdir)/userinterface.h
@ -209,31 +208,26 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
$(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
#>+ 3
-kaboodle_part.moc: $(srcdir)/kaboodle_part.h
- $(MOC) $(srcdir)/kaboodle_part.h -o kaboodle_part.moc
+userinterface.moc: $(srcdir)/userinterface.h
+ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
#>+ 3
+
+#>+ 3
kaboodle_factory.moc: $(srcdir)/kaboodle_factory.h
$(MOC) $(srcdir)/kaboodle_factory.h -o kaboodle_factory.moc
#>+ 3
-player.moc: $(srcdir)/player.h
- $(MOC) $(srcdir)/player.h -o player.moc
+conf.moc: $(srcdir)/conf.h
+ $(MOC) $(srcdir)/conf.h -o conf.moc
+
+#>+ 3
player.moc: $(srcdir)/player.h
$(MOC) $(srcdir)/player.h -o player.moc
@@ -878,16 +891,12 @@ videoembed.moc: $(srcdir)/videoembed.h
$(MOC) $(srcdir)/videoembed.h -o videoembed.moc
#>+ 3
-controls.moc: $(srcdir)/controls.h
- $(MOC) $(srcdir)/controls.h -o controls.moc
-
-#>+ 3
+player.moc: $(srcdir)/player.h
+ $(MOC) $(srcdir)/player.h -o player.moc
#>+ 3
-conf.moc: $(srcdir)/conf.h
- $(MOC) $(srcdir)/conf.h -o conf.moc
+engine.moc: $(srcdir)/engine.h
@ -241,12 +235,12 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
#>+ 3
clean-metasources:
- -rm -f engine.moc userinterface.moc kaboodleapp.moc kaboodle_part.moc kaboodle_factory.moc player.moc videoembed.moc controls.moc conf.moc
+ -rm -f kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc
- -rm -f engine.moc view.moc userinterface.moc kaboodleapp.moc kaboodle_factory.moc player.moc controls.moc conf.moc
+ -rm -f view.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc engine.moc
#>+ 3
clean-closures:
@@ -904,19 +913,19 @@ force-reedit:
@@ -997,19 +1009,19 @@ force-reedit:
#>+ 11
@ -270,12 +264,12 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
+ 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)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp kaboodle_factory.moc kaboodle_part.moc player.moc conf.moc engine.moc videoembed.moc controls.moc
+libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp kaboodle_part.moc controls.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.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 kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.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; \
@@ -929,20 +938,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
@@ -1022,20 +1034,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
#>+ 3
clean-final:
@ -301,35 +295,32 @@ $NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -952,21 +961,21 @@ kde-rpo-clean:
@@ -1045,19 +1057,19 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 19
#>+ 17
-controls.o: controls.moc
-userinterface.lo: userinterface.moc
-kaboodle_part.o: kaboodle_part.moc
videoembed.lo: videoembed.moc
-kaboodleapp.o: kaboodleapp.moc
+conf.o: conf.moc
+player.o: player.moc
+userinterface.o: userinterface.moc
view.o: view.moc
kaboodleapp.o: kaboodleapp.moc
-kaboodleapp.lo: kaboodleapp.moc
videoembed.o: videoembed.moc
-kaboodle_factory.o: kaboodle_factory.moc
-engine.lo: engine.moc
-kaboodle_factory.lo: kaboodle_factory.moc
conf.o: conf.moc
-kaboodle_part.lo: kaboodle_part.moc
player.o: player.moc
kaboodle_factory.o: kaboodle_factory.moc
+controls.lo: controls.moc
engine.lo: engine.moc
kaboodle_factory.lo: kaboodle_factory.moc
-conf.o: conf.moc
-view.lo: view.moc
-player.o: player.moc
-player.lo: player.moc
userinterface.o: userinterface.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
-userinterface.o: userinterface.moc
-controls.lo: controls.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
+kaboodle_part.o: kaboodle_part.moc
+userinterface.lo: userinterface.moc
+kaboodle_part.lo: kaboodle_part.moc

8
audio/kdemultimedia3/patches/patch-ae
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
$NetBSD: patch-ae,v 1.2 2003/03/11 13:33:48 markd Exp $
--- kaboodle/main.cpp.orig Fri Aug 31 13:34:04 2001
--- kaboodle/main.cpp.orig Sun Oct 27 11:20:11 2002
+++ kaboodle/main.cpp
@@ -42,7 +42,9 @@
@@ -42,7 +42,9 @@ static KCmdLineOptions options[] =
{ 0, 0, 0}
};
@ -11,5 +11,5 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
+
+int kdemain(int argc, char **argv)
{
KCmdLineArgs::init( argc, argv, KaboodleFactory::aboutData());
KCmdLineArgs::init(argc, argv, Kaboodle::KaboodleFactory::aboutData());
KCmdLineArgs::addCmdLineOptions(options);

12
audio/kdemultimedia3/patches/patch-ag
View file

@ -1,19 +1,19 @@
$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
$NetBSD: patch-ag,v 1.2 2003/03/11 13:33:48 markd Exp $
--- kmidi/TIMIDITY/Makefile.in.orig Tue May 14 01:53:26 2002
--- kmidi/TIMIDITY/Makefile.in.orig Fri Jan 17 08:49:40 2003
+++ kmidi/TIMIDITY/Makefile.in
@@ -300,8 +300,8 @@
@@ -337,8 +337,8 @@ x_libraries = @x_libraries@
INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags`
AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS)
-LDFLAGS = `$(ARTSCCONFIG) --libs`
-LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm
-LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm
+timidity_LDFLAGS = `$(ARTSCCONFIG) --libs`
+LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -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,
@@ -386,7 +386,6 @@
@@ -420,7 +420,6 @@ timidity_nofinal_OBJECTS = timidity.$(OB
@KDE_USE_FINAL_TRUE@timidity_OBJECTS = $(timidity_final_OBJECTS)
timidity_LDADD = $(LDADD)
timidity_DEPENDENCIES =

16
audio/kdemultimedia3/patches/patch-ah
View file

@ -1,16 +0,0 @@
$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
--- kmidi/b_out.cpp.orig Thu Apr 12 10:09:23 2001
+++ kmidi/b_out.cpp
@@ -16,6 +16,11 @@
#include <linux/soundcard.h>
#endif
+#ifdef __NetBSD__
+#include <sys/ioctl.h>
+#include <soundcard.h>
+#endif
+
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#endif

50
audio/kdemultimedia3/patches/patch-ai
View file

@ -1,50 +0,0 @@
$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
--- kmidi/linux_a.cpp.orig Fri Jan 19 09:17:50 2001
+++ kmidi/linux_a.cpp
@@ -36,6 +36,13 @@
#include <linux/soundcard.h>
#endif
+#ifdef __NetBSD__
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <soundcard.h>
+#endif
+
+
#ifdef __FreeBSD__
#include <stdio.h>
#include <machine/soundcard.h>
@@ -76,6 +83,9 @@
#ifdef LINUX_SECOND_DEVICE
"Linux 2nd dsp device", 'D',
"/dev/dsp1",
+#elif defined(__NetBSD__)
+ "NetBSD audio device", 'd',
+ "/dev/sound",
#else
"Linux dsp device", 'd',
"/dev/dsp",
@@ -320,13 +330,21 @@
static void flush_output(void)
{
output_data(0, 0);
+#if defined(__NetBSD__)
+ ioctl(dpm.fd, SNDCTL_DSP_SYNC, NULL);
+#else
ioctl(dpm.fd, SNDCTL_DSP_SYNC);
+#endif
}
static void purge_output(void)
{
b_out(dpm.id_character, dpm.fd, 0, -1);
+#if defined(__NetBSD__)
+ ioctl(dpm.fd, SNDCTL_DSP_RESET, NULL);
+#else
ioctl(dpm.fd, SNDCTL_DSP_RESET);
+#endif
}
#endif /* defined(__linux__) || defined(__FreeBSD__) || defined(__bsdi__) */

30
audio/kdemultimedia3/patches/patch-aj
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
$NetBSD: patch-aj,v 1.2 2003/03/11 13:33:49 markd Exp $
--- kmix/Makefile.am.orig Wed May 8 19:29:16 2002
--- kmix/Makefile.am.orig Sun Oct 27 11:20:17 2002
+++ kmix/Makefile.am
@@ -2,7 +2,7 @@
@@ -2,7 +2,7 @@ SUBDIRS = control pics
INCLUDES= $(all_includes)
bin_PROGRAMS = kmix kmixctrl
@ -11,14 +11,14 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
kde_module_LTLIBRARIES = kmix_panelapplet.la
@@ -12,22 +12,30 @@
@@ -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 \
volume.cpp kledbutton.cpp mixdevicewidget.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)
@ -33,15 +33,9 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
+kmix_LDADD = libkmix_main.la
kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kmixctrl_SOURCES = dummy.cpp
-kmixctrl_LDADD = kmixctrl.la
+kmixctrl_SOURCES = kmixctrl_main.cpp
+kmixctrl_LDADD = libkmixctrl_main.la
kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp
-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
+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)
+
@ -49,8 +43,14 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $
+kmixctrl_la_LIBADD = libkmixctrl_main.la
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_METASOURCES=AUTO
@@ -58,6 +66,3 @@
-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

269
audio/kdemultimedia3/patches/patch-ak
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
$NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
--- kmix/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- kmix/Makefile.in.orig Fri Jan 17 08:49:40 2003
+++ kmix/Makefile.in
@@ -292,7 +292,7 @@ SUBDIRS = control pics
@@ -328,7 +328,7 @@ SUBDIRS = control pics
INCLUDES = $(all_includes)
bin_PROGRAMS = kmix kmixctrl
@ -11,14 +11,19 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
kde_module_LTLIBRARIES = kmix_panelapplet.la
noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \
@@ -301,23 +301,31 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
@@ -337,29 +337,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 \
#>- 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 \
#>- 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 \
volume.cpp kledbutton.cpp mixdevicewidget.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)
@ -34,15 +39,12 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
+kmix_LDADD = libkmix_main.la
kmix_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kmixctrl_SOURCES = dummy.cpp
-kmixctrl_LDADD = kmixctrl.la
+kmixctrl_SOURCES = kmixctrl_main.cpp
+kmixctrl_LDADD = libkmixctrl_main.la
kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kmixctrl_la_SOURCES = kmixctrl.cpp channel.cpp mixer.cpp volume.cpp
-#>- 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
+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)
+
@ -50,8 +52,14 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
+kmixctrl_la_LIBADD = libkmixctrl_main.la
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
#>- kmix_panelapplet_la_METASOURCES = AUTO
@@ -351,18 +359,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
-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 \
@@ -392,18 +400,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
@ -66,7 +74,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
-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 volume.lo \
- kledbutton.lo mixdevicewidget.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
@ -74,8 +82,8 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
kmix_panelapplet_la_DEPENDENCIES =
am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \
channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \
@@ -375,27 +376,46 @@ kmix_panelapplet_la_nofinal_OBJECTS = km
mixdevicewidget.lo colorwidget.lo
@@ -416,27 +417,46 @@ kmix_panelapplet_la_nofinal_OBJECTS = km
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 =
@ -85,7 +93,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
#>- 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
-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
@ -99,7 +107,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
+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 volume.lo kledbutton.lo mixdevicewidget.lo
+ ksmallslider.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 =
@ -109,7 +117,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
+#>+ 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
+ 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)
@ -134,52 +142,49 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -403,28 +423,34 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
@@ -444,28 +464,37 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \
-#>- @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \
+#>- @AMDEP_TRUE@DEP_FILES = $(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 $(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 $(DEPDIR)/mixer.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/volume.Plo
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/channel.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmixapplet.Plo ./$(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
-#>+ 19
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P $(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 \
+#>+ 23
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(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)/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 $(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 \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksmallslider.Plo $(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mixdevicewidget.Plo $(DEPDIR)/mixer.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/volume.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/colorwidget.P $(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@DEP_FILES = $(DEPDIR)/colorwidget.P $(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 $(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 \
@@ -452,7 +478,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
-@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)/channel.Plo ./$(DEPDIR)/dummy.Po \
+#>+ 25
+@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)/channel.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixapplet.Plo ./$(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 \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmallslider.Plo ./$(DEPDIR)/main.Plo \
@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)/channel.Plo ./$(DEPDIR)/dummy.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P ./$(DEPDIR)/channel.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmixapplet.Plo ./$(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 \
@@ -493,7 +522,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
@ -190,7 +195,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA)
HEADERS = $(noinst_HEADERS)
@@ -464,7 +492,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
@@ -505,7 +536,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@ -199,7 +204,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
#>- all: all-recursive
#>+ 1
@@ -539,6 +567,10 @@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE
@@ -587,6 +618,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)
@ -207,35 +212,35 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
+ $(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)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -577,11 +609,14 @@ distclean-compile:
@@ -630,11 +665,14 @@ distclean-compile:
-rm -f *.tab.c
@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@
@@ -776,7 +811,7 @@ distclean-tags:
@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@
@@ -845,7 +883,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop mixer_alsa.cpp mixer_irix.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_oss.h
+KDE_DIST=colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h mixer_alsa.cpp kmixapplet.desktop mixer_alsa.h
-KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kledbutton.cpp kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop ksmallslider.cpp mixdevicewidget.cpp mixer_irix.cpp mixer_alsa5.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_alsa9.cpp mixer_oss.h
+KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h kledbutton.cpp mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp ksmallslider.cpp mixer_none.cpp mixer_none.h mixdevicewidget.cpp mixer_oss.h kmixapplet.desktop mixer_alsa.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -930,9 +965,6 @@ $(srcdir)/version.h: VERSION
@@ -1005,54 +1043,51 @@ $(srcdir)/version.h: VERSION
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kmix.pot
@ -245,79 +250,91 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
# 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:
@@ -962,44 +994,44 @@ colorwidget.moc: colorwidget.h
$(MOC) colorwidget.h -o colorwidget.moc
#>+ 3
-ksmallslider.moc: $(srcdir)/ksmallslider.h
- $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc
-#>+ 5
-mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; /bin/false )
-mixerIface_skel.cpp: mixerIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl
+#>+ 3
+kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
+ $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.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
+mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
+ $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
#>+ 3
-kmix.moc: $(srcdir)/kmix.h
- $(MOC) $(srcdir)/kmix.h -o kmix.moc
-kmixapplet.moc: $(srcdir)/kmixapplet.h
- $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
+ksmallslider.moc: $(srcdir)/ksmallslider.h
+ $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc
#>+ 3
-mixer.moc: $(srcdir)/mixer.h
- $(MOC) $(srcdir)/mixer.h -o mixer.moc
-kmix.moc: $(srcdir)/kmix.h
- $(MOC) $(srcdir)/kmix.h -o kmix.moc
+kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
+ $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
#>+ 3
-kmixerwidget.moc: $(srcdir)/kmixerwidget.h
- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+mixer.moc: $(srcdir)/mixer.h
+ $(MOC) $(srcdir)/mixer.h -o mixer.moc
mixer.moc: $(srcdir)/mixer.h
$(MOC) $(srcdir)/mixer.h -o mixer.moc
#>+ 3
-kledbutton.moc: $(srcdir)/kledbutton.h
- $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc
-kmixerwidget.moc: $(srcdir)/kmixerwidget.h
- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+kmix.moc: $(srcdir)/kmix.h
+ $(MOC) $(srcdir)/kmix.h -o kmix.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
+kmixapplet.moc: $(srcdir)/kmixapplet.h
+ $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
#>+ 3
-mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
- $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
- $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
+kledbutton.moc: $(srcdir)/kledbutton.h
+ $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc
#>+ 3
-kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
- $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
-mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
- $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
+kmixerwidget.moc: $(srcdir)/kmixerwidget.h
+ $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
-#>+ 3
-kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
- $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
+#>+ 5
+mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; /bin/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)
@@ -1080,7 +1115,7 @@ colorwidget.moc: colorwidget.h
#>+ 3
clean-metasources:
- -rm -f ksmallslider.moc kmixapplet.moc kmix.moc mixer.moc kmixerwidget.moc kledbutton.moc kmixdockwidget.moc mixdevicewidget.moc kmixprefdlg.moc
+ -rm -f kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc
#>+ 4
clean-ui:
@@ -1021,19 +1053,7 @@ force-reedit:
#>+ 6
clean-idl:
@@ -1109,19 +1144,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)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc kmixprefdlg.moc mixdevicewidget.moc
-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)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc kmixprefdlg.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 volume.cpp kledbutton.cpp mixdevicewidget.cpp ; do \
- for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.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; \
@ -325,24 +342,24 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
- 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)/mixdevicewidget.cpp colorwidget.cpp kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.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)/mixdevicewidget.cpp colorwidget.cpp mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.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)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.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)/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; \
@@ -1045,33 +1065,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
@@ -1133,33 +1156,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 mixer.moc
-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)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc
+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)/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 volume.cpp kledbutton.cpp mixdevicewidget.cpp ; do \
+ for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.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; \
@ -350,11 +367,11 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
+ 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 mixer.moc
+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 ; do \
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; \
@ -389,7 +406,7 @@ $NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1081,29 +1113,29 @@ kde-rpo-clean:
@@ -1169,29 +1204,29 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 27

37
audio/kdemultimedia3/patches/patch-ap
View file

@ -1,37 +0,0 @@
$NetBSD: patch-ap,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- kscd/libwm/include/wm_config.h.orig Wed May 8 19:29:23 2002
+++ kscd/libwm/include/wm_config.h
@@ -128,11 +128,31 @@
*** ****** ** ** ****** ****** ** ****** ** * **********
*** ****** ** ** ** ** **** *** ***********
******************************************************************/
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined(__NetBSD)
+#if defined(__FreeBSD__) || defined(__FreeBSD)
#define DEFAULT_CD_DEVICE "/dev/rmatcd0c"
+
#endif /* freebsd */
+
+/******************************************************************
+ * NetBSD
+ ******************************************************************
+ *** *** ** ** ** **** *** *****************
+ *** ** ** ******** **** ** ** ****** * ****************
+ *** * * ** ****** **** ****** **** ** ***************
+ *** ** ** ******** **** ** ****** ** * ****************
+ *** *** ** **** **** **** *** *****************
+ ******************************************************************/
+#if defined(__NetBSD__) || defined(__NetBSD)
+
+#if defined(__i386__)
+#define DEFAULT_CD_DEVICE "/dev/rcd0d"
+#else
+#define DEFAULT_CD_DEVICE "/dev/rcd0c"
+#endif
+
+#endif /* netbsd */
/******************************************************************
* HP-UX

44
audio/kdemultimedia3/patches/patch-aq
View file

@ -1,44 +0,0 @@
$NetBSD: patch-aq,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- kscd/libwm/plat_freebsd.c.orig Fri Jan 11 03:19:57 2002
+++ kscd/libwm/plat_freebsd.c
@@ -34,3 +34,3 @@
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__)
@@ -52,3 +52,3 @@
-#if defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__OpenBSD__)
# define MSF_MINUTES 1
@@ -59,2 +59,5 @@
# include "/sys/scsi/scsi_cd.h"
+#elif defined(__NetBSD__)
+#include <sys/scsiio.h>
+#include <dev/scsipi/scsipi_cd.h>
#else
@@ -235,7 +238,2 @@
dopos:
-#ifdef __NetBSD__
- *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 +
- scd.what.position.absaddr[MSF_SECONDS] * 75 +
- scd.what.position.absaddr[MSF_FRAMES];
-#else
*pos = scd.what.position.absaddr.msf.minute * 60 * 75 +
@@ -243,3 +241,2 @@
scd.what.position.absaddr.msf.frame;
-#endif
*track = scd.what.position.track_number;
@@ -310,7 +307,2 @@
-#ifdef __NetBSD__
- *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 +
- toc_buffer.addr[MSF_SECONDS] * 75 +
- toc_buffer.addr[MSF_FRAMES];
-#else
*startframe = toc_buffer.addr.msf.minute*60*75 +
@@ -318,3 +310,2 @@
toc_buffer.addr.msf.frame;
-#endif

31
audio/kdemultimedia3/patches/patch-as
View file

@ -1,31 +0,0 @@
$NetBSD: patch-as,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- mpeglib/lib/util/audio/audioIO_Linux.cpp.orig Tue Jun 5 19:55:39 2001
+++ mpeglib/lib/util/audio/audioIO_Linux.cpp
@@ -40,7 +40,7 @@
#include <sys/soundcard.h>
#else
// fallback:
-#include <linux/soundcard.h>
+#include <soundcard.h> /* NetBSD has <soundcard.h> */
#endif
#endif
@@ -48,7 +48,7 @@
/* optimal fragment size */
-int AUSIZ = 0;
+int ausiz = 0;
// declare these static to effectively isolate the audio device
@@ -147,7 +147,7 @@
exit(0);
}
- if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) == -1) {
+ if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &ausiz) == -1) {
perror("Unable to get fragment size\n");
exit(0);
}

17
audio/kdemultimedia3/patches/patch-at
View file

@ -1,17 +0,0 @@
$NetBSD: patch-at,v 1.2 2003/02/04 02:27:10 hubertf Exp $
--- mpeglib/lib/util/render/x11/imageDeskX11.cpp.orig Thu Jan 11 16:40:00 2001
+++ mpeglib/lib/util/render/x11/imageDeskX11.cpp
@@ -397,7 +397,12 @@
}
int bestMode = -1;
+#if defined(__NetBSD__)
+# include <machine/limits.h>
+ int border, minBorder = INT_MAX;
+#else
int border, minBorder = MAXINT;
+#endif
for (i = 0; i < vm_count; i++) {
printf("mode %d: %dx%d\n",i, vm_modelines[i]->hdisplay,vm_modelines[i]->vdisplay);

15
audio/kdemultimedia3/patches/patch-au
View file

@ -1,15 +0,0 @@
$NetBSD: patch-au,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- mpeglib/lib/util/render/x11/imageDeskX11.h.orig Wed Dec 6 18:42:08 2000
+++ mpeglib/lib/util/render/x11/imageDeskX11.h
@@ -13,7 +13,10 @@
#ifndef __IMAGEDESKX11_H
#define __IMAGEDESKX11_H
+#if defined(__NetBSD__)
+#else
#include <values.h>
+#endif
#include "xinit.h"
#include "../imageBase.h"

12
audio/kdemultimedia3/patches/patch-av
View file

@ -1,12 +0,0 @@
$NetBSD: patch-av,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- mpeglib/lib/util/render/x11/imageXVDesk.h.orig Thu Dec 21 17:47:58 2000
+++ mpeglib/lib/util/render/x11/imageXVDesk.h
@@ -21,7 +21,6 @@
#include <iostream.h>
#include <stdio.h>
-#include <semaphore.h>
//#undef X11_XV

18
audio/kdemultimedia3/patches/patch-aw
View file

@ -1,18 +0,0 @@
$NetBSD: patch-aw,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- mpeglib/lib/util/render/x11/x11Surface.cpp.orig Wed Aug 8 13:04:28 2001
+++ mpeglib/lib/util/render/x11/x11Surface.cpp
@@ -267,8 +267,13 @@
XSizeHints hints;
hints.flags = PMaxSize;
if (HAS_RESIZE(newImage)) {
+#if defined(__NetBSD__)
+ hints.max_width = INT_MAX;
+ hints.max_height = INT_MAX;
+#else
hints.max_width = MAXINT;
hints.max_height = MAXINT;
+#endif
} else {
hints.max_width = xWindow->width;
hints.max_height = xWindow->height;

16
audio/kdemultimedia3/patches/patch-ax
View file

@ -1,16 +0,0 @@
$NetBSD: patch-ax,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
--- mpeglib/lib/util/render/x11/x11Surface.h.orig Wed Aug 8 13:04:28 2001
+++ mpeglib/lib/util/render/x11/x11Surface.h
@@ -14,7 +14,11 @@
#ifndef __X11SURFACE_H
#define __X11SURFACE_H
+#if defined(__NetBSD__)
+#include <limits.h>
+#else
#include <values.h>
+#endif
#include "xinit.h"
#include "../surface.h"
#include "initDisplay.h"

116
audio/kdemultimedia3/patches/patch-az
View file

@ -1,8 +1,8 @@
$NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
$NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
--- noatun/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/Makefile.in.orig Fri Jan 17 08:49:41 2003
+++ noatun/Makefile.in
@@ -294,22 +294,25 @@ SUBDIRS = pics library modules .
@@ -330,22 +330,25 @@ SUBDIRS = pics library modules .
KDE_ICON = AUTO
@ -35,7 +35,7 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
applnk_DATA = noatun.desktop
applnkdir = $(kde_appsdir)/Multimedia
@@ -327,25 +330,31 @@ subdir = noatun
@@ -363,25 +366,31 @@ subdir = noatun
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@ -78,31 +78,34 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
#>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
#>+ 1
@@ -358,13 +367,16 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
@@ -394,13 +403,19 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po
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 $(DEPDIR)/noatun_main.Po
+#>+ 7
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/libnoatun_main_la.all_cpp.P $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po
-@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)
@@ -385,8 +397,8 @@ CXXLD = $(CXX)
@@ -421,8 +436,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
@ -113,7 +116,7 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA)
@@ -396,7 +408,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
@@ -432,7 +447,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = COPYING Makefile.am Makefile.in TODO
DIST_SUBDIRS = $(SUBDIRS)
@ -122,57 +125,66 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
#>- all: all-recursive
#>+ 1
@@ -443,6 +455,27 @@ uninstall-kde_moduleLTLIBRARIES:
clean-kde_moduleLTLIBRARIES:
-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
@@ -477,6 +492,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 \
+ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
+ 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 -z "$dir" && 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)
install-binPROGRAMS: $(bin_PROGRAMS)
@@ -506,10 +539,11 @@ mostlyclean-compile:
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -550,10 +595,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@
-@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)
@@ -679,7 +713,7 @@ distclean-tags:
-rm -rf ./$(DEPDIR)
@@ -738,7 +784,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=artsvideo.idl preset.jazz hi22-app-noatun.png preset.trance joinhandler.h hi16-app-noatun.png FILES hi48-app-noatun.png avideoframe.h CHANGES preset.metal configure.in.in noatun.upd noatun.desktop preset.dance hi32-app-noatun.png preset.zero avideoframe.cc
+KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal hi16-app-noatun.png preset.zero hi32-app-noatun.png preset.dance
-KDE_DIST=artsvideo.idl preset.jazz cr48-app-noatun.png preset.trance joinhandler.h preset.eclecticguitar FILES cr128-app-noatun.png avideoframe.h CHANGES preset.metal cr22-app-noatun.png configure.in.in noatun.upd noatun.desktop preset.dance cr32-app-noatun.png preset.zero avideoframe.cc cr16-app-noatun.png cr64-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 preset.zero cr16-app-noatun.png cr32-app-noatun.png preset.dance
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -719,9 +753,11 @@ distdir: $(DISTFILES)
@@ -783,9 +829,11 @@ distdir: $(DISTFILES)
check-am: all-am
check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
@ -185,15 +197,15 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
install: install-recursive
install-exec: install-exec-recursive
@@ -739,7 +775,6 @@ install-strip:
@@ -804,7 +852,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
@@ -752,10 +787,12 @@ maintainer-clean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -817,10 +864,12 @@ maintainer-clean-generic:
clean: kde-rpo-clean clean-recursive
#>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
@ -209,7 +221,7 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
distclean: distclean-recursive
@@ -776,9 +813,9 @@ info-am:
@@ -841,9 +890,9 @@ info-am:
install-data-am: install-kde-icons install-applnkDATA \
install-presetsDATA install-updateDATA install-updatePROGRAMS
@ -221,7 +233,7 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
install-info: install-info-recursive
@@ -797,43 +834,42 @@ mostlyclean-am: mostlyclean-compile most
@@ -862,43 +911,42 @@ mostlyclean-am: mostlyclean-compile most
#>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \
#>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
@ -284,9 +296,9 @@ $NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $
- echo > dummy.cpp
-
messages:
$(EXTRACTRC) `find . -name "*.rc"` > rc.cpp
$(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -print` -o $(podir)/noatun.pot
@@ -880,33 +916,33 @@ force-reedit:
$(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
@@ -951,33 +999,33 @@ force-reedit:
#>+ 11

13
audio/kdemultimedia3/patches/patch-ba
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ba,v 1.3 2002/10/03 11:21:29 markd Exp $
$NetBSD: patch-ba,v 1.4 2003/03/11 13:33:54 markd Exp $
--- noatun/library/Makefile.am.orig Wed May 8 19:29:25 2002
--- noatun/library/Makefile.am.orig Mon Sep 16 09:14:52 2002
+++ noatun/library/Makefile.am
@@ -9,9 +9,9 @@
@@ -9,9 +9,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
SUBDIRS=noatunarts noatun . noatuntags
@ -14,7 +14,7 @@ $NetBSD: patch-ba,v 1.3 2002/10/03 11:21:29 markd Exp $
playlist.cpp pref.cpp \
player.cpp playlistsaver.cpp app.cpp \
pluginloader.cpp plugin.cpp \
@@ -22,14 +22,14 @@
@@ -23,14 +23,14 @@ libnoatun_la_SOURCES = pluginmodule.cpp
include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h
@ -22,13 +22,14 @@ $NetBSD: patch-ba,v 1.3 2002/10/03 11:21:29 markd Exp $
+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)
-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG)
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp

115
audio/kdemultimedia3/patches/patch-bb
View file

@ -1,8 +1,8 @@
$NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
$NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
--- noatun/library/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/library/Makefile.in.orig Fri Jan 17 08:49:41 2003
+++ noatun/library/Makefile.in
@@ -300,9 +300,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
@@ -336,9 +336,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
SUBDIRS = noatunarts noatun . noatuntags
@ -14,7 +14,7 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
playlist.cpp pref.cpp \
player.cpp playlistsaver.cpp app.cpp \
pluginloader.cpp plugin.cpp \
@@ -314,15 +314,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp
@@ -351,15 +351,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp
include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h
@ -30,10 +30,10 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
$(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)
-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG)
@@ -344,26 +344,27 @@ CONFIG_HEADER = $(top_builddir)/config.h
@@ -381,27 +381,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@ -49,7 +49,8 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
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
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
@ -60,8 +61,8 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
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\
plugin_deps.moc.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)
@ -69,16 +70,16 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
libnoatuncontrols_la_DEPENDENCIES =
am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo
#>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS)
@@ -403,7 +404,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
#>- @AMDEP_TRUE@ $(DEPDIR)/scrollinglabel.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/stereobuttonaction.Plo
#>+ 29
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_core_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/controls.Plo $(DEPDIR)/conversion.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/downloader.Plo $(DEPDIR)/effects.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/effectview.Plo $(DEPDIR)/engine.Plo \
@@ -451,8 +452,8 @@ CXXLD = $(CXX)
@@ -444,7 +445,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 \
@@ -498,8 +499,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
@ -89,7 +90,7 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
DATA = $(magictable_DATA)
HEADERS = $(include_HEADERS)
@@ -464,7 +465,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
@@ -511,7 +512,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@ -98,10 +99,10 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
#>- all: all-recursive
#>+ 1
@@ -511,8 +512,8 @@ uninstall-libLTLIBRARIES:
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@@ -556,8 +557,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)
@ -109,29 +110,29 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS)
@@ -704,7 +705,7 @@ distclean-tags:
@@ -768,7 +769,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=fft.c pluginmodule.h noatunlistview.h video.cpp fft.h
+KDE_DIST=video.cpp fft.h noatunlistview.h pluginmodule.h fft.c
-KDE_DIST=fft.c globalvideo.h pluginmodule.h noatunlistview.h fft.h
+KDE_DIST=fft.h noatunlistview.h pluginmodule.h globalvideo.h fft.c
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -846,32 +847,32 @@ magictable: gentable
@@ -916,28 +917,28 @@ magictable: gentable
.NOEXPORT:
#>+ 3
-plugin_deps.moc.cpp: $(srcdir)/plugin_deps.h
- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc.cpp
-plugin_deps.moc: $(srcdir)/plugin_deps.h
- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
+equalizerview.moc: $(srcdir)/equalizerview.h
+ $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
#>+ 3
-mimetypetree.moc: $(srcdir)/mimetypetree.h
- $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
+plugin_deps.moc.cpp: $(srcdir)/plugin_deps.h
+ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc.cpp
+plugin_deps.moc: $(srcdir)/plugin_deps.h
+ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
#>+ 3
-effectview.moc: $(srcdir)/effectview.h
@ -155,26 +156,30 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
+effectview.moc: $(srcdir)/effectview.h
+ $(MOC) $(srcdir)/effectview.h -o effectview.moc
#>+ 3
globalvideo.moc: $(srcdir)/globalvideo.h
@@ -945,7 +946,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
#>+ 3
clean-metasources:
- -rm -f plugin_deps.moc.cpp mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc
+ -rm -f equalizerview.moc plugin_deps.moc.cpp cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc
- -rm -f plugin_deps.moc mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc globalvideo.moc
+ -rm -f equalizerview.moc plugin_deps.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc globalvideo.moc
#>+ 2
docs-am:
@@ -884,16 +885,16 @@ force-reedit:
@@ -958,16 +959,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 plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc
-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp plugin_deps.moc mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc globalvideo.moc
- @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 plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc
+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 plugin_deps.moc.cpp ; do \
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; \
@ -186,13 +191,13 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
+ 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 plugin_deps.moc.cpp
@@ -921,20 +922,20 @@ gentable.all_cpp.cpp: $(srcdir)/Makefile
libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp
@@ -983,20 +984,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
#>+ 3
clean-final:
- -rm -f libnoatun_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp gentable.all_cpp.cpp
+ -rm -f libnoatun_core_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp gentable.all_cpp.cpp
- -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:
@ -213,23 +218,31 @@ $NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -944,13 +945,13 @@ kde-rpo-clean:
@@ -1006,17 +1007,17 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 11
-cmodule.o: cmodule.moc
#>+ 15
-mimetypetree.o: mimetypetree.moc
-effectview.lo: effectview.moc
equalizerview.lo: equalizerview.moc
-equalizerview.o: equalizerview.moc
-effectview.o: effectview.moc
-mimetypetree.lo: mimetypetree.moc
+cmodule.o: cmodule.moc
-video.lo: globalvideo.moc
+equalizerview.lo: equalizerview.moc
pluginmodule.lo: pluginmodule.moc
video.o: globalvideo.moc
-plugin.lo: plugin_deps.moc
-cmodule.o: cmodule.moc
-equalizerview.lo: equalizerview.moc
-plugin.o: plugin_deps.moc
-mimetypetree.lo: mimetypetree.moc
cmodule.lo: cmodule.moc
+video.lo: globalvideo.moc
+effectview.o: effectview.moc
pluginmodule.o: pluginmodule.moc
+effectview.lo: effectview.moc
+mimetypetree.o: mimetypetree.moc
+plugin.o: plugin_deps.moc
+equalizerview.o: equalizerview.moc
+cmodule.o: cmodule.moc
+mimetypetree.o: mimetypetree.moc
+effectview.lo: effectview.moc
+mimetypetree.lo: mimetypetree.moc
+plugin.lo: plugin_deps.moc

12
audio/kdemultimedia3/patches/patch-bh
View file

@ -1,8 +1,8 @@
$NetBSD: patch-bh,v 1.2 2003/01/02 09:12:22 skrll Exp $
$NetBSD: patch-bh,v 1.3 2003/03/11 13:33:55 markd Exp $
--- noatun/modules/excellent/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/excellent/Makefile.in.orig Fri Jan 17 08:49:42 2003
+++ noatun/modules/excellent/Makefile.in
@@ -297,7 +297,7 @@ noatun_excellent_la_SOURCES = noatunui.c
@@ -333,7 +333,7 @@ noatun_excellent_la_SOURCES = noatunui.c
noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatun_excellent_la_LIBADD = $(LIB_KFILE) \
@ -11,7 +11,7 @@ $NetBSD: patch-bh,v 1.2 2003/01/02 09:12:22 skrll Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la \
-lqtmcop -lkmedia2_idl -lsoundserver_idl
@@ -314,7 +314,7 @@ CONFIG_CLEAN_FILES =
@@ -350,7 +350,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_excellent_la_DEPENDENCIES = \
@ -20,8 +20,8 @@ $NetBSD: patch-bh,v 1.2 2003/01/02 09:12:22 skrll Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la
am_noatun_excellent_la_OBJECTS = noatunui.lo userinterface.lo
#>- noatun_excellent_la_OBJECTS = $(am_noatun_excellent_la_OBJECTS)
@@ -499,7 +499,7 @@ distclean-tags:
@@ -546,7 +546,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=excellentui.rc excellent.plugin

18
audio/kdemultimedia3/patches/patch-bn
View file

@ -1,8 +1,8 @@
$NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $
$NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
--- noatun/modules/kaiman/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/kaiman/Makefile.in.orig Fri Jan 17 08:49:42 2003
+++ noatun/modules/kaiman/Makefile.in
@@ -300,7 +300,7 @@ noatun_kaiman_la_SOURCES = \
@@ -336,7 +336,7 @@ noatun_kaiman_la_SOURCES = \
noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@ -11,7 +11,7 @@ $NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
@@ -320,7 +320,7 @@ CONFIG_CLEAN_FILES =
@@ -356,7 +356,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kaiman_la_DEPENDENCIES = \
@ -20,8 +20,8 @@ $NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $
am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \
pref.lo
#>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS)
@@ -574,7 +574,7 @@ distclean-tags:
@@ -621,7 +621,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kaiman.plugin kaimanui.rc SKIN-SPECS
@ -29,7 +29,7 @@ $NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -725,20 +725,20 @@ noatun_kaiman.la.closure: $(noatun_kaima
@@ -778,20 +778,20 @@ noatun_kaiman.la.closure: $(noatun_kaima
#>+ 3
@ -55,7 +55,7 @@ $NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $
#>+ 3
clean-closures:
@@ -755,7 +755,7 @@ force-reedit:
@@ -808,7 +808,7 @@ force-reedit:
#>+ 11
@ -64,7 +64,7 @@ $NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $
@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; \
@@ -791,9 +791,9 @@ kde-rpo-clean:
@@ -844,9 +844,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7

8
audio/kdemultimedia3/patches/patch-bq
View file

@ -1,9 +1,9 @@
$NetBSD: patch-bq,v 1.1 2002/06/25 06:34:37 skrll Exp $
$NetBSD: patch-bq,v 1.2 2003/03/11 13:33:55 markd Exp $
--- noatun/modules/kjofol-skin/Makefile.am.orig Wed May 8 19:29:29 2002
--- noatun/modules/kjofol-skin/Makefile.am.orig Tue Jul 2 06:59:17 2002
+++ noatun/modules/kjofol-skin/Makefile.am
@@ -13,7 +13,7 @@
noatunui.cpp parser.cpp kjprefs.cpp kjprefswidget.ui
@@ -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 \

75
audio/kdemultimedia3/patches/patch-br
View file

@ -1,8 +1,8 @@
$NetBSD: patch-br,v 1.2 2003/01/02 09:12:22 skrll Exp $
$NetBSD: patch-br,v 1.3 2003/03/11 13:33:55 markd Exp $
--- noatun/modules/kjofol-skin/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/kjofol-skin/Makefile.in.orig Fri Jan 17 08:49:42 2003
+++ noatun/modules/kjofol-skin/Makefile.in
@@ -310,7 +310,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
@@ -348,7 +348,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@ -11,7 +11,7 @@ $NetBSD: patch-br,v 1.2 2003/01/02 09:12:22 skrll Exp $
$(LIB_KIO) -lm \
$(top_builddir)/arts/modules/libartsmodules.la
@@ -331,7 +331,7 @@ CONFIG_CLEAN_FILES =
@@ -369,7 +369,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kjofol_la_DEPENDENCIES = \
@ -20,17 +20,17 @@ $NetBSD: patch-br,v 1.2 2003/01/02 09:12:22 skrll Exp $
$(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 \
@@ -612,7 +612,7 @@ distclean-tags:
@@ -664,7 +664,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=helpers.cpp kjfont.cpp kjprefs.cpp kjofolui.plugin kjsliders.cpp parser.cpp noatunui.cpp kjequalizer.cpp kjbackground.cpp kjprefswidget.ui kjvis.cpp kjtextdisplay.cpp
+KDE_DIST=kjprefswidget.ui kjtextdisplay.cpp parser.cpp kjsliders.cpp kjfont.cpp kjbackground.cpp kjvis.cpp kjequalizer.cpp kjofolui.plugin kjprefs.cpp noatunui.cpp helpers.cpp
-KDE_DIST=helpers.cpp kjfont.cpp kjprefs.cpp kjofolui.plugin kjskinselectorwidget.ui kjsliders.cpp parser.cpp noatunui.cpp kjequalizer.cpp kjbackground.cpp kjguisettingswidget.ui kjvis.cpp kjtextdisplay.cpp
+KDE_DIST=kjtextdisplay.cpp parser.cpp kjsliders.cpp kjbackground.cpp kjvis.cpp kjequalizer.cpp kjskinselectorwidget.ui kjofolui.plugin kjprefs.cpp noatunui.cpp helpers.cpp kjfont.cpp kjguisettingswidget.ui
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -778,24 +778,24 @@ kjprefswidget.moc: kjprefswidget.h
$(MOC) kjprefswidget.h -o kjprefswidget.moc
@@ -849,24 +849,24 @@ kjguisettingswidget.moc: kjguisettingswi
$(MOC) kjguisettingswidget.h -o kjguisettingswidget.moc
#>+ 3
-kjequalizer.moc: $(srcdir)/kjequalizer.h
@ -61,54 +61,55 @@ $NetBSD: patch-br,v 1.2 2003/01/02 09:12:22 skrll Exp $
- -rm -f kjequalizer.moc kjloader.moc kjtextdisplay.moc kjprefs.moc
+ -rm -f kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc
#>+ 4
#>+ 5
clean-ui:
@@ -817,7 +817,7 @@ force-reedit:
@@ -889,7 +889,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 kjprefswidget.cpp kjloader.moc kjequalizer.moc kjprefswidget.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 kjprefswidget.cpp kjtextdisplay.moc kjequalizer.moc kjprefswidget.moc kjprefs.moc kjloader.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 kjloader.moc kjequalizer.moc kjskinselectorwidget.moc kjguisettingswidget.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; \
@@ -853,24 +853,24 @@ kde-rpo-clean:
@@ -925,24 +925,24 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 22
-kjloader.lo: kjloader.moc
-kjequalizer.o: kjequalizer.moc
-$(srcdir)/kjvis.cpp: kjprefswidget.h
-$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-kjprefs.lo: kjprefs.moc
-$(srcdir)/kjprefs.cpp: kjprefswidget.h
-$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
kjprefs.o: kjprefs.moc
-$(srcdir)/kjfont.cpp: kjprefswidget.h
-$(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-kjtextdisplay.lo: kjtextdisplay.moc
-$(srcdir)/noatunui.cpp: kjprefswidget.h
+$(srcdir)/kjtextdisplay.cpp: kjprefswidget.h
+$(srcdir)/kjseeker.cpp: kjprefswidget.h
+$(srcdir)/kjloader.cpp: kjprefswidget.h
-$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(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: kjprefswidget.h
-$(srcdir)/kjequalizer.cpp: kjprefswidget.h
+$(srcdir)/kjprefs.cpp: kjprefswidget.h
$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjtextdisplay.lo: kjtextdisplay.moc
+$(srcdir)/kjvis.cpp: kjprefswidget.h
+$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjloader.lo: kjloader.moc
$(srcdir)/parser.cpp: kjprefswidget.h
-$(srcdir)/kjloader.cpp: kjprefswidget.h
$(srcdir)/kjwidget.cpp: kjprefswidget.h
-$(srcdir)/kjbackground.cpp: kjprefswidget.h
$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjloader.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h
$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-kjloader.o: kjloader.moc
-$(srcdir)/kjtextdisplay.cpp: kjprefswidget.h
+$(srcdir)/kjfont.cpp: kjprefswidget.h
-$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/kjsliders.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjequalizer.o: kjequalizer.moc
+$(srcdir)/kjequalizer.cpp: kjprefswidget.h
$(srcdir)/kjsliders.cpp: kjprefswidget.h
+$(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h
kjtextdisplay.o: kjtextdisplay.moc
-kjequalizer.lo: kjequalizer.moc
-$(srcdir)/kjseeker.cpp: kjprefswidget.h
+$(srcdir)/kjbackground.cpp: kjprefswidget.h
+$(srcdir)/noatunui.cpp: kjprefswidget.h
-$(srcdir)/kjseeker.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(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

22
audio/kdemultimedia3/patches/patch-cd
View file

@ -1,8 +1,8 @@
$NetBSD: patch-cd,v 1.2 2003/01/02 09:12:23 skrll Exp $
$NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
--- noatun/modules/splitplaylist/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/splitplaylist/Makefile.in.orig Fri Jan 17 08:49:42 2003
+++ noatun/modules/splitplaylist/Makefile.in
@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_splitpla
@@ -330,7 +330,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
@ -11,7 +11,7 @@ $NetBSD: patch-cd,v 1.2 2003/01/02 09:12:23 skrll Exp $
#>- noatun_splitplaylist_la_METASOURCES = AUTO
@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES =
@@ -347,7 +347,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_splitplaylist_la_DEPENDENCIES = \
@ -20,16 +20,16 @@ $NetBSD: patch-cd,v 1.2 2003/01/02 09:12:23 skrll Exp $
am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \
view.lo find.lo
#>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS)
@@ -496,7 +496,7 @@ distclean-tags:
@@ -564,7 +564,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=LICENSE splitplaylist.plugin
+KDE_DIST=splitplaylist.plugin LICENSE
-KDE_DIST=splui.rc LICENSE splitplaylist.plugin
+KDE_DIST=splitplaylist.plugin LICENSE splui.rc
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -626,20 +626,20 @@ noatun_splitplaylist.la.closure: $(noatu
@@ -703,20 +703,20 @@ noatun_splitplaylist.la.closure: $(noatu
#>+ 3
@ -55,7 +55,7 @@ $NetBSD: patch-cd,v 1.2 2003/01/02 09:12:23 skrll Exp $
#>+ 3
clean-closures:
@@ -656,7 +656,7 @@ force-reedit:
@@ -733,7 +733,7 @@ force-reedit:
#>+ 11
@ -64,7 +64,7 @@ $NetBSD: patch-cd,v 1.2 2003/01/02 09:12:23 skrll Exp $
@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; \
@@ -692,9 +692,9 @@ kde-rpo-clean:
@@ -769,9 +769,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7

22
audio/kdemultimedia3/patches/patch-cf
View file

@ -1,8 +1,8 @@
$NetBSD: patch-cf,v 1.2 2003/01/02 09:12:23 skrll Exp $
$NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
--- noatun/modules/systray/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/systray/Makefile.in.orig Fri Jan 17 08:49:42 2003
+++ noatun/modules/systray/Makefile.in
@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_systray.
@@ -330,7 +330,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
@ -11,7 +11,7 @@ $NetBSD: patch-cf,v 1.2 2003/01/02 09:12:23 skrll Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
@@ -313,7 +313,7 @@ CONFIG_CLEAN_FILES =
@@ -349,7 +349,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_systray_la_DEPENDENCIES = \
@ -20,16 +20,16 @@ $NetBSD: patch-cf,v 1.2 2003/01/02 09:12:23 skrll Exp $
am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \
cmodule.lo
#>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS)
@@ -504,7 +504,7 @@ distclean-tags:
@@ -551,7 +551,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=hi16-action-noatuntray.png hi16-action-noatuntraypause.png hi16-action-noatuntrayplay.png systray.plugin systrayui.rc hi16-action-noatuntraystop.png
+KDE_DIST=hi16-action-noatuntrayplay.png systray.plugin hi16-action-noatuntraystop.png hi16-action-noatuntray.png hi16-action-noatuntraypause.png systrayui.rc
-KDE_DIST=cr16-action-noatuntrayplay.png cr16-action-noatuntray.png systray.plugin systrayui.rc cr16-action-noatuntraystop.png cr16-action-noatuntraypause.png
+KDE_DIST=cr16-action-noatuntrayplay.png 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)
@@ -637,20 +637,20 @@ noatun_systray.la.closure: $(noatun_syst
@@ -690,20 +690,20 @@ noatun_systray.la.closure: $(noatun_syst
#>+ 3
@ -55,7 +55,7 @@ $NetBSD: patch-cf,v 1.2 2003/01/02 09:12:23 skrll Exp $
#>+ 3
clean-closures:
@@ -681,7 +681,7 @@ force-reedit:
@@ -734,7 +734,7 @@ force-reedit:
#>+ 11
@ -64,7 +64,7 @@ $NetBSD: patch-cf,v 1.2 2003/01/02 09:12:23 skrll Exp $
@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; \
@@ -717,9 +717,9 @@ kde-rpo-clean:
@@ -770,9 +770,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7

8
audio/kdemultimedia3/patches/patch-ci
View file

@ -1,13 +1,13 @@
$NetBSD: patch-ci,v 1.1 2002/06/25 06:34:42 skrll Exp $
$NetBSD: patch-ci,v 1.2 2003/03/11 13:33:56 markd Exp $
--- noatun/modules/winskin/Makefile.am.orig Wed May 8 19:29:31 2002
--- noatun/modules/winskin/Makefile.am.orig Sun Oct 27 11:20:56 2002
+++ noatun/modules/winskin/Makefile.am
@@ -61,7 +61,7 @@
@@ -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 \
$(WINSKINVIS_LIB)
$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
noatun_winskin_la_METASOURCES = AUTO

114
audio/kdemultimedia3/patches/patch-cj
View file

@ -1,17 +1,17 @@
$NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $
$NetBSD: patch-cj,v 1.3 2003/03/11 13:33:56 markd Exp $
--- noatun/modules/winskin/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/winskin/Makefile.in.orig Fri Jan 17 08:49:42 2003
+++ noatun/modules/winskin/Makefile.in
@@ -344,7 +344,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
@@ -393,7 +393,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 \
$(WINSKINVIS_LIB)
$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
@@ -356,7 +356,7 @@ CONFIG_CLEAN_FILES =
@@ -405,7 +405,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_winskin_la_DEPENDENCIES = \
@ -20,21 +20,21 @@ $NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $
$(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 \
@@ -673,7 +673,7 @@ distclean-tags:
@@ -748,7 +748,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=skinMap.h waSkin.h winskin.plugin waRegion.h waMain.h waInfo.h waJumpSlider.h guiSpectrumAnalyser.h waWidget.h waColor.h winSkinVis.h fileInfo.h waTitleBar.h waLabel.h waSkinMapping.h winSkinConfig.h waBalanceSlider.h waStatus.h waClutterbar.h waIndicator.h waVolumeSlider.h waDigit.h waSkins.h waSkinModel.h waSlider.h waButton.h waShadeMapping.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 waSkins.h waMain.h waInfo.h waRegion.h waSkinModel.h waSkinMapping.h skinMap.h waJumpSlider.h waIndicator.h waSkin.h waVolumeSlider.h waColor.h waTitleBar.h waButton.h guiSpectrumAnalyser.h
-KDE_DIST=skinMap.h waJumpSlider.cpp waIndicator.cpp waSkinManager.h waInfo.cpp waSkin.h guiSpectrumAnalyser.cpp winskin.plugin waClutterbar.cpp waRegion.h waSkinManager.cpp waColor.cpp waMain.h waButton.cpp waBalanceSlider.cpp waVolumeSlider.cpp waSkin.cpp waInfo.h waJumpSlider.h waDigit.cpp guiSpectrumAnalyser.h waWidget.h plugin.cpp waColor.h winSkinVis.h fileInfo.h waTitleBar.h waLabel.h waWidget.cpp waSkinModel.cpp winSkinVis.cpp waSkinMapping.h winSkinConfig.h waBalanceSlider.h waStatus.cpp waStatus.h waClutterbar.h waIndicator.h waVolumeSlider.h waTitleBar.cpp waMain.cpp waDigit.h waLabel.cpp waSkins.h waSkinModel.h waSlider.h winSkinConfig.cpp waRegion.cpp waButton.h waShadeMapping.h waSlider.cpp
+KDE_DIST=winSkinConfig.h waClutterbar.h waBalanceSlider.h waTitleBar.cpp waMain.cpp waDigit.h waVolumeSlider.cpp waIndicator.cpp waStatus.h winSkinVis.h waDigit.cpp waJumpSlider.cpp waLabel.h waSlider.h fileInfo.h waWidget.h winskin.plugin waLabel.cpp waColor.cpp waShadeMapping.h waSkinManager.cpp waStatus.cpp waSkins.h waMain.h waInfo.h guiSpectrumAnalyser.cpp waWidget.cpp waRegion.h waSkinModel.h winSkinConfig.cpp waSkinMapping.h skinMap.h winSkinVis.cpp waRegion.cpp waJumpSlider.h waIndicator.h plugin.cpp waSkin.h waVolumeSlider.h waButton.cpp waSkinModel.cpp waColor.h waSkinManager.h waClutterbar.cpp waTitleBar.h waInfo.cpp waButton.h waSlider.cpp guiSpectrumAnalyser.h waBalanceSlider.cpp waSkin.cpp
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -824,84 +824,84 @@ noatun_winskin.la.closure: $(noatun_wins
@@ -911,88 +911,88 @@ noatun_winskin.la.closure: $(noatun_wins
#>+ 3
-waClutterbar.moc.cpp: $(srcdir)/waClutterbar.h
- $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc.cpp
-waClutterbar.moc: $(srcdir)/waClutterbar.h
- $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc
-
-#>+ 3
waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h
@ -101,89 +101,103 @@ $NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $
#>+ 3
-waInfo.moc: $(srcdir)/waInfo.h
- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc
+waClutterbar.moc.cpp: $(srcdir)/waClutterbar.h
+ $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc.cpp
+waClutterbar.moc: $(srcdir)/waClutterbar.h
+ $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc
#>+ 3
-waDigit.moc: $(srcdir)/waDigit.h
- $(MOC) $(srcdir)/waDigit.h -o waDigit.moc
+waJumpSlider.moc: $(srcdir)/waJumpSlider.h
+ $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
+
+#>+ 3
+waMain.moc: $(srcdir)/waMain.h
+ $(MOC) $(srcdir)/waMain.h -o waMain.moc
+
+#>+ 3
+waLabel.moc: $(srcdir)/waLabel.h
+ $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
#>+ 3
winSkinVis.moc: $(srcdir)/winSkinVis.h
$(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
-winSkinVis.moc: $(srcdir)/winSkinVis.h
- $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
+waMain.moc: $(srcdir)/waMain.h
+ $(MOC) $(srcdir)/waMain.h -o waMain.moc
#>+ 3
-waSkinModel.moc: $(srcdir)/waSkinModel.h
- $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
+waIndicator.moc: $(srcdir)/waIndicator.h
+ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+waLabel.moc: $(srcdir)/waLabel.h
+ $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
#>+ 3
waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
$(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
-waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
- $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
+winSkinVis.moc: $(srcdir)/winSkinVis.h
+ $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
#>+ 3
-waTitleBar.moc: $(srcdir)/waTitleBar.h
- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
-
-#>+ 3
+waSkinManager.moc: $(srcdir)/waSkinManager.h
+ $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
#>+ 3
-waStatus.moc: $(srcdir)/waStatus.h
- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+waIndicator.moc: $(srcdir)/waIndicator.h
+ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
#>+ 3
-waSkinManager.moc: $(srcdir)/waSkinManager.h
- $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
+waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
+ $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
+
+#>+ 3
+waSkinModel.moc: $(srcdir)/waSkinModel.h
+ $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
#>+ 3
clean-metasources:
- -rm -f waClutterbar.moc.cpp waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc waButton.moc guiSpectrumAnalyser.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.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.cpp waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc
- -rm -f waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc waButton.moc guiSpectrumAnalyser.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.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
#>+ 3
clean-closures:
@@ -918,7 +918,7 @@ force-reedit:
#>+ 4
clean-idl:
@@ -1014,7 +1014,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 waClutterbar.moc.cpp waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc waButton.moc guiSpectrumAnalyser.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.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 waClutterbar.moc.cpp waVolumeSlider.moc winSkinConfig.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.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 waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc waButton.moc guiSpectrumAnalyser.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.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; \
@@ -954,39 +954,39 @@ kde-rpo-clean:
@@ -1050,43 +1050,43 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 37
#>+ 41
-waSkin.o: waSkin.moc
-waIndicator.lo: waIndicator.moc
-waInfo.lo: waInfo.moc
+waWidget.lo: waWidget.moc
+guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc
+guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc
+winSkinConfig.o: winSkinConfig.moc
waMain.lo: waMain.moc
+winSkinConfig.lo: winSkinConfig.moc
waBalanceSlider.o: waBalanceSlider.moc
-waMain.lo: waMain.moc
-waBalanceSlider.o: waBalanceSlider.moc
-winSkinVis.o: winSkinVis.moc
-winSkinConfig.o: winSkinConfig.moc
-waDigit.lo: waDigit.moc
-waSkinManager.lo: waSkinManager.moc
-waTitleBar.lo: waTitleBar.moc
-guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc
-waInfo.o: waInfo.moc
-waTitleBar.o: waTitleBar.moc
-waWidget.lo: waWidget.moc
+waClutterbar.lo: waClutterbar.moc
waWidget.lo: waWidget.moc
-waButton.lo: waButton.moc
-waButton.o: waButton.moc
+guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc
+guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc
waClutterbar.o: waClutterbar.moc
-waSkin.lo: waSkin.moc
-waWidget.o: waWidget.moc
-waSkinManager.o: waSkinManager.moc
+winSkinConfig.o: winSkinConfig.moc
+waMain.lo: waMain.moc
+winSkinConfig.lo: winSkinConfig.moc
+waSkinManager.lo: waSkinManager.moc
+waBalanceSlider.o: waBalanceSlider.moc
+waInfo.lo: waInfo.moc
+waSkinModel.lo: waSkinModel.moc
waDigit.o: waDigit.moc
@ -192,13 +206,14 @@ $NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $
waStatus.o: waStatus.moc
-guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc
-waJumpSlider.o: waJumpSlider.moc
-waClutterbar.lo: waClutterbar.moc
+waJumpSlider.lo: waJumpSlider.moc
+waLabel.o: waLabel.moc
waSlider.o: waSlider.moc
-waBalanceSlider.lo: waBalanceSlider.moc
+waWidget.o: waWidget.moc
+waButton.lo: waButton.moc
waMain.o: waMain.moc
-waBalanceSlider.lo: waBalanceSlider.moc
+waInfo.o: waInfo.moc
+waDigit.lo: waDigit.moc
+waSkinModel.o: waSkinModel.moc
@ -208,9 +223,9 @@ $NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $
waVolumeSlider.lo: waVolumeSlider.moc
-waJumpSlider.lo: waJumpSlider.moc
-waSlider.lo: waSlider.moc
+waJumpSlider.o: waJumpSlider.moc
waIndicator.o: waIndicator.moc
-waSkinModel.lo: waSkinModel.moc
+waJumpSlider.o: waJumpSlider.moc
+waBalanceSlider.lo: waBalanceSlider.moc
+waSkin.o: waSkin.moc
+waVolumeSlider.o: waVolumeSlider.moc
@ -221,6 +236,7 @@ $NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $
-winSkinConfig.lo: winSkinConfig.moc
-waVolumeSlider.o: waVolumeSlider.moc
-waSkinModel.o: waSkinModel.moc
+waSkinManager.o: waSkinManager.moc
+waTitleBar.o: waTitleBar.moc
+waSlider.lo: waSlider.moc
+waButton.o: waButton.moc

16
audio/kdemultimedia3/patches/patch-cn
View file

@ -1,17 +1,17 @@
$NetBSD: patch-cn,v 1.2 2003/01/02 09:12:23 skrll Exp $
$NetBSD: patch-cn,v 1.3 2003/03/11 13:33:56 markd Exp $
--- noatun/modules/artseffects/Makefile.in.orig Sat Dec 28 14:04:00 2002
--- noatun/modules/artseffects/Makefile.in.orig Fri Jan 17 08:49:41 2003
+++ noatun/modules/artseffects/Makefile.in
@@ -296,7 +296,7 @@ libartseffects_la_SOURCES = artseffects.
@@ -332,7 +332,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
#libartseffectsui_la_SOURCES = artseffects.cc
@@ -315,7 +315,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
mcoptypedir = $(libdir)/mcop
mcoptype_DATA = artseffects.mcoptype artseffects.mcopclass
@@ -345,7 +345,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@ -21,8 +21,8 @@ $NetBSD: patch-cn,v 1.2 2003/01/02 09:12:23 skrll Exp $
am_libartseffects_la_OBJECTS = artseffects.lo extrastereo_impl.lo
#>- libartseffects_la_OBJECTS = $(am_libartseffects_la_OBJECTS)
#>+ 4
@@ -516,7 +517,7 @@ distclean-tags:
@@ -556,7 +557,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=artseffects.mcoptype effect.cpp artseffects.idl artseffects.h VoiceRemoval.mcopclass RawWriter.mcopclass artseffects.mcopclass ExtraStereo.mcopclass ExtraStereoGuiFactory.mcopclass extrastereogui_impl.cc extrastereogui_impl.h

13
audio/kdemultimedia3/patches/patch-cp Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-cp,v 1.1 2003/03/11 13:33:56 markd 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

50
audio/kdemultimedia3/patches/patch-cq Normal file
View file

@ -0,0 +1,50 @@
$NetBSD: patch-cq,v 1.1 2003/03/11 13:33:56 markd Exp $
--- noatun/modules/simple/Makefile.in.orig Thu Feb 6 16:22:53 2003
+++ noatun/modules/simple/Makefile.in
@@ -332,7 +332,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
@@ -349,7 +349,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)
@@ -545,7 +545,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=play.xpm pause.xpm simple.plugin propertiesdialog.ui propertiesdialog.ui.h back.xpm forward.xpm stop.xpm eject.xpm
+KDE_DIST=pause.xpm stop.xpm back.xpm propertiesdialog.ui.h simple.plugin forward.xpm propertiesdialog.ui play.xpm eject.xpm
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -723,7 +723,7 @@ force-reedit:
#>+ 11
-noatunsimple_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp propertiesdialog.cpp propertiesdialog.moc userinterface.moc
+noatunsimple_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp $(srcdir)/propertiesdialog.cpp userinterface.moc propertiesdialog.moc
@echo 'creating noatunsimple_la.all_cpp.cpp ...'; \
rm -f noatunsimple_la.all_cpp.files noatunsimple_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatunsimple_la.all_cpp.final; \
@@ -759,7 +759,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-userinterface.o: userinterface.moc
+$(srcdir)/noatunui.cpp: propertiesdialog.h
$(srcdir)/userinterface.cpp: propertiesdialog.h
+userinterface.o: userinterface.moc
userinterface.lo: userinterface.moc
-$(srcdir)/noatunui.cpp: propertiesdialog.h