From 9c90642eaa62eb51a70aef2bdd05c52bee0e8d1b Mon Sep 17 00:00:00 2001 From: markd Date: Sat, 21 Aug 2004 14:44:47 +0000 Subject: Update to KDE 3.3 Changes: * aRts o JACK output plugin Zack Rusin, Matthias Kretz * aKode o akodelib: New multithreaded audio (de/en)coding library Allan Sandfeld Jensen o akodelib: Plugins for MPEG-audio, Ogg/Vorbis, FLAC, Ogg/FLAC and Musepack decoding Allan Sandfeld Jensen o akodelib: Support for external encoding and output plugins Allan Sandfeld Jensen o akodelib_artsplugin: aRts-plugin that uses the akode-decoding plugins Allan Sandfeld Jensen o akodelib_artsplugin: Support streaming aRts API, to enable streaming playback Allan Sandfeld Jensen * KRec o Update the documentation. Arnold Krille * JuK o Improved track announcement popup Michael Pyne o Add to K3B support for songs Michael Pyne o Improved DCOP support Michael Pyne o Drag and drop retagging of songs Michael Pyne o Quickly play songs from the Search Bar Michael Pyne o Album random play Michael Pyne * KFilePlugins o New plugin for C64 PSID music files Rolf Magnus --- multimedia/kdemultimedia3/Makefile | 5 +- multimedia/kdemultimedia3/PLIST | 161 +++++++++++++++++++++++------ multimedia/kdemultimedia3/buildlink3.mk | 6 +- multimedia/kdemultimedia3/distinfo | 9 +- multimedia/kdemultimedia3/patches/patch-cx | 19 ---- multimedia/kdemultimedia3/patches/patch-cy | 17 --- multimedia/kdemultimedia3/patches/patch-cz | 15 --- 7 files changed, 141 insertions(+), 91 deletions(-) delete mode 100644 multimedia/kdemultimedia3/patches/patch-cx delete mode 100644 multimedia/kdemultimedia3/patches/patch-cy delete mode 100644 multimedia/kdemultimedia3/patches/patch-cz (limited to 'multimedia') diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 500f809f0b8..0304a9196d8 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/07/02 15:10:56 drochner Exp $ +# $NetBSD: Makefile,v 1.15 2004/08/21 14:44:47 markd Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} CATEGORIES= multimedia @@ -7,7 +7,6 @@ COMMENT= Multimedia tools for the KDE integrated X11 desktop .include "../../meta-pkgs/kde3/Makefile.kde3" DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts -DEPENDS+= trm>=0.2.1:../../audio/trm USE_BUILDLINK3= YES USE_DIRS+= xdg-1.1 @@ -45,7 +44,9 @@ PLIST_SUBST+= XV_SUFFIX="so" .include "../../meta-pkgs/kde3/kde3.mk" .include "../../audio/arts/buildlink3.mk" .include "../../audio/cdparanoia/buildlink3.mk" +.include "../../audio/lame/buildlink3.mk" .include "../../audio/musicbrainz/buildlink3.mk" +.include "../../audio/tunepimp/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST index 801fc8831e7..7742cadf43f 100644 --- a/multimedia/kdemultimedia3/PLIST +++ b/multimedia/kdemultimedia3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/04/20 13:13:42 markd Exp $ +@comment $NetBSD: PLIST,v 1.9 2004/08/21 14:44:47 markd Exp $ bin/artsbuilder bin/artscontrol bin/juk @@ -19,6 +19,26 @@ bin/yaf-splay bin/yaf-tplay bin/yaf-vorbis bin/yaf-yuv +etc/xdg/menus/applications-merged/kde-multimedia-music.menu +include/akode/akodelib.h +include/akode/audiobuffer.h +include/akode/audioconfiguration.h +include/akode/audioframe.h +include/akode/crossfader.h +include/akode/decoder.h +include/akode/encoder.h +include/akode/fast_resampler.h +include/akode/file.h +include/akode/framedecoder.h +include/akode/frametostream_decoder.h +include/akode/localfile.h +include/akode/mmapfile.h +include/akode/pluginhandler.h +include/akode/resampler.h +include/akode/sink.h +include/akode/streamdecoder.h +include/akode/streamtoframe_decoder.h +include/akode/wav_decoder.h include/arts/artsbuilder.h include/arts/artsbuilder.idl include/arts/artsgui.h @@ -40,6 +60,7 @@ include/arts/kframe_impl.h include/arts/klayoutbox_impl.h include/arts/kwidget_impl.h include/arts/kwidgetrepo.h +include/audiocdencoder.h include/cmodule.h include/effectview.h include/equalizerview.h @@ -50,8 +71,6 @@ include/libkcddb/cdinfo.h include/libkcddb/client.h include/libkcddb/config.h include/libkcddb/configbase.h -include/libwm/wm_cdrom.h -include/libwm/wm_cdtext.h include/mimetypetree.h include/mpeglib/decoder/cddaPlugin.h include/mpeglib/decoder/command.h @@ -158,8 +177,6 @@ lib/kde3/kcm_audiocd.la lib/kde3/kcm_audiocd.so lib/kde3/kcm_cddb.la lib/kde3/kcm_cddb.so -lib/kde3/kcm_kmix.la -lib/kde3/kcm_kmix.so lib/kde3/kcm_krec.la lib/kde3/kcm_krec.so lib/kde3/kcm_krec_files.la @@ -176,6 +193,8 @@ lib/kde3/kfile_mp3.la lib/kde3/kfile_mp3.so lib/kde3/kfile_ogg.la lib/kde3/kfile_ogg.so +lib/kde3/kfile_sid.la +lib/kde3/kfile_sid.so lib/kde3/kfile_wav.la lib/kde3/kfile_wav.so lib/kde3/kio_audiocd.la @@ -188,10 +207,20 @@ lib/kde3/kmixctrl.la lib/kde3/kmixctrl.so lib/kde3/krec.la lib/kde3/krec.so +lib/kde3/libaudiocd_encoder_flac.la +lib/kde3/libaudiocd_encoder_flac.so +lib/kde3/libaudiocd_encoder_lame.la +lib/kde3/libaudiocd_encoder_lame.so +lib/kde3/libaudiocd_encoder_vorbis.la +lib/kde3/libaudiocd_encoder_vorbis.so +lib/kde3/libaudiocd_encoder_wav.la +lib/kde3/libaudiocd_encoder_wav.so lib/kde3/libkaboodlepart.la lib/kde3/libkaboodlepart.so lib/kde3/libkmidpart.la lib/kde3/libkmidpart.so +lib/kde3/libkrecexport_mp3.la +lib/kde3/libkrecexport_mp3.so lib/kde3/libkrecexport_ogg.la lib/kde3/libkrecexport_ogg.so lib/kde3/libkrecexport_wave.la @@ -234,6 +263,18 @@ lib/kde3/noatunsimple.la lib/kde3/noatunsimple.so lib/kde3/videothumbnail.la lib/kde3/videothumbnail.${XV_SUFFIX} +lib/libakode.la +lib/libakode.so +lib/libakode.so.1 +lib/libakode.so.1.0 +lib/libakode_mpc_decoder.la +lib/libakode_mpc_decoder.so +lib/libakode_mpeg_decoder.la +lib/libakode_mpeg_decoder.so +lib/libakode_xiph_decoder.la +lib/libakode_xiph_decoder.so +lib/libarts_akode.la +lib/libarts_akode.so ${XV_WORKAROUND}lib/libarts_mpeglib-0.3.0.so.0 ${XV_WORKAROUND}lib/libarts_mpeglib-0.3.0.so.0.3 lib/libarts_mpeglib.la @@ -298,6 +339,10 @@ lib/libartsmodulessynth.la lib/libartsmodulessynth.so lib/libartsmodulessynth.so.0 lib/libartsmodulessynth.so.0.0 +lib/libaudiocdplugins.la +lib/libaudiocdplugins.so +lib/libaudiocdplugins.so.1 +lib/libaudiocdplugins.so.1.0 lib/libaudiofilearts.la lib/libaudiofilearts.so lib/libkcddb.la @@ -335,10 +380,6 @@ lib/libnoatuntags.so.3 lib/libnoatuntags.so.3.0 lib/libwinskinvis.la lib/libwinskinvis.so -lib/libworkman.la -lib/libworkman.so -lib/libworkman.so.6 -lib/libworkman.so.6.0 lib/libyafcore.la lib/libyafcore.so lib/libyafcore.so.0 @@ -454,6 +495,14 @@ lib/mcop/RawWriter.mcopclass lib/mcop/SplayPlayObject.mcopclass lib/mcop/VoiceRemoval.mcopclass lib/mcop/WAVPlayObject.mcopclass +lib/mcop/akodeMPCPlayObject.mcopclass +lib/mcop/akodeMPEGPlayObject.mcopclass +lib/mcop/akodePlayObject.mcopclass +lib/mcop/akodeSpeexStreamPlayObject.mcopclass +lib/mcop/akodeVorbisStreamPlayObject.mcopclass +lib/mcop/akodeXiphPlayObject.mcopclass +lib/mcop/akodearts.mcopclass +lib/mcop/akodearts.mcoptype lib/mcop/artsbuilder.mcopclass lib/mcop/artsbuilder.mcoptype lib/mcop/artseffects.mcopclass @@ -478,7 +527,8 @@ lib/mcop/noatunarts.mcopclass lib/mcop/noatunarts.mcoptype lib/mcop/winskinvis.mcopclass lib/mcop/winskinvis.mcoptype -lib/mcop/xinePlayObject.mcopclass +lib/mcop/xineAudioPlayObject.mcopclass +lib/mcop/xineVideoPlayObject.mcopclass share/applications/kde/artsbuilder.desktop share/applications/kde/artscontrol.desktop share/applications/kde/audiocd.desktop @@ -487,11 +537,11 @@ share/applications/kde/kaboodle.desktop share/applications/kde/kaudiocreator.desktop share/applications/kde/kmid.desktop share/applications/kde/kmix.desktop -share/applications/kde/kmixcfg.desktop share/applications/kde/krec.desktop share/applications/kde/kscd.desktop share/applications/kde/libkcddb.desktop share/applications/kde/noatun.desktop +share/desktop-directories/kde-multimedia-music.directory share/doc/kde/HTML/en/artsbuilder/apis.docbook share/doc/kde/HTML/en/artsbuilder/arts-structure.png share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook @@ -559,8 +609,15 @@ 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/juk/common +share/doc/kde/HTML/en/juk/history-playlist.png share/doc/kde/HTML/en/juk/index.cache.bz2 share/doc/kde/HTML/en/juk/index.docbook +share/doc/kde/HTML/en/juk/juk-adv-search.png +share/doc/kde/HTML/en/juk/juk-file-renamer.png +share/doc/kde/HTML/en/juk/juk-main.png +share/doc/kde/HTML/en/juk/juk-tag-guesser.png +share/doc/kde/HTML/en/juk/normal-playlist.png +share/doc/kde/HTML/en/juk/search-playlist.png share/doc/kde/HTML/en/juk/toolbar.png share/doc/kde/HTML/en/kaboodle/common share/doc/kde/HTML/en/kaboodle/index.cache.bz2 @@ -577,7 +634,10 @@ 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-configuration.png share/doc/kde/HTML/en/krec/krec-hicolor.png +share/doc/kde/HTML/en/krec/krec-keramik.png +share/doc/kde/HTML/en/krec/krec-new_file_properties.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 @@ -586,18 +646,13 @@ share/doc/kde/HTML/en/kscd/kscd11.png share/doc/kde/HTML/en/kscd/kscd12.png share/doc/kde/HTML/en/kscd/kscd13.png share/doc/kde/HTML/en/kscd/kscd14.png -share/doc/kde/HTML/en/kscd/kscd15.png share/doc/kde/HTML/en/kscd/kscd16.png share/doc/kde/HTML/en/kscd/kscd18.png share/doc/kde/HTML/en/kscd/kscd19.png share/doc/kde/HTML/en/kscd/kscd2.png -share/doc/kde/HTML/en/kscd/kscd2a.png share/doc/kde/HTML/en/kscd/kscd3.png -share/doc/kde/HTML/en/kscd/kscd4.png share/doc/kde/HTML/en/kscd/kscd5.png share/doc/kde/HTML/en/kscd/kscd6.png -share/doc/kde/HTML/en/kscd/kscd7.png -share/doc/kde/HTML/en/kscd/kscd8.png share/doc/kde/HTML/en/kscd/kscd9.png share/doc/kde/HTML/en/noatun/common share/doc/kde/HTML/en/noatun/index.cache.bz2 @@ -698,11 +753,34 @@ 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/kappfinder/apps/Multimedia/ams.desktop +share/kde/apps/kappfinder/apps/Multimedia/amsynth.desktop +share/kde/apps/kappfinder/apps/Multimedia/ardour.desktop +share/kde/apps/kappfinder/apps/Multimedia/djplay.desktop +share/kde/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop +share/kde/apps/kappfinder/apps/Multimedia/freebirth.desktop +share/kde/apps/kappfinder/apps/Multimedia/freqtweak.desktop +share/kde/apps/kappfinder/apps/Multimedia/galan.desktop +share/kde/apps/kappfinder/apps/Multimedia/hydrogen.desktop +share/kde/apps/kappfinder/apps/Multimedia/jack-rack.desktop +share/kde/apps/kappfinder/apps/Multimedia/jamin.desktop +share/kde/apps/kappfinder/apps/Multimedia/meterbridge.desktop +share/kde/apps/kappfinder/apps/Multimedia/mixxx.desktop +share/kde/apps/kappfinder/apps/Multimedia/muse.desktop +share/kde/apps/kappfinder/apps/Multimedia/qjackctl.desktop +share/kde/apps/kappfinder/apps/Multimedia/qsynth.desktop +share/kde/apps/kappfinder/apps/Multimedia/vkeybd.desktop +share/kde/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop +share/kde/apps/kaudiocreator/eventsrc share/kde/apps/kaudiocreator/kaudiocreatorui.rc share/kde/apps/kaudiocreator/pics/check.png +share/kde/apps/kconf_update/audiocd.upd share/kde/apps/kconf_update/kaudiocreator-libkcddb.upd +share/kde/apps/kconf_update/kaudiocreator-meta.upd share/kde/apps/kconf_update/noatun.upd share/kde/apps/kconf_update/noatun20update +share/kde/apps/kconf_update/upgrade-kaudiocreator-metadata.sh +share/kde/apps/kconf_update/upgrade-metadata.sh share/kde/apps/kicker/applets/artscontrolapplet.desktop share/kde/apps/kicker/applets/kmixapplet.desktop share/kde/apps/kmid/DiesIrae.kar @@ -767,13 +845,18 @@ 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/crystalsvg/128x128/actions/equalizer.png +share/kde/apps/noatun/icons/crystalsvg/128x128/actions/playlist.png share/kde/apps/noatun/icons/crystalsvg/16x16/actions/effect.png +share/kde/apps/noatun/icons/crystalsvg/16x16/actions/equalizer.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/playlist.png +share/kde/apps/noatun/icons/crystalsvg/22x22/actions/equalizer.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 @@ -787,8 +870,15 @@ 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/22x22/actions/playlist.png share/kde/apps/noatun/icons/crystalsvg/32x32/actions/effect.png +share/kde/apps/noatun/icons/crystalsvg/32x32/actions/equalizer.png +share/kde/apps/noatun/icons/crystalsvg/32x32/actions/playlist.png share/kde/apps/noatun/icons/crystalsvg/48x48/actions/effect.png +share/kde/apps/noatun/icons/crystalsvg/48x48/actions/equalizer.png +share/kde/apps/noatun/icons/crystalsvg/48x48/actions/playlist.png +share/kde/apps/noatun/icons/crystalsvg/64x64/actions/equalizer.png +share/kde/apps/noatun/icons/crystalsvg/64x64/actions/playlist.png share/kde/apps/noatun/infrared.plugin share/kde/apps/noatun/kaiman.plugin share/kde/apps/noatun/kaimanui.rc @@ -989,8 +1079,12 @@ share/kde/apps/profiles/kscd.profile.xml share/kde/apps/videothumbnail/sprocket-large.png share/kde/apps/videothumbnail/sprocket-medium.png share/kde/apps/videothumbnail/sprocket-small.png +share/kde/autostart/restore_kmix_volumes.desktop +share/kde/config.kcfg/audiocd_lame_encoder.kcfg +share/kde/config.kcfg/audiocd_vorbis_encoder.kcfg share/kde/config.kcfg/kaudiocreator.kcfg share/kde/config.kcfg/kaudiocreator_encoders.kcfg +share/kde/config.kcfg/kscd.kcfg share/kde/config.kcfg/libkcddb.kcfg share/kde/icons/crystalsvg/128x128/actions/artsaudiomanager.png share/kde/icons/crystalsvg/128x128/actions/artsenvironment.png @@ -998,6 +1092,7 @@ share/kde/icons/crystalsvg/128x128/actions/artsfftscope.png share/kde/icons/crystalsvg/128x128/actions/artsmediatypes.png share/kde/icons/crystalsvg/128x128/actions/artsmidimanager.png share/kde/icons/crystalsvg/128x128/apps/artscontrol.png +share/kde/icons/crystalsvg/128x128/apps/juk.png share/kde/icons/crystalsvg/128x128/apps/kaboodle.png share/kde/icons/crystalsvg/128x128/apps/kmix.png share/kde/icons/crystalsvg/128x128/apps/krec.png @@ -1009,8 +1104,6 @@ share/kde/icons/crystalsvg/16x16/actions/artsenvironment.png share/kde/icons/crystalsvg/16x16/actions/artsfftscope.png share/kde/icons/crystalsvg/16x16/actions/artsmediatypes.png share/kde/icons/crystalsvg/16x16/actions/artsmidimanager.png -share/kde/icons/crystalsvg/16x16/actions/juk_time.png -share/kde/icons/crystalsvg/16x16/actions/juk_volume.png share/kde/icons/crystalsvg/16x16/apps/artsbuilder.png share/kde/icons/crystalsvg/16x16/apps/artscontrol.png share/kde/icons/crystalsvg/16x16/apps/juk.png @@ -1065,6 +1158,7 @@ share/kde/icons/crystalsvg/64x64/actions/artsfftscope.png share/kde/icons/crystalsvg/64x64/actions/artsmediatypes.png share/kde/icons/crystalsvg/64x64/actions/artsmidimanager.png share/kde/icons/crystalsvg/64x64/apps/artscontrol.png +share/kde/icons/crystalsvg/64x64/apps/juk.png share/kde/icons/crystalsvg/64x64/apps/kaboodle.png share/kde/icons/crystalsvg/64x64/apps/kmix.png share/kde/icons/crystalsvg/64x64/apps/krec.png @@ -1093,8 +1187,10 @@ share/kde/services/kfile_flac.desktop share/kde/services/kfile_m3u.desktop share/kde/services/kfile_mp3.desktop share/kde/services/kfile_ogg.desktop +share/kde/services/kfile_sid.desktop share/kde/services/kfile_wav.desktop share/kde/services/kmixctrl_restore.desktop +share/kde/services/krec_exportmp3.desktop share/kde/services/krec_exportogg.desktop share/kde/services/krec_exportwave.desktop share/kde/services/videothumbnail.desktop @@ -1106,9 +1202,10 @@ share/kde/servicetypes/krec_exportitem.desktop @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/locolor/16x16/apps @comment dirrm share/kde/icons/crystalsvg/scalable/apps @comment dirrm share/kde/icons/crystalsvg/scalable/actions -@comment dirrm share/kde/icons/crystalsvg/scalable @comment dirrm share/kde/icons/crystalsvg/64x64/apps @comment dirrm share/kde/icons/crystalsvg/64x64/actions @comment dirrm share/kde/icons/crystalsvg/48x48/apps @@ -1122,7 +1219,7 @@ share/kde/servicetypes/krec_exportitem.desktop @comment dirrm share/kde/icons/crystalsvg/128x128/apps @comment dirrm share/kde/icons/crystalsvg/128x128/actions @comment dirrm share/kde/config.kcfg -@comment dirrm share/kde/config +@comment dirrm share/kde/autostart @dirrm share/kde/apps/videothumbnail @comment dirrm share/kde/apps/profiles @dirrm share/kde/apps/noatun/skins/winamp/Winamp @@ -1137,6 +1234,8 @@ share/kde/servicetypes/krec_exportitem.desktop @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/icons/crystalsvg/64x64/actions +@dirrm share/kde/apps/noatun/icons/crystalsvg/64x64 @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 @@ -1145,6 +1244,8 @@ share/kde/servicetypes/krec_exportitem.desktop @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/128x128/actions +@dirrm share/kde/apps/noatun/icons/crystalsvg/128x128 @dirrm share/kde/apps/noatun/icons/crystalsvg @dirrm share/kde/apps/noatun/icons @dirrm share/kde/apps/noatun/eq.preset @@ -1164,7 +1265,7 @@ share/kde/servicetypes/krec_exportitem.desktop @dirrm share/kde/apps/krec/icons/crystalsvg @dirrm share/kde/apps/krec/icons @dirrm share/kde/apps/krec -@comment dirrm share/kde/apps/konqueror/servicemenus +@dirrm share/kde/apps/konqueror/servicemenus @dirrm share/kde/apps/kmix/pics @dirrm share/kde/apps/kmix @dirrm share/kde/apps/kmid/maps @@ -1178,10 +1279,11 @@ share/kde/servicetypes/krec_exportitem.desktop @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/kicker/applets +@dirrm share/kde/apps/kconf_update @dirrm share/kde/apps/kaudiocreator/pics @dirrm share/kde/apps/kaudiocreator +@dirrm share/kde/apps/kappfinder/apps/Multimedia @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 @@ -1197,26 +1299,24 @@ share/kde/servicetypes/krec_exportitem.desktop @dirrm share/kde/apps/artsbuilder/examples @dirrm share/kde/apps/artsbuilder @comment dirrm share/kde/apps -@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/kmid @dirrm share/doc/kde/HTML/en/kcontrol/kmixcfg -@comment dirrm share/doc/kde/HTML/en/kcontrol +@dirrm share/doc/kde/HTML/en/kcontrol @dirrm share/doc/kde/HTML/en/kaboodle @dirrm share/doc/kde/HTML/en/juk @dirrm share/doc/kde/HTML/en/artsbuilder/images @dirrm share/doc/kde/HTML/en/artsbuilder @comment dirrm share/doc/kde/HTML/en +@comment dirrm share/desktop-directories @comment dirrm share/applications/kde @dirrm lib/mcop/Noatun @dirrm lib/mcop/Arts/Environment -@comment dirrm lib/mcop/Arts -@comment dirrm lib/mcop +@dirrm lib/mcop/Arts +@dirrm lib/mcop @comment dirrm lib/kde3 @dirrm include/noatun @dirrm include/mpeglib_artsplug @@ -1236,6 +1336,7 @@ share/kde/servicetypes/krec_exportitem.desktop @dirrm include/mpeglib/frame @dirrm include/mpeglib/decoder @dirrm include/mpeglib -@dirrm include/libwm @dirrm include/libkcddb @comment dirrm include/arts +@dirrm include/akode +@comment dirrm etc/xdg/menus/applications-merged diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk index a17b1da0cf3..ed0a67a84f6 100644 --- a/multimedia/kdemultimedia3/buildlink3.mk +++ b/multimedia/kdemultimedia3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 13:13:42 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/08/21 14:44:47 markd Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEMULTIMEDIA_BUILDLINK3_MK:= ${KDEMULTIMEDIA_BUILDLINK3_MK}+ @@ -15,9 +15,11 @@ BUILDLINK_DEPENDS.kdemultimedia+= kdemultimedia>=3.2.2 BUILDLINK_PKGSRCDIR.kdemultimedia?= ../../multimedia/kdemultimedia3 .endif # KDEMULTIMEDIA_BUILDLINK3_MK +.include "../../audio/arts/buildlink3.mk" +.include "../../audio/lame/buildlink3.mk" .include "../../audio/musicbrainz/buildlink3.mk" +.include "../../audio/tunepimp/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" -.include "../../audio/arts/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index ad5a5dcb557..3ebaef2e75d 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2004/06/10 12:12:37 markd Exp $ +$NetBSD: distinfo,v 1.7 2004/08/21 14:44:47 markd Exp $ -SHA1 (kdemultimedia-3.2.3.tar.bz2) = 9e4df5a6a33ea34b4e31baf1fac4328624ebe09d -Size (kdemultimedia-3.2.3.tar.bz2) = 4847891 bytes +SHA1 (kdemultimedia-3.3.0.tar.bz2) = 45b96acb218af5c0b1e3f87b045143350ebfdc99 +Size (kdemultimedia-3.3.0.tar.bz2) = 5356679 bytes SHA1 (patch-aa) = 1e0694a956357d759a73a010e9a4700d5072ebf7 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413 @@ -9,6 +9,3 @@ SHA1 (patch-ad) = 272548cfda5b9d8ea2fd16d7d490ef74a5c349e6 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e -SHA1 (patch-cx) = ea42ab342abf2c2cff4c13fa71ab6e01bab5736c -SHA1 (patch-cy) = 949d3ae7b9037213f5a737018a0dcabe2200dd57 -SHA1 (patch-cz) = 5f4909bbc6f0828aa1d69ed4437622e35e116c46 diff --git a/multimedia/kdemultimedia3/patches/patch-cx b/multimedia/kdemultimedia3/patches/patch-cx deleted file mode 100644 index b1395e09061..00000000000 --- a/multimedia/kdemultimedia3/patches/patch-cx +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-cx,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ - ---- mpeglib/lib/mpegplay/recon.h.orig 2003-11-08 14:08:31.000000000 +0100 -+++ mpeglib/lib/mpegplay/recon.h 2003-11-08 14:08:41.000000000 +0100 -@@ -15,11 +15,13 @@ - #define __RECON_H - - --#include -+#include - #include "../util/render/pictureArray.h" - #include "copyFunctions.h" - #include "videoDecoder.h" - -+using namespace std; -+ - class Recon { - - diff --git a/multimedia/kdemultimedia3/patches/patch-cy b/multimedia/kdemultimedia3/patches/patch-cy deleted file mode 100644 index 21914432f26..00000000000 --- a/multimedia/kdemultimedia3/patches/patch-cy +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cy,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ - ---- mpeglib/lib/mpegplay/copyFunctions.h.orig 2003-11-08 14:08:58.000000000 +0100 -+++ mpeglib/lib/mpegplay/copyFunctions.h 2003-11-08 14:09:07.000000000 +0100 -@@ -17,9 +17,11 @@ - #define MAX_NEG_CROP 32768 - #define NUM_CROP_ENTRIES (2048+2*MAX_NEG_CROP) - --#include -+#include - #include "../util/mmx/mmx.h" - -+using namespace std; -+ - extern "C" { - #include - } diff --git a/multimedia/kdemultimedia3/patches/patch-cz b/multimedia/kdemultimedia3/patches/patch-cz deleted file mode 100644 index f71969c4224..00000000000 --- a/multimedia/kdemultimedia3/patches/patch-cz +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cz,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ - ---- mpeglib/lib/mpegplay/copyFunctions_asm.h.orig 2003-11-08 14:09:16.000000000 +0100 -+++ mpeglib/lib/mpegplay/copyFunctions_asm.h 2003-11-08 14:09:26.000000000 +0100 -@@ -18,7 +18,9 @@ - #include "config.h" - #endif - --#include -+#include -+ -+using namespace std; - - class CopyFunctions_ASM { - -- cgit v1.2.3