diff options
| author | lofi <lofi@FreeBSD.org> | 2004-08-31 03:55:42 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2004-08-31 03:55:42 +0800 |
| commit | 93a0477c7c4a5dde8c7a75ee28a4de9ada0ab068 (patch) | |
| tree | 3f135a2d6251b6e666ce27e76a5f18a69ed89cd7 /multimedia | |
| parent | 533fd938e7d6cb30871ebc5cfae4dc60e853f425 (diff) | |
| download | freebsd-ports-gnome-93a0477c7c4a5dde8c7a75ee28a4de9ada0ab068.tar.gz freebsd-ports-gnome-93a0477c7c4a5dde8c7a75ee28a4de9ada0ab068.tar.zst freebsd-ports-gnome-93a0477c7c4a5dde8c7a75ee28a4de9ada0ab068.zip | |
Update to KDE 3.3
Diffstat (limited to 'multimedia')
23 files changed, 463 insertions, 488 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 9c1b4dfb15b5..5cc13d0e2823 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -22,21 +21,23 @@ CONFLICTS= juk-* LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ FLAC:${PORTSDIR}/audio/flac \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ + mad:${PORTSDIR}/audio/libmad \ musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ ogg:${PORTSDIR}/audio/libogg \ + speex:${PORTSDIR}/audio/speex \ tag:${PORTSDIR}/audio/taglib \ - vorbis.3:${PORTSDIR}/audio/libvorbis -BUILD_DEPENDS+= trm:${PORTSDIR}/audio/trm -RUN_DEPENDS+= trm:${PORTSDIR}/audio/trm + tunepimp:${PORTSDIR}/audio/libtunepimp \ + vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} -KDE_BUILD_PLIST=yes USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes +_NO_KDE_FINAL= yes +_NO_KDE_CLOSURE=yes MAKE_ENV= ${CONFIGURE_ENV} @@ -45,20 +46,12 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=mpeglib mpeglib_artsplug xine_artsplugin -OPTIONS= LAME "Enable support for mp3 encoding using LAME" off \ - MPEGLIB "Use mpeglib for audio playback" on \ +OPTIONS= MPEGLIB "Use mpeglib for audio playback" on \ XINE "Enable support for video playback using libxine" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_LAME) -PLIST_APPEND+= plist.lame -LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame -.elseif defined(WITHOUT_LAME) -CONFIGURE_ARGS+= --without-lame --disable-lametest -.endif - .if defined(WITH_XINE) RUN_DEPENDS= ${LOCALBASE}/lib/libarts_xine.la:${PORTSDIR}/multimedia/xine_artsplugin .endif diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 95e28daa1852..12c9e90902dd 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdemultimedia-3.2.3.tar.bz2) = f49a1cf9c5d405aed791808b4bbf035d -SIZE (KDE/kdemultimedia-3.2.3.tar.bz2) = 4847891 +MD5 (KDE/kdemultimedia-3.3.0.tar.bz2) = 2579f41004b39168da25cb4db0043f00 +SIZE (KDE/kdemultimedia-3.3.0.tar.bz2) = 5356679 diff --git a/multimedia/kdemultimedia3/files/patch-juk-filerenamer.cpp b/multimedia/kdemultimedia3/files/patch-juk-filerenamer.cpp deleted file mode 100644 index e36a51a1e7f8..000000000000 --- a/multimedia/kdemultimedia3/files/patch-juk-filerenamer.cpp +++ /dev/null @@ -1,21 +0,0 @@ -Index: juk/filerenamer.cpp -=================================================================== -RCS file: /home/kde/kdemultimedia/juk/filerenamer.cpp,v -retrieving revision 1.23 -retrieving revision 1.23.2.2 -diff -u -3 -p -u -r1.23 -r1.23.2.2 ---- juk/filerenamer.cpp 2 Nov 2003 00:23:01 -0000 1.23 -+++ juk/filerenamer.cpp 6 Jun 2004 13:47:57 -0000 1.23.2.2 -@@ -138,8 +138,11 @@ QString FileRenamer::expandToken(TokenTy - value.replace(QDir::separator(), ""); - } - -+ if((type == Track) && needValue && (value.toUInt() == 0)) -+ return QString::null; -+ - if((needValue) && value.isEmpty()) -- return QString(); -+ return QString::null; - - token.replace("%s", value); - return token; diff --git a/multimedia/kdemultimedia3/files/patch-juk-tageditor.cpp b/multimedia/kdemultimedia3/files/patch-juk-tageditor.cpp deleted file mode 100644 index 2d123ffc1279..000000000000 --- a/multimedia/kdemultimedia3/files/patch-juk-tageditor.cpp +++ /dev/null @@ -1,17 +0,0 @@ -Index: juk/tageditor.cpp -=================================================================== -RCS file: /home/kde/kdemultimedia/juk/tageditor.cpp,v -retrieving revision 1.44.2.4 -retrieving revision 1.44.2.5 -diff -u -3 -p -u -r1.44.2.4 -r1.44.2.5 ---- juk/tageditor.cpp 14 Apr 2004 22:31:08 -0000 1.44.2.4 -+++ juk/tageditor.cpp 14 Jun 2004 11:18:37 -0000 1.44.2.5 -@@ -50,7 +50,7 @@ public: - - virtual State validate(QString &s, int &) const - { -- if(s.find('/' != -1)) -+ if(s.find('/') != -1) - return Invalid; - return Acceptable; - } diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm deleted file mode 100644 index 23395317c269..000000000000 --- a/multimedia/kdemultimedia3/files/plist.base.rm +++ /dev/null @@ -1,135 +0,0 @@ -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/interface -@dirrm share/mimelnk/audio -@dirrm share/mimelnk/application -@dirrm share/mimelnk -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/32x32 -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/locolor/16x16 -@dirrm share/icons/locolor -@dirrm share/icons/crystalsvg/scalable/apps -@dirrm share/icons/crystalsvg/scalable/actions -@dirrm share/icons/crystalsvg/scalable -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/64x64/actions -@dirrm share/icons/crystalsvg/64x64 -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/48x48/actions -@dirrm share/icons/crystalsvg/48x48 -@dirrm share/icons/crystalsvg/32x32/apps -@dirrm share/icons/crystalsvg/32x32/actions -@dirrm share/icons/crystalsvg/32x32 -@dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/22x22/actions -@dirrm share/icons/crystalsvg/22x22 -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/16x16/actions -@dirrm share/icons/crystalsvg/16x16 -@dirrm share/icons/crystalsvg/128x128/apps -@dirrm share/icons/crystalsvg/128x128/actions -@dirrm share/icons/crystalsvg/128x128 -@dirrm share/icons/crystalsvg -@dirrm share/icons -@dirrm share/doc/HTML/en/noatun -@dirrm share/doc/HTML/en/kscd -@dirrm share/doc/HTML/en/krec -@dirrm share/doc/HTML/en/kmix -@dirrm share/doc/HTML/en/kmid -@dirrm share/doc/HTML/en/kcontrol/kmixcfg -@dirrm share/doc/HTML/en/kcontrol -@dirrm share/doc/HTML/en/kaboodle -@dirrm share/doc/HTML/en/juk -@dirrm share/doc/HTML/en/artsbuilder/images -@dirrm share/doc/HTML/en/artsbuilder -@dirrm share/doc/HTML/en -@dirrm share/doc/HTML -@dirrm share/config.kcfg -@dirrm share/apps/profiles -@dirrm share/apps/noatun/skins/winamp/Winamp -@dirrm share/apps/noatun/skins/winamp -@dirrm share/apps/noatun/skins/kjofol/vibrocentric -@dirrm share/apps/noatun/skins/kjofol/phong -@dirrm share/apps/noatun/skins/kjofol/kjofol -@dirrm share/apps/noatun/skins/kjofol/HexoBronx -@dirrm share/apps/noatun/skins/kjofol -@dirrm share/apps/noatun/skins/kaiman/k9 -@dirrm share/apps/noatun/skins/kaiman/circle -@dirrm share/apps/noatun/skins/kaiman/car-preset -@dirrm share/apps/noatun/skins/kaiman -@dirrm share/apps/noatun/skins -@dirrm share/apps/noatun/icons/crystalsvg/48x48/actions -@dirrm share/apps/noatun/icons/crystalsvg/48x48 -@dirrm share/apps/noatun/icons/crystalsvg/32x32/actions -@dirrm share/apps/noatun/icons/crystalsvg/32x32 -@dirrm share/apps/noatun/icons/crystalsvg/22x22/actions -@dirrm share/apps/noatun/icons/crystalsvg/22x22 -@dirrm share/apps/noatun/icons/crystalsvg/16x16/actions -@dirrm share/apps/noatun/icons/crystalsvg/16x16 -@dirrm share/apps/noatun/icons/crystalsvg -@dirrm share/apps/noatun/icons -@dirrm share/apps/noatun/eq.preset -@dirrm share/apps/noatun -@dirrm share/apps/kscd/icons/crystalsvg/22x22/actions -@dirrm share/apps/kscd/icons/crystalsvg/22x22 -@dirrm share/apps/kscd/icons/crystalsvg -@dirrm share/apps/kscd/icons -@dirrm share/apps/kscd -@dirrm share/apps/krec/icons/crystalsvg/32x32/mimetypes -@dirrm share/apps/krec/icons/crystalsvg/32x32/actions -@dirrm share/apps/krec/icons/crystalsvg/32x32 -@dirrm share/apps/krec/icons/crystalsvg/22x22/actions -@dirrm share/apps/krec/icons/crystalsvg/22x22 -@dirrm share/apps/krec/icons/crystalsvg/16x16/actions -@dirrm share/apps/krec/icons/crystalsvg/16x16 -@dirrm share/apps/krec/icons/crystalsvg -@dirrm share/apps/krec/icons -@dirrm share/apps/krec -@dirrm share/apps/konqueror/servicemenus -@dirrm share/apps/konqueror -@dirrm share/apps/kmix/pics -@dirrm share/apps/kmix -@dirrm share/apps/kmid/maps -@dirrm share/apps/kmid/icons/crystalsvg/32x32/actions -@dirrm share/apps/kmid/icons/crystalsvg/32x32 -@dirrm share/apps/kmid/icons/crystalsvg/22x22/actions -@dirrm share/apps/kmid/icons/crystalsvg/22x22 -@dirrm share/apps/kmid/icons/crystalsvg/16x16/actions -@dirrm share/apps/kmid/icons/crystalsvg/16x16 -@dirrm share/apps/kmid/icons/crystalsvg -@dirrm share/apps/kmid/icons -@dirrm share/apps/kmid/fm -@dirrm share/apps/kmid -@dirrm share/apps/kicker/applets -@dirrm share/apps/kicker -@dirrm share/apps/kconf_update -@dirrm share/apps/kaudiocreator/pics -@dirrm share/apps/kaudiocreator -@dirrm share/apps/kaboodle/icons/crystalsvg/22x22/actions -@dirrm share/apps/kaboodle/icons/crystalsvg/22x22 -@dirrm share/apps/kaboodle/icons/crystalsvg/16x16/actions -@dirrm share/apps/kaboodle/icons/crystalsvg/16x16 -@dirrm share/apps/kaboodle/icons/crystalsvg -@dirrm share/apps/kaboodle/icons -@dirrm share/apps/kaboodle -@dirrm share/apps/juk/pics -@dirrm share/apps/juk -@dirrm share/apps/artscontrol -@dirrm share/apps/artsbuilder/pics -@dirrm share/apps/artsbuilder/examples/todo -@dirrm share/apps/artsbuilder/examples -@dirrm share/apps/artsbuilder -@dirrm share/apps -@dirrm share/applications/kde -@dirrm share/applications -@dirrm lib/mcop/Noatun -@dirrm lib/mcop/Arts/Environment -@dirrm lib/mcop/Arts -@dirrm lib/mcop -@dirrm lib/kde3 -@dirrm include/noatun -@dirrm include/libwm -@dirrm include/libkcddb -@dirrm include/arts diff --git a/multimedia/kdemultimedia3/files/plist.lame b/multimedia/kdemultimedia3/files/plist.lame deleted file mode 100644 index 14d27ab6155b..000000000000 --- a/multimedia/kdemultimedia3/files/plist.lame +++ /dev/null @@ -1,3 +0,0 @@ -lib/kde3/libkrecexport_mp3.la -lib/kde3/libkrecexport_mp3.so -share/services/krec_exportmp3.desktop diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia3/pkg-plist index 0c94fb51987c..f5a96b8a0a51 100644 --- a/multimedia/kdemultimedia4/files/plist.base +++ b/multimedia/kdemultimedia3/pkg-plist @@ -11,6 +11,26 @@ bin/kscd bin/midisend bin/noatun bin/workman2cddb.pl +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 @@ -32,6 +52,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 @@ -42,8 +63,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/noatun/app.h include/noatun/controls.h @@ -71,8 +90,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 @@ -89,6 +106,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 @@ -101,6 +120,14 @@ 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 @@ -145,6 +172,17 @@ lib/kde3/noatun_winskin.la lib/kde3/noatun_winskin.so lib/kde3/noatunsimple.la lib/kde3/noatunsimple.so +lib/libakode.la +lib/libakode.so +lib/libakode.so.1 +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 lib/libartsbuilder.la lib/libartsbuilder.so lib/libartsbuilder.so.0 @@ -186,6 +224,9 @@ lib/libartsmodulesmixers.so.0 lib/libartsmodulessynth.la lib/libartsmodulessynth.so lib/libartsmodulessynth.so.0 +lib/libaudiocdplugins.la +lib/libaudiocdplugins.so +lib/libaudiocdplugins.so.1 lib/libaudiofilearts.la lib/libaudiofilearts.so lib/libkcddb.la @@ -215,9 +256,6 @@ lib/libnoatuntags.so lib/libnoatuntags.so.3 lib/libwinskinvis.la lib/libwinskinvis.so -lib/libworkman.la -lib/libworkman.so -lib/libworkman.so.6 lib/mcop/Arts/ArtsBuilderLoader.mcopclass lib/mcop/Arts/Button.mcopclass lib/mcop/Arts/EffectRackGuiFactory.mcopclass @@ -319,6 +357,14 @@ lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass lib/mcop/Noatun/WinSkinFFT.mcopclass lib/mcop/RawWriter.mcopclass lib/mcop/VoiceRemoval.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 @@ -351,7 +397,6 @@ 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 @@ -452,11 +497,34 @@ share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png share/apps/kaboodle/kaboodlepartui.rc share/apps/kaboodle/kaboodleui.rc +share/apps/kappfinder/apps/Multimedia/ams.desktop +share/apps/kappfinder/apps/Multimedia/amsynth.desktop +share/apps/kappfinder/apps/Multimedia/ardour.desktop +share/apps/kappfinder/apps/Multimedia/djplay.desktop +share/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop +share/apps/kappfinder/apps/Multimedia/freebirth.desktop +share/apps/kappfinder/apps/Multimedia/freqtweak.desktop +share/apps/kappfinder/apps/Multimedia/galan.desktop +share/apps/kappfinder/apps/Multimedia/hydrogen.desktop +share/apps/kappfinder/apps/Multimedia/jack-rack.desktop +share/apps/kappfinder/apps/Multimedia/jamin.desktop +share/apps/kappfinder/apps/Multimedia/meterbridge.desktop +share/apps/kappfinder/apps/Multimedia/mixxx.desktop +share/apps/kappfinder/apps/Multimedia/muse.desktop +share/apps/kappfinder/apps/Multimedia/qjackctl.desktop +share/apps/kappfinder/apps/Multimedia/qsynth.desktop +share/apps/kappfinder/apps/Multimedia/vkeybd.desktop +share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop +share/apps/kaudiocreator/eventsrc share/apps/kaudiocreator/kaudiocreatorui.rc share/apps/kaudiocreator/pics/check.png +share/apps/kconf_update/audiocd.upd share/apps/kconf_update/kaudiocreator-libkcddb.upd +share/apps/kconf_update/kaudiocreator-meta.upd share/apps/kconf_update/noatun.upd share/apps/kconf_update/noatun20update +share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh +share/apps/kconf_update/upgrade-metadata.sh share/apps/kicker/applets/artscontrolapplet.desktop share/apps/kicker/applets/kmixapplet.desktop share/apps/kmid/DiesIrae.kar @@ -521,13 +589,18 @@ share/apps/noatun/eq.preset/preset.zero share/apps/noatun/excellent.plugin share/apps/noatun/excellentui.rc share/apps/noatun/htmlexport.plugin +share/apps/noatun/icons/crystalsvg/128x128/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/128x128/actions/playlist.png share/apps/noatun/icons/crystalsvg/16x16/actions/effect.png +share/apps/noatun/icons/crystalsvg/16x16/actions/equalizer.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunback.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunforward.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunpause.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplay.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplaylist.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunstop.png +share/apps/noatun/icons/crystalsvg/16x16/actions/playlist.png +share/apps/noatun/icons/crystalsvg/22x22/actions/equalizer.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunback.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfback.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfforward.png @@ -541,8 +614,15 @@ share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplay.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplaylist.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunstop.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatuntiny.png +share/apps/noatun/icons/crystalsvg/22x22/actions/playlist.png share/apps/noatun/icons/crystalsvg/32x32/actions/effect.png +share/apps/noatun/icons/crystalsvg/32x32/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/32x32/actions/playlist.png share/apps/noatun/icons/crystalsvg/48x48/actions/effect.png +share/apps/noatun/icons/crystalsvg/48x48/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/48x48/actions/playlist.png +share/apps/noatun/icons/crystalsvg/64x64/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/64x64/actions/playlist.png share/apps/noatun/infrared.plugin share/apps/noatun/kaiman.plugin share/apps/noatun/kaimanui.rc @@ -740,9 +820,14 @@ share/apps/noatun/systrayui.rc share/apps/noatun/voiceprint.plugin share/apps/noatun/winskin.plugin share/apps/profiles/kscd.profile.xml +share/autostart/restore_kmix_volumes.desktop +share/config.kcfg/audiocd_lame_encoder.kcfg +share/config.kcfg/audiocd_vorbis_encoder.kcfg share/config.kcfg/kaudiocreator.kcfg share/config.kcfg/kaudiocreator_encoders.kcfg +share/config.kcfg/kscd.kcfg share/config.kcfg/libkcddb.kcfg +share/desktop-directories/kde-multimedia-music.directory share/doc/HTML/en/artsbuilder/apis.docbook share/doc/HTML/en/artsbuilder/arts-structure.png share/doc/HTML/en/artsbuilder/artsbuilder.docbook @@ -810,8 +895,15 @@ share/doc/HTML/en/artsbuilder/porting.docbook share/doc/HTML/en/artsbuilder/references.docbook share/doc/HTML/en/artsbuilder/tools.docbook share/doc/HTML/en/juk/common +share/doc/HTML/en/juk/history-playlist.png share/doc/HTML/en/juk/index.cache.bz2 share/doc/HTML/en/juk/index.docbook +share/doc/HTML/en/juk/juk-adv-search.png +share/doc/HTML/en/juk/juk-file-renamer.png +share/doc/HTML/en/juk/juk-main.png +share/doc/HTML/en/juk/juk-tag-guesser.png +share/doc/HTML/en/juk/normal-playlist.png +share/doc/HTML/en/juk/search-playlist.png share/doc/HTML/en/juk/toolbar.png share/doc/HTML/en/kaboodle/common share/doc/HTML/en/kaboodle/index.cache.bz2 @@ -828,7 +920,10 @@ share/doc/HTML/en/kmix/index.docbook share/doc/HTML/en/krec/common share/doc/HTML/en/krec/index.cache.bz2 share/doc/HTML/en/krec/index.docbook +share/doc/HTML/en/krec/krec-configuration.png share/doc/HTML/en/krec/krec-hicolor.png +share/doc/HTML/en/krec/krec-keramik.png +share/doc/HTML/en/krec/krec-new_file_properties.png share/doc/HTML/en/kscd/common share/doc/HTML/en/kscd/index.cache.bz2 share/doc/HTML/en/kscd/index.docbook @@ -837,18 +932,13 @@ share/doc/HTML/en/kscd/kscd11.png share/doc/HTML/en/kscd/kscd12.png share/doc/HTML/en/kscd/kscd13.png share/doc/HTML/en/kscd/kscd14.png -share/doc/HTML/en/kscd/kscd15.png share/doc/HTML/en/kscd/kscd16.png share/doc/HTML/en/kscd/kscd18.png share/doc/HTML/en/kscd/kscd19.png share/doc/HTML/en/kscd/kscd2.png -share/doc/HTML/en/kscd/kscd2a.png share/doc/HTML/en/kscd/kscd3.png -share/doc/HTML/en/kscd/kscd4.png share/doc/HTML/en/kscd/kscd5.png share/doc/HTML/en/kscd/kscd6.png -share/doc/HTML/en/kscd/kscd7.png -share/doc/HTML/en/kscd/kscd8.png share/doc/HTML/en/kscd/kscd9.png share/doc/HTML/en/noatun/common share/doc/HTML/en/noatun/index.cache.bz2 @@ -859,6 +949,7 @@ share/icons/crystalsvg/128x128/actions/artsfftscope.png share/icons/crystalsvg/128x128/actions/artsmediatypes.png share/icons/crystalsvg/128x128/actions/artsmidimanager.png share/icons/crystalsvg/128x128/apps/artscontrol.png +share/icons/crystalsvg/128x128/apps/juk.png share/icons/crystalsvg/128x128/apps/kaboodle.png share/icons/crystalsvg/128x128/apps/kmix.png share/icons/crystalsvg/128x128/apps/krec.png @@ -870,8 +961,6 @@ share/icons/crystalsvg/16x16/actions/artsenvironment.png share/icons/crystalsvg/16x16/actions/artsfftscope.png share/icons/crystalsvg/16x16/actions/artsmediatypes.png share/icons/crystalsvg/16x16/actions/artsmidimanager.png -share/icons/crystalsvg/16x16/actions/juk_time.png -share/icons/crystalsvg/16x16/actions/juk_volume.png share/icons/crystalsvg/16x16/apps/artsbuilder.png share/icons/crystalsvg/16x16/apps/artscontrol.png share/icons/crystalsvg/16x16/apps/juk.png @@ -926,6 +1015,7 @@ share/icons/crystalsvg/64x64/actions/artsfftscope.png share/icons/crystalsvg/64x64/actions/artsmediatypes.png share/icons/crystalsvg/64x64/actions/artsmidimanager.png share/icons/crystalsvg/64x64/apps/artscontrol.png +share/icons/crystalsvg/64x64/apps/juk.png share/icons/crystalsvg/64x64/apps/kaboodle.png share/icons/crystalsvg/64x64/apps/kmix.png share/icons/crystalsvg/64x64/apps/krec.png @@ -954,9 +1044,118 @@ share/services/kfile_flac.desktop share/services/kfile_m3u.desktop share/services/kfile_mp3.desktop share/services/kfile_ogg.desktop +share/services/kfile_sid.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop share/services/krec_exportwave.desktop share/servicetypes/audiomidi.desktop share/servicetypes/krec_exportitem.desktop +@dirrm share/mimelnk/interface +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor +@dirrm share/icons/crystalsvg/scalable/apps +@dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/128x128/actions +@dirrm share/doc/HTML/en/noatun +@dirrm share/doc/HTML/en/kscd +@dirrm share/doc/HTML/en/krec +@dirrm share/doc/HTML/en/kmix +@dirrm share/doc/HTML/en/kmid +@dirrm share/doc/HTML/en/kcontrol/kmixcfg +@dirrm share/doc/HTML/en/kcontrol +@dirrm share/doc/HTML/en/kaboodle +@dirrm share/doc/HTML/en/juk +@dirrm share/doc/HTML/en/artsbuilder/images +@dirrm share/doc/HTML/en/artsbuilder +@dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/profiles +@dirrm share/apps/noatun/skins/winamp/Winamp +@dirrm share/apps/noatun/skins/winamp +@dirrm share/apps/noatun/skins/kjofol/vibrocentric +@dirrm share/apps/noatun/skins/kjofol/phong +@dirrm share/apps/noatun/skins/kjofol/kjofol +@dirrm share/apps/noatun/skins/kjofol/HexoBronx +@dirrm share/apps/noatun/skins/kjofol +@dirrm share/apps/noatun/skins/kaiman/k9 +@dirrm share/apps/noatun/skins/kaiman/circle +@dirrm share/apps/noatun/skins/kaiman/car-preset +@dirrm share/apps/noatun/skins/kaiman +@dirrm share/apps/noatun/skins +@dirrm share/apps/noatun/icons/crystalsvg/64x64/actions +@dirrm share/apps/noatun/icons/crystalsvg/64x64 +@dirrm share/apps/noatun/icons/crystalsvg/48x48/actions +@dirrm share/apps/noatun/icons/crystalsvg/48x48 +@dirrm share/apps/noatun/icons/crystalsvg/32x32/actions +@dirrm share/apps/noatun/icons/crystalsvg/32x32 +@dirrm share/apps/noatun/icons/crystalsvg/22x22/actions +@dirrm share/apps/noatun/icons/crystalsvg/22x22 +@dirrm share/apps/noatun/icons/crystalsvg/16x16/actions +@dirrm share/apps/noatun/icons/crystalsvg/16x16 +@dirrm share/apps/noatun/icons/crystalsvg/128x128/actions +@dirrm share/apps/noatun/icons/crystalsvg/128x128 +@dirrm share/apps/noatun/icons/crystalsvg +@dirrm share/apps/noatun/icons +@dirrm share/apps/noatun/eq.preset +@dirrm share/apps/noatun +@dirrm share/apps/kscd/icons/crystalsvg/22x22/actions +@dirrm share/apps/kscd/icons/crystalsvg/22x22 +@dirrm share/apps/kscd/icons/crystalsvg +@dirrm share/apps/kscd/icons +@dirrm share/apps/kscd +@dirrm share/apps/krec/icons/crystalsvg/32x32/mimetypes +@dirrm share/apps/krec/icons/crystalsvg/32x32/actions +@dirrm share/apps/krec/icons/crystalsvg/32x32 +@dirrm share/apps/krec/icons/crystalsvg/22x22/actions +@dirrm share/apps/krec/icons/crystalsvg/22x22 +@dirrm share/apps/krec/icons/crystalsvg/16x16/actions +@dirrm share/apps/krec/icons/crystalsvg/16x16 +@dirrm share/apps/krec/icons/crystalsvg +@dirrm share/apps/krec/icons +@dirrm share/apps/krec +@dirrm share/apps/konqueror/servicemenus +@dirrm share/apps/konqueror +@dirrm share/apps/kmix/pics +@dirrm share/apps/kmix +@dirrm share/apps/kmid/maps +@dirrm share/apps/kmid/icons/crystalsvg/32x32/actions +@dirrm share/apps/kmid/icons/crystalsvg/32x32 +@dirrm share/apps/kmid/icons/crystalsvg/22x22/actions +@dirrm share/apps/kmid/icons/crystalsvg/22x22 +@dirrm share/apps/kmid/icons/crystalsvg/16x16/actions +@dirrm share/apps/kmid/icons/crystalsvg/16x16 +@dirrm share/apps/kmid/icons/crystalsvg +@dirrm share/apps/kmid/icons +@dirrm share/apps/kmid/fm +@dirrm share/apps/kmid +@dirrm share/apps/kicker/applets +@dirrm share/apps/kicker +@dirrm share/apps/kaudiocreator/pics +@dirrm share/apps/kaudiocreator +@dirrm share/apps/kappfinder/apps/Multimedia +@dirrm share/apps/kappfinder/apps +@dirrm share/apps/kappfinder +@dirrm share/apps/kaboodle/icons/crystalsvg/22x22/actions +@dirrm share/apps/kaboodle/icons/crystalsvg/22x22 +@dirrm share/apps/kaboodle/icons/crystalsvg/16x16/actions +@dirrm share/apps/kaboodle/icons/crystalsvg/16x16 +@dirrm share/apps/kaboodle/icons/crystalsvg +@dirrm share/apps/kaboodle/icons +@dirrm share/apps/kaboodle +@dirrm share/apps/juk/pics +@dirrm share/apps/juk +@dirrm share/apps/artscontrol +@dirrm share/apps/artsbuilder/pics +@dirrm share/apps/artsbuilder/examples/todo +@dirrm share/apps/artsbuilder/examples +@dirrm share/apps/artsbuilder +@dirrm lib/mcop/Noatun +@dirrm lib/mcop/Arts/Environment +@dirrm include/noatun +@dirrm include/libkcddb +@dirrm include/akode +@dirrm etc/xdg/menus/applications-merged diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 9c1b4dfb15b5..5cc13d0e2823 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -22,21 +21,23 @@ CONFLICTS= juk-* LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ FLAC:${PORTSDIR}/audio/flac \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ + mad:${PORTSDIR}/audio/libmad \ musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ ogg:${PORTSDIR}/audio/libogg \ + speex:${PORTSDIR}/audio/speex \ tag:${PORTSDIR}/audio/taglib \ - vorbis.3:${PORTSDIR}/audio/libvorbis -BUILD_DEPENDS+= trm:${PORTSDIR}/audio/trm -RUN_DEPENDS+= trm:${PORTSDIR}/audio/trm + tunepimp:${PORTSDIR}/audio/libtunepimp \ + vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} -KDE_BUILD_PLIST=yes USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes +_NO_KDE_FINAL= yes +_NO_KDE_CLOSURE=yes MAKE_ENV= ${CONFIGURE_ENV} @@ -45,20 +46,12 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=mpeglib mpeglib_artsplug xine_artsplugin -OPTIONS= LAME "Enable support for mp3 encoding using LAME" off \ - MPEGLIB "Use mpeglib for audio playback" on \ +OPTIONS= MPEGLIB "Use mpeglib for audio playback" on \ XINE "Enable support for video playback using libxine" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_LAME) -PLIST_APPEND+= plist.lame -LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame -.elseif defined(WITHOUT_LAME) -CONFIGURE_ARGS+= --without-lame --disable-lametest -.endif - .if defined(WITH_XINE) RUN_DEPENDS= ${LOCALBASE}/lib/libarts_xine.la:${PORTSDIR}/multimedia/xine_artsplugin .endif diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index 95e28daa1852..12c9e90902dd 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdemultimedia-3.2.3.tar.bz2) = f49a1cf9c5d405aed791808b4bbf035d -SIZE (KDE/kdemultimedia-3.2.3.tar.bz2) = 4847891 +MD5 (KDE/kdemultimedia-3.3.0.tar.bz2) = 2579f41004b39168da25cb4db0043f00 +SIZE (KDE/kdemultimedia-3.3.0.tar.bz2) = 5356679 diff --git a/multimedia/kdemultimedia4/files/patch-juk-filerenamer.cpp b/multimedia/kdemultimedia4/files/patch-juk-filerenamer.cpp deleted file mode 100644 index e36a51a1e7f8..000000000000 --- a/multimedia/kdemultimedia4/files/patch-juk-filerenamer.cpp +++ /dev/null @@ -1,21 +0,0 @@ -Index: juk/filerenamer.cpp -=================================================================== -RCS file: /home/kde/kdemultimedia/juk/filerenamer.cpp,v -retrieving revision 1.23 -retrieving revision 1.23.2.2 -diff -u -3 -p -u -r1.23 -r1.23.2.2 ---- juk/filerenamer.cpp 2 Nov 2003 00:23:01 -0000 1.23 -+++ juk/filerenamer.cpp 6 Jun 2004 13:47:57 -0000 1.23.2.2 -@@ -138,8 +138,11 @@ QString FileRenamer::expandToken(TokenTy - value.replace(QDir::separator(), ""); - } - -+ if((type == Track) && needValue && (value.toUInt() == 0)) -+ return QString::null; -+ - if((needValue) && value.isEmpty()) -- return QString(); -+ return QString::null; - - token.replace("%s", value); - return token; diff --git a/multimedia/kdemultimedia4/files/patch-juk-tageditor.cpp b/multimedia/kdemultimedia4/files/patch-juk-tageditor.cpp deleted file mode 100644 index 2d123ffc1279..000000000000 --- a/multimedia/kdemultimedia4/files/patch-juk-tageditor.cpp +++ /dev/null @@ -1,17 +0,0 @@ -Index: juk/tageditor.cpp -=================================================================== -RCS file: /home/kde/kdemultimedia/juk/tageditor.cpp,v -retrieving revision 1.44.2.4 -retrieving revision 1.44.2.5 -diff -u -3 -p -u -r1.44.2.4 -r1.44.2.5 ---- juk/tageditor.cpp 14 Apr 2004 22:31:08 -0000 1.44.2.4 -+++ juk/tageditor.cpp 14 Jun 2004 11:18:37 -0000 1.44.2.5 -@@ -50,7 +50,7 @@ public: - - virtual State validate(QString &s, int &) const - { -- if(s.find('/' != -1)) -+ if(s.find('/') != -1) - return Invalid; - return Acceptable; - } diff --git a/multimedia/kdemultimedia4/files/plist.base.rm b/multimedia/kdemultimedia4/files/plist.base.rm deleted file mode 100644 index 23395317c269..000000000000 --- a/multimedia/kdemultimedia4/files/plist.base.rm +++ /dev/null @@ -1,135 +0,0 @@ -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/interface -@dirrm share/mimelnk/audio -@dirrm share/mimelnk/application -@dirrm share/mimelnk -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/32x32 -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/locolor/16x16 -@dirrm share/icons/locolor -@dirrm share/icons/crystalsvg/scalable/apps -@dirrm share/icons/crystalsvg/scalable/actions -@dirrm share/icons/crystalsvg/scalable -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/64x64/actions -@dirrm share/icons/crystalsvg/64x64 -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/48x48/actions -@dirrm share/icons/crystalsvg/48x48 -@dirrm share/icons/crystalsvg/32x32/apps -@dirrm share/icons/crystalsvg/32x32/actions -@dirrm share/icons/crystalsvg/32x32 -@dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/22x22/actions -@dirrm share/icons/crystalsvg/22x22 -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/16x16/actions -@dirrm share/icons/crystalsvg/16x16 -@dirrm share/icons/crystalsvg/128x128/apps -@dirrm share/icons/crystalsvg/128x128/actions -@dirrm share/icons/crystalsvg/128x128 -@dirrm share/icons/crystalsvg -@dirrm share/icons -@dirrm share/doc/HTML/en/noatun -@dirrm share/doc/HTML/en/kscd -@dirrm share/doc/HTML/en/krec -@dirrm share/doc/HTML/en/kmix -@dirrm share/doc/HTML/en/kmid -@dirrm share/doc/HTML/en/kcontrol/kmixcfg -@dirrm share/doc/HTML/en/kcontrol -@dirrm share/doc/HTML/en/kaboodle -@dirrm share/doc/HTML/en/juk -@dirrm share/doc/HTML/en/artsbuilder/images -@dirrm share/doc/HTML/en/artsbuilder -@dirrm share/doc/HTML/en -@dirrm share/doc/HTML -@dirrm share/config.kcfg -@dirrm share/apps/profiles -@dirrm share/apps/noatun/skins/winamp/Winamp -@dirrm share/apps/noatun/skins/winamp -@dirrm share/apps/noatun/skins/kjofol/vibrocentric -@dirrm share/apps/noatun/skins/kjofol/phong -@dirrm share/apps/noatun/skins/kjofol/kjofol -@dirrm share/apps/noatun/skins/kjofol/HexoBronx -@dirrm share/apps/noatun/skins/kjofol -@dirrm share/apps/noatun/skins/kaiman/k9 -@dirrm share/apps/noatun/skins/kaiman/circle -@dirrm share/apps/noatun/skins/kaiman/car-preset -@dirrm share/apps/noatun/skins/kaiman -@dirrm share/apps/noatun/skins -@dirrm share/apps/noatun/icons/crystalsvg/48x48/actions -@dirrm share/apps/noatun/icons/crystalsvg/48x48 -@dirrm share/apps/noatun/icons/crystalsvg/32x32/actions -@dirrm share/apps/noatun/icons/crystalsvg/32x32 -@dirrm share/apps/noatun/icons/crystalsvg/22x22/actions -@dirrm share/apps/noatun/icons/crystalsvg/22x22 -@dirrm share/apps/noatun/icons/crystalsvg/16x16/actions -@dirrm share/apps/noatun/icons/crystalsvg/16x16 -@dirrm share/apps/noatun/icons/crystalsvg -@dirrm share/apps/noatun/icons -@dirrm share/apps/noatun/eq.preset -@dirrm share/apps/noatun -@dirrm share/apps/kscd/icons/crystalsvg/22x22/actions -@dirrm share/apps/kscd/icons/crystalsvg/22x22 -@dirrm share/apps/kscd/icons/crystalsvg -@dirrm share/apps/kscd/icons -@dirrm share/apps/kscd -@dirrm share/apps/krec/icons/crystalsvg/32x32/mimetypes -@dirrm share/apps/krec/icons/crystalsvg/32x32/actions -@dirrm share/apps/krec/icons/crystalsvg/32x32 -@dirrm share/apps/krec/icons/crystalsvg/22x22/actions -@dirrm share/apps/krec/icons/crystalsvg/22x22 -@dirrm share/apps/krec/icons/crystalsvg/16x16/actions -@dirrm share/apps/krec/icons/crystalsvg/16x16 -@dirrm share/apps/krec/icons/crystalsvg -@dirrm share/apps/krec/icons -@dirrm share/apps/krec -@dirrm share/apps/konqueror/servicemenus -@dirrm share/apps/konqueror -@dirrm share/apps/kmix/pics -@dirrm share/apps/kmix -@dirrm share/apps/kmid/maps -@dirrm share/apps/kmid/icons/crystalsvg/32x32/actions -@dirrm share/apps/kmid/icons/crystalsvg/32x32 -@dirrm share/apps/kmid/icons/crystalsvg/22x22/actions -@dirrm share/apps/kmid/icons/crystalsvg/22x22 -@dirrm share/apps/kmid/icons/crystalsvg/16x16/actions -@dirrm share/apps/kmid/icons/crystalsvg/16x16 -@dirrm share/apps/kmid/icons/crystalsvg -@dirrm share/apps/kmid/icons -@dirrm share/apps/kmid/fm -@dirrm share/apps/kmid -@dirrm share/apps/kicker/applets -@dirrm share/apps/kicker -@dirrm share/apps/kconf_update -@dirrm share/apps/kaudiocreator/pics -@dirrm share/apps/kaudiocreator -@dirrm share/apps/kaboodle/icons/crystalsvg/22x22/actions -@dirrm share/apps/kaboodle/icons/crystalsvg/22x22 -@dirrm share/apps/kaboodle/icons/crystalsvg/16x16/actions -@dirrm share/apps/kaboodle/icons/crystalsvg/16x16 -@dirrm share/apps/kaboodle/icons/crystalsvg -@dirrm share/apps/kaboodle/icons -@dirrm share/apps/kaboodle -@dirrm share/apps/juk/pics -@dirrm share/apps/juk -@dirrm share/apps/artscontrol -@dirrm share/apps/artsbuilder/pics -@dirrm share/apps/artsbuilder/examples/todo -@dirrm share/apps/artsbuilder/examples -@dirrm share/apps/artsbuilder -@dirrm share/apps -@dirrm share/applications/kde -@dirrm share/applications -@dirrm lib/mcop/Noatun -@dirrm lib/mcop/Arts/Environment -@dirrm lib/mcop/Arts -@dirrm lib/mcop -@dirrm lib/kde3 -@dirrm include/noatun -@dirrm include/libwm -@dirrm include/libkcddb -@dirrm include/arts diff --git a/multimedia/kdemultimedia4/files/plist.lame b/multimedia/kdemultimedia4/files/plist.lame deleted file mode 100644 index 14d27ab6155b..000000000000 --- a/multimedia/kdemultimedia4/files/plist.lame +++ /dev/null @@ -1,3 +0,0 @@ -lib/kde3/libkrecexport_mp3.la -lib/kde3/libkrecexport_mp3.so -share/services/krec_exportmp3.desktop diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia4/pkg-plist index 0c94fb51987c..f5a96b8a0a51 100644 --- a/multimedia/kdemultimedia3/files/plist.base +++ b/multimedia/kdemultimedia4/pkg-plist @@ -11,6 +11,26 @@ bin/kscd bin/midisend bin/noatun bin/workman2cddb.pl +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 @@ -32,6 +52,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 @@ -42,8 +63,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/noatun/app.h include/noatun/controls.h @@ -71,8 +90,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 @@ -89,6 +106,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 @@ -101,6 +120,14 @@ 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 @@ -145,6 +172,17 @@ lib/kde3/noatun_winskin.la lib/kde3/noatun_winskin.so lib/kde3/noatunsimple.la lib/kde3/noatunsimple.so +lib/libakode.la +lib/libakode.so +lib/libakode.so.1 +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 lib/libartsbuilder.la lib/libartsbuilder.so lib/libartsbuilder.so.0 @@ -186,6 +224,9 @@ lib/libartsmodulesmixers.so.0 lib/libartsmodulessynth.la lib/libartsmodulessynth.so lib/libartsmodulessynth.so.0 +lib/libaudiocdplugins.la +lib/libaudiocdplugins.so +lib/libaudiocdplugins.so.1 lib/libaudiofilearts.la lib/libaudiofilearts.so lib/libkcddb.la @@ -215,9 +256,6 @@ lib/libnoatuntags.so lib/libnoatuntags.so.3 lib/libwinskinvis.la lib/libwinskinvis.so -lib/libworkman.la -lib/libworkman.so -lib/libworkman.so.6 lib/mcop/Arts/ArtsBuilderLoader.mcopclass lib/mcop/Arts/Button.mcopclass lib/mcop/Arts/EffectRackGuiFactory.mcopclass @@ -319,6 +357,14 @@ lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass lib/mcop/Noatun/WinSkinFFT.mcopclass lib/mcop/RawWriter.mcopclass lib/mcop/VoiceRemoval.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 @@ -351,7 +397,6 @@ 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 @@ -452,11 +497,34 @@ share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png share/apps/kaboodle/kaboodlepartui.rc share/apps/kaboodle/kaboodleui.rc +share/apps/kappfinder/apps/Multimedia/ams.desktop +share/apps/kappfinder/apps/Multimedia/amsynth.desktop +share/apps/kappfinder/apps/Multimedia/ardour.desktop +share/apps/kappfinder/apps/Multimedia/djplay.desktop +share/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop +share/apps/kappfinder/apps/Multimedia/freebirth.desktop +share/apps/kappfinder/apps/Multimedia/freqtweak.desktop +share/apps/kappfinder/apps/Multimedia/galan.desktop +share/apps/kappfinder/apps/Multimedia/hydrogen.desktop +share/apps/kappfinder/apps/Multimedia/jack-rack.desktop +share/apps/kappfinder/apps/Multimedia/jamin.desktop +share/apps/kappfinder/apps/Multimedia/meterbridge.desktop +share/apps/kappfinder/apps/Multimedia/mixxx.desktop +share/apps/kappfinder/apps/Multimedia/muse.desktop +share/apps/kappfinder/apps/Multimedia/qjackctl.desktop +share/apps/kappfinder/apps/Multimedia/qsynth.desktop +share/apps/kappfinder/apps/Multimedia/vkeybd.desktop +share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop +share/apps/kaudiocreator/eventsrc share/apps/kaudiocreator/kaudiocreatorui.rc share/apps/kaudiocreator/pics/check.png +share/apps/kconf_update/audiocd.upd share/apps/kconf_update/kaudiocreator-libkcddb.upd +share/apps/kconf_update/kaudiocreator-meta.upd share/apps/kconf_update/noatun.upd share/apps/kconf_update/noatun20update +share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh +share/apps/kconf_update/upgrade-metadata.sh share/apps/kicker/applets/artscontrolapplet.desktop share/apps/kicker/applets/kmixapplet.desktop share/apps/kmid/DiesIrae.kar @@ -521,13 +589,18 @@ share/apps/noatun/eq.preset/preset.zero share/apps/noatun/excellent.plugin share/apps/noatun/excellentui.rc share/apps/noatun/htmlexport.plugin +share/apps/noatun/icons/crystalsvg/128x128/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/128x128/actions/playlist.png share/apps/noatun/icons/crystalsvg/16x16/actions/effect.png +share/apps/noatun/icons/crystalsvg/16x16/actions/equalizer.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunback.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunforward.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunpause.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplay.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplaylist.png share/apps/noatun/icons/crystalsvg/16x16/actions/noatunstop.png +share/apps/noatun/icons/crystalsvg/16x16/actions/playlist.png +share/apps/noatun/icons/crystalsvg/22x22/actions/equalizer.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunback.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfback.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfforward.png @@ -541,8 +614,15 @@ share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplay.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplaylist.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatunstop.png share/apps/noatun/icons/crystalsvg/22x22/actions/noatuntiny.png +share/apps/noatun/icons/crystalsvg/22x22/actions/playlist.png share/apps/noatun/icons/crystalsvg/32x32/actions/effect.png +share/apps/noatun/icons/crystalsvg/32x32/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/32x32/actions/playlist.png share/apps/noatun/icons/crystalsvg/48x48/actions/effect.png +share/apps/noatun/icons/crystalsvg/48x48/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/48x48/actions/playlist.png +share/apps/noatun/icons/crystalsvg/64x64/actions/equalizer.png +share/apps/noatun/icons/crystalsvg/64x64/actions/playlist.png share/apps/noatun/infrared.plugin share/apps/noatun/kaiman.plugin share/apps/noatun/kaimanui.rc @@ -740,9 +820,14 @@ share/apps/noatun/systrayui.rc share/apps/noatun/voiceprint.plugin share/apps/noatun/winskin.plugin share/apps/profiles/kscd.profile.xml +share/autostart/restore_kmix_volumes.desktop +share/config.kcfg/audiocd_lame_encoder.kcfg +share/config.kcfg/audiocd_vorbis_encoder.kcfg share/config.kcfg/kaudiocreator.kcfg share/config.kcfg/kaudiocreator_encoders.kcfg +share/config.kcfg/kscd.kcfg share/config.kcfg/libkcddb.kcfg +share/desktop-directories/kde-multimedia-music.directory share/doc/HTML/en/artsbuilder/apis.docbook share/doc/HTML/en/artsbuilder/arts-structure.png share/doc/HTML/en/artsbuilder/artsbuilder.docbook @@ -810,8 +895,15 @@ share/doc/HTML/en/artsbuilder/porting.docbook share/doc/HTML/en/artsbuilder/references.docbook share/doc/HTML/en/artsbuilder/tools.docbook share/doc/HTML/en/juk/common +share/doc/HTML/en/juk/history-playlist.png share/doc/HTML/en/juk/index.cache.bz2 share/doc/HTML/en/juk/index.docbook +share/doc/HTML/en/juk/juk-adv-search.png +share/doc/HTML/en/juk/juk-file-renamer.png +share/doc/HTML/en/juk/juk-main.png +share/doc/HTML/en/juk/juk-tag-guesser.png +share/doc/HTML/en/juk/normal-playlist.png +share/doc/HTML/en/juk/search-playlist.png share/doc/HTML/en/juk/toolbar.png share/doc/HTML/en/kaboodle/common share/doc/HTML/en/kaboodle/index.cache.bz2 @@ -828,7 +920,10 @@ share/doc/HTML/en/kmix/index.docbook share/doc/HTML/en/krec/common share/doc/HTML/en/krec/index.cache.bz2 share/doc/HTML/en/krec/index.docbook +share/doc/HTML/en/krec/krec-configuration.png share/doc/HTML/en/krec/krec-hicolor.png +share/doc/HTML/en/krec/krec-keramik.png +share/doc/HTML/en/krec/krec-new_file_properties.png share/doc/HTML/en/kscd/common share/doc/HTML/en/kscd/index.cache.bz2 share/doc/HTML/en/kscd/index.docbook @@ -837,18 +932,13 @@ share/doc/HTML/en/kscd/kscd11.png share/doc/HTML/en/kscd/kscd12.png share/doc/HTML/en/kscd/kscd13.png share/doc/HTML/en/kscd/kscd14.png -share/doc/HTML/en/kscd/kscd15.png share/doc/HTML/en/kscd/kscd16.png share/doc/HTML/en/kscd/kscd18.png share/doc/HTML/en/kscd/kscd19.png share/doc/HTML/en/kscd/kscd2.png -share/doc/HTML/en/kscd/kscd2a.png share/doc/HTML/en/kscd/kscd3.png -share/doc/HTML/en/kscd/kscd4.png share/doc/HTML/en/kscd/kscd5.png share/doc/HTML/en/kscd/kscd6.png -share/doc/HTML/en/kscd/kscd7.png -share/doc/HTML/en/kscd/kscd8.png share/doc/HTML/en/kscd/kscd9.png share/doc/HTML/en/noatun/common share/doc/HTML/en/noatun/index.cache.bz2 @@ -859,6 +949,7 @@ share/icons/crystalsvg/128x128/actions/artsfftscope.png share/icons/crystalsvg/128x128/actions/artsmediatypes.png share/icons/crystalsvg/128x128/actions/artsmidimanager.png share/icons/crystalsvg/128x128/apps/artscontrol.png +share/icons/crystalsvg/128x128/apps/juk.png share/icons/crystalsvg/128x128/apps/kaboodle.png share/icons/crystalsvg/128x128/apps/kmix.png share/icons/crystalsvg/128x128/apps/krec.png @@ -870,8 +961,6 @@ share/icons/crystalsvg/16x16/actions/artsenvironment.png share/icons/crystalsvg/16x16/actions/artsfftscope.png share/icons/crystalsvg/16x16/actions/artsmediatypes.png share/icons/crystalsvg/16x16/actions/artsmidimanager.png -share/icons/crystalsvg/16x16/actions/juk_time.png -share/icons/crystalsvg/16x16/actions/juk_volume.png share/icons/crystalsvg/16x16/apps/artsbuilder.png share/icons/crystalsvg/16x16/apps/artscontrol.png share/icons/crystalsvg/16x16/apps/juk.png @@ -926,6 +1015,7 @@ share/icons/crystalsvg/64x64/actions/artsfftscope.png share/icons/crystalsvg/64x64/actions/artsmediatypes.png share/icons/crystalsvg/64x64/actions/artsmidimanager.png share/icons/crystalsvg/64x64/apps/artscontrol.png +share/icons/crystalsvg/64x64/apps/juk.png share/icons/crystalsvg/64x64/apps/kaboodle.png share/icons/crystalsvg/64x64/apps/kmix.png share/icons/crystalsvg/64x64/apps/krec.png @@ -954,9 +1044,118 @@ share/services/kfile_flac.desktop share/services/kfile_m3u.desktop share/services/kfile_mp3.desktop share/services/kfile_ogg.desktop +share/services/kfile_sid.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop share/services/krec_exportwave.desktop share/servicetypes/audiomidi.desktop share/servicetypes/krec_exportitem.desktop +@dirrm share/mimelnk/interface +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor +@dirrm share/icons/crystalsvg/scalable/apps +@dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/128x128/actions +@dirrm share/doc/HTML/en/noatun +@dirrm share/doc/HTML/en/kscd +@dirrm share/doc/HTML/en/krec +@dirrm share/doc/HTML/en/kmix +@dirrm share/doc/HTML/en/kmid +@dirrm share/doc/HTML/en/kcontrol/kmixcfg +@dirrm share/doc/HTML/en/kcontrol +@dirrm share/doc/HTML/en/kaboodle +@dirrm share/doc/HTML/en/juk +@dirrm share/doc/HTML/en/artsbuilder/images +@dirrm share/doc/HTML/en/artsbuilder +@dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/profiles +@dirrm share/apps/noatun/skins/winamp/Winamp +@dirrm share/apps/noatun/skins/winamp +@dirrm share/apps/noatun/skins/kjofol/vibrocentric +@dirrm share/apps/noatun/skins/kjofol/phong +@dirrm share/apps/noatun/skins/kjofol/kjofol +@dirrm share/apps/noatun/skins/kjofol/HexoBronx +@dirrm share/apps/noatun/skins/kjofol +@dirrm share/apps/noatun/skins/kaiman/k9 +@dirrm share/apps/noatun/skins/kaiman/circle +@dirrm share/apps/noatun/skins/kaiman/car-preset +@dirrm share/apps/noatun/skins/kaiman +@dirrm share/apps/noatun/skins +@dirrm share/apps/noatun/icons/crystalsvg/64x64/actions +@dirrm share/apps/noatun/icons/crystalsvg/64x64 +@dirrm share/apps/noatun/icons/crystalsvg/48x48/actions +@dirrm share/apps/noatun/icons/crystalsvg/48x48 +@dirrm share/apps/noatun/icons/crystalsvg/32x32/actions +@dirrm share/apps/noatun/icons/crystalsvg/32x32 +@dirrm share/apps/noatun/icons/crystalsvg/22x22/actions +@dirrm share/apps/noatun/icons/crystalsvg/22x22 +@dirrm share/apps/noatun/icons/crystalsvg/16x16/actions +@dirrm share/apps/noatun/icons/crystalsvg/16x16 +@dirrm share/apps/noatun/icons/crystalsvg/128x128/actions +@dirrm share/apps/noatun/icons/crystalsvg/128x128 +@dirrm share/apps/noatun/icons/crystalsvg +@dirrm share/apps/noatun/icons +@dirrm share/apps/noatun/eq.preset +@dirrm share/apps/noatun +@dirrm share/apps/kscd/icons/crystalsvg/22x22/actions +@dirrm share/apps/kscd/icons/crystalsvg/22x22 +@dirrm share/apps/kscd/icons/crystalsvg +@dirrm share/apps/kscd/icons +@dirrm share/apps/kscd +@dirrm share/apps/krec/icons/crystalsvg/32x32/mimetypes +@dirrm share/apps/krec/icons/crystalsvg/32x32/actions +@dirrm share/apps/krec/icons/crystalsvg/32x32 +@dirrm share/apps/krec/icons/crystalsvg/22x22/actions +@dirrm share/apps/krec/icons/crystalsvg/22x22 +@dirrm share/apps/krec/icons/crystalsvg/16x16/actions +@dirrm share/apps/krec/icons/crystalsvg/16x16 +@dirrm share/apps/krec/icons/crystalsvg +@dirrm share/apps/krec/icons +@dirrm share/apps/krec +@dirrm share/apps/konqueror/servicemenus +@dirrm share/apps/konqueror +@dirrm share/apps/kmix/pics +@dirrm share/apps/kmix +@dirrm share/apps/kmid/maps +@dirrm share/apps/kmid/icons/crystalsvg/32x32/actions +@dirrm share/apps/kmid/icons/crystalsvg/32x32 +@dirrm share/apps/kmid/icons/crystalsvg/22x22/actions +@dirrm share/apps/kmid/icons/crystalsvg/22x22 +@dirrm share/apps/kmid/icons/crystalsvg/16x16/actions +@dirrm share/apps/kmid/icons/crystalsvg/16x16 +@dirrm share/apps/kmid/icons/crystalsvg +@dirrm share/apps/kmid/icons +@dirrm share/apps/kmid/fm +@dirrm share/apps/kmid +@dirrm share/apps/kicker/applets +@dirrm share/apps/kicker +@dirrm share/apps/kaudiocreator/pics +@dirrm share/apps/kaudiocreator +@dirrm share/apps/kappfinder/apps/Multimedia +@dirrm share/apps/kappfinder/apps +@dirrm share/apps/kappfinder +@dirrm share/apps/kaboodle/icons/crystalsvg/22x22/actions +@dirrm share/apps/kaboodle/icons/crystalsvg/22x22 +@dirrm share/apps/kaboodle/icons/crystalsvg/16x16/actions +@dirrm share/apps/kaboodle/icons/crystalsvg/16x16 +@dirrm share/apps/kaboodle/icons/crystalsvg +@dirrm share/apps/kaboodle/icons +@dirrm share/apps/kaboodle +@dirrm share/apps/juk/pics +@dirrm share/apps/juk +@dirrm share/apps/artscontrol +@dirrm share/apps/artsbuilder/pics +@dirrm share/apps/artsbuilder/examples/todo +@dirrm share/apps/artsbuilder/examples +@dirrm share/apps/artsbuilder +@dirrm lib/mcop/Noatun +@dirrm lib/mcop/Arts/Environment +@dirrm include/noatun +@dirrm include/libkcddb +@dirrm include/akode +@dirrm etc/xdg/menus/applications-merged diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 33c0d8870e7d..79d3f2870091 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -51,6 +51,12 @@ MAN1= xine-config.1 .include <bsd.port.pre.mk> +# GCC 3.4 breaks xvid decoder +.if ${OSVERSION} > 502124 +BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33 +CC= gcc33 +.endif + # PRId64, INT16_MAX macro are not defined .if ${OSVERSION} < 500040 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-config.h.in diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile index 76548045e2c3..ff4d6c165b7b 100644 --- a/multimedia/noatun-plugins/Makefile +++ b/multimedia/noatun-plugins/Makefile @@ -10,7 +10,7 @@ PORTVERSION= ${NOATUNPLUG_PORTVERSION} PORTREVISION= ${NOATUNPLUG_PORTREVISION} CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo index b660bcc2b1b6..070945a1593c 100644 --- a/multimedia/noatun-plugins/distinfo +++ b/multimedia/noatun-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdeaddons-3.2.3.tar.bz2) = 5997388ff74ed1c95dd07c778d66fdae -SIZE (KDE/kdeaddons-3.2.3.tar.bz2) = 1291314 +MD5 (KDE/kdeaddons-3.3.0.tar.bz2) = 6ba019d8b3ce0811ae2c861d6819aaab +SIZE (KDE/kdeaddons-3.3.0.tar.bz2) = 1554404 diff --git a/multimedia/noatun-plugins/files/patch-noatun-plugins_synaescope_polygon.h b/multimedia/noatun-plugins/files/patch-noatun-plugins_synaescope_polygon.h deleted file mode 100644 index 2a6128c31bc5..000000000000 --- a/multimedia/noatun-plugins/files/patch-noatun-plugins_synaescope_polygon.h +++ /dev/null @@ -1,32 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdeaddons/noatun-plugins/synaescope/polygon.h,v -retrieving revision 1.4 -retrieving revision 1.4.8.1 -diff -u -p -r1.4 -r1.4.8.1 ---- noatun-plugins/synaescope/polygon.h 2001/04/16 23:20:34 1.4 -+++ noatun-plugins/synaescope/polygon.h 2004/06/12 09:54:09 1.4.8.1 -@@ -31,8 +31,8 @@ struct PolygonEngine : public Bitmap<Pix - void apply(Pixel *dest) - { - Pixel sum=0; -- int count = width*height; -- Pixel *src = data; -+ int count = this->width*this->height; -+ Pixel *src = this->data; - while(count--) { - sum += *(src++); - if (sum) -@@ -44,10 +44,10 @@ struct PolygonEngine : public Bitmap<Pix - void add(Pixel color,int x,int y) - { - if (y < 0) return; -- if (y >= height) return; -+ if (y >= this->height) return; - if (x < 0) x = 0; -- if (x > width) x = width; -- data[x+y*width] += color; -+ if (x > this->width) x = this->width; -+ this->data[x+y*this->width] += color; - } - - /* Color is char[layers] */ diff --git a/multimedia/noatun-plugins/files/patch-noatun-plugins_tippercanoe_polygon.h b/multimedia/noatun-plugins/files/patch-noatun-plugins_tippercanoe_polygon.h deleted file mode 100644 index 22c8cb3d09c0..000000000000 --- a/multimedia/noatun-plugins/files/patch-noatun-plugins_tippercanoe_polygon.h +++ /dev/null @@ -1,32 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdeaddons/noatun-plugins/tippercanoe/polygon.h,v -retrieving revision 1.3 -retrieving revision 1.3.8.1 -diff -u -p -r1.3 -r1.3.8.1 ---- noatun-plugins/tippercanoe/polygon.h 2001/04/16 22:04:03 1.3 -+++ noatun-plugins/tippercanoe/polygon.h 2004/06/12 10:05:15 1.3.8.1 -@@ -28,8 +28,8 @@ struct PolygonEngine : public Bitmap<Pix - #define super (1<<superSampleShift) - void apply(Pixel *dest) { - Pixel sum=0; -- int count = width*height; -- Pixel *src = data; -+ int count = this->width*this->height; -+ Pixel *src = this->data; - while(count--) { - sum += *(src++); - if (sum) -@@ -40,10 +40,10 @@ struct PolygonEngine : public Bitmap<Pix - - void add(Pixel color,int x,int y) { - if (y < 0) return; -- if (y >= height) return; -+ if (y >= this->height) return; - if (x < 0) x = 0; -- if (x > width) x = width; -- data[x+y*width] += color; -+ if (x > this->width) x = this->width; -+ this->data[x+y*this->width] += color; - } - - /* Color is char[layers] */ diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist index 3aef25ea0930..b78f1405d0c3 100644 --- a/multimedia/noatun-plugins/pkg-plist +++ b/multimedia/noatun-plugins/pkg-plist @@ -29,7 +29,7 @@ lib/kde3/noatunwakeup.la lib/kde3/noatunwakeup.so lib/kde3/noatunwavecapture.la lib/kde3/noatunwavecapture.so -share/applications/kdeaddons-noatun-plugins-3.2.3 +share/applications/kdeaddons-noatun-plugins-3.3.0 share/apps/noatun/alsaplayerui.plugin share/apps/noatun/blurscope.plugin share/apps/noatun/charlatanui.plugin diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile index 338ae17eca66..af02a47365b4 100644 --- a/multimedia/xine_artsplugin/Makefile +++ b/multimedia/xine_artsplugin/Makefile @@ -9,7 +9,7 @@ PORTNAME= xine_artsplugin PORTVERSION= ${KDE_VERSION} CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src PKGNAMEPREFIX= kdemultimedia- DISTNAME= kdemultimedia-${PORTVERSION} DIST_SUBDIR= KDE diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo index 95e28daa1852..12c9e90902dd 100644 --- a/multimedia/xine_artsplugin/distinfo +++ b/multimedia/xine_artsplugin/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdemultimedia-3.2.3.tar.bz2) = f49a1cf9c5d405aed791808b4bbf035d -SIZE (KDE/kdemultimedia-3.2.3.tar.bz2) = 4847891 +MD5 (KDE/kdemultimedia-3.3.0.tar.bz2) = 2579f41004b39168da25cb4db0043f00 +SIZE (KDE/kdemultimedia-3.3.0.tar.bz2) = 5356679 diff --git a/multimedia/xine_artsplugin/pkg-plist b/multimedia/xine_artsplugin/pkg-plist index 0dad8ebe2839..2e2369ba3ce1 100644 --- a/multimedia/xine_artsplugin/pkg-plist +++ b/multimedia/xine_artsplugin/pkg-plist @@ -2,7 +2,8 @@ lib/kde3/videothumbnail.la lib/kde3/videothumbnail.so lib/libarts_xine.la lib/libarts_xine.so -lib/mcop/xinePlayObject.mcopclass +lib/mcop/xineAudioPlayObject.mcopclass +lib/mcop/xineVideoPlayObject.mcopclass share/apps/videothumbnail/sprocket-large.png share/apps/videothumbnail/sprocket-medium.png share/apps/videothumbnail/sprocket-small.png |