summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormakc <makc@FreeBSD.org>2013-02-03 20:10:37 +0000
committermakc <makc@FreeBSD.org>2013-02-03 20:10:37 +0000
commit751b41dafeebc053115ea65f18c9ab0a009b0237 (patch)
tree0a68a09c88303888985b47f7045bed36788aefc2 /multimedia
parent021b3043f8ab11aaff1bb422f34a0dd5dd655cd0 (diff)
downloadFreeBSD-ports-751b41dafeebc053115ea65f18c9ab0a009b0237.zip
FreeBSD-ports-751b41dafeebc053115ea65f18c9ab0a009b0237.tar.gz
KDE/FreeBSD team presents KDE SC 4.9.5 ports!
- kdebindings ports have been renamed to match upstream. - kdemultimedia and kdenetwork have been split. - New port games/pairs added. - Trim Makefile header - Convert to new option framework - New USE_KDE4 components: libkcddb, libkcompactdisc - Update: databases/akonadi to 1.9.0 devel/grantlee to 0.3.0 textproc/rasqal to 0.9.30 textproc/redland-bindings to 1.0.16.1 textproc/soprano to 2.9.0 x11-toolkits/attica to 0.4.1 The area51 repository features commits by Schaich Alonso, avilla, dbn, jhale, makc and rakuco. Contributors: - Oleg Sidorkin - Tobias Berner - Kurt Jaeger
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/Makefile3
-rw-r--r--multimedia/dragon/Makefile30
-rw-r--r--multimedia/dragon/distinfo2
-rw-r--r--multimedia/dragon/pkg-descr7
-rw-r--r--multimedia/dragon/pkg-message (renamed from multimedia/kdemultimedia4/pkg-message)0
-rw-r--r--multimedia/dragon/pkg-plist29
-rw-r--r--multimedia/kdemultimedia4-ffmpegthumbs/Makefile27
-rw-r--r--multimedia/kdemultimedia4-ffmpegthumbs/distinfo2
-rw-r--r--multimedia/kdemultimedia4-ffmpegthumbs/pkg-descr3
-rw-r--r--multimedia/kdemultimedia4-ffmpegthumbs/pkg-plist2
-rw-r--r--multimedia/kdemultimedia4-mplayerthumbs/Makefile27
-rw-r--r--multimedia/kdemultimedia4-mplayerthumbs/distinfo2
-rw-r--r--multimedia/kdemultimedia4-mplayerthumbs/pkg-descr3
-rw-r--r--multimedia/kdemultimedia4-mplayerthumbs/pkg-plist8
-rw-r--r--multimedia/kdemultimedia4/Makefile85
-rw-r--r--multimedia/kdemultimedia4/distinfo2
-rw-r--r--multimedia/kdemultimedia4/files/extrapatch-no_alsa40
-rw-r--r--multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp43
-rw-r--r--multimedia/kdemultimedia4/pkg-descr2
-rw-r--r--multimedia/kdemultimedia4/pkg-plist195
20 files changed, 189 insertions, 323 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile
index ec0037e..527bf73 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -40,6 +40,7 @@
SUBDIR += despotify
SUBDIR += devede
SUBDIR += dirac
+ SUBDIR += dragon
SUBDIR += dtv
SUBDIR += dumpmpeg
SUBDIR += dv2jpg
@@ -134,6 +135,8 @@
SUBDIR += kaffeine
SUBDIR += kdemultimedia3
SUBDIR += kdemultimedia4
+ SUBDIR += kdemultimedia4-ffmpegthumbs
+ SUBDIR += kdemultimedia4-mplayerthumbs
SUBDIR += kdenlive
SUBDIR += kino
SUBDIR += kissdx
diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile
new file mode 100644
index 0000000..4daebdf
--- /dev/null
+++ b/multimedia/dragon/Makefile
@@ -0,0 +1,30 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= dragon
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= multimedia kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= A KDE multimedia player with a focus on simplicity instead of features
+
+LICENSE= GPLv2
+
+CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE= yes
+KDE4_BUILDENV= yes
+USE_KDE4= automoc4 kdehier kdelibs kdeprefix
+USE_QT4= dbus phonon \
+ moc_build qmake_build rcc_build uic_build
+USE_XZ= yes
+
+MAN1= dragon.1
+
+post-install:
+ @${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/multimedia/dragon/distinfo b/multimedia/dragon/distinfo
new file mode 100644
index 0000000..ad63b9e
--- /dev/null
+++ b/multimedia/dragon/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/dragon-4.9.5.tar.xz) = a3a23c6b4ced8098240f91837247b1b799fdf3a2a70d157ef10d3b6521d1dadd
+SIZE (KDE/dragon-4.9.5.tar.xz) = 394388
diff --git a/multimedia/dragon/pkg-descr b/multimedia/dragon/pkg-descr
new file mode 100644
index 0000000..f048c1e
--- /dev/null
+++ b/multimedia/dragon/pkg-descr
@@ -0,0 +1,7 @@
+Dragon Player is a multimedia player where the focus is on simplicity,
+instead of features. Dragon Player does one thing, and only one thing,
+which is playing multimedia files. It's simple interface is designed
+not to get in your way and instead empower you to simply play
+multimedia files.
+
+WWW: http://www.kde.org/applications/multimedia/dragonplayer/
diff --git a/multimedia/kdemultimedia4/pkg-message b/multimedia/dragon/pkg-message
index 6202fcc..6202fcc 100644
--- a/multimedia/kdemultimedia4/pkg-message
+++ b/multimedia/dragon/pkg-message
diff --git a/multimedia/dragon/pkg-plist b/multimedia/dragon/pkg-plist
new file mode 100644
index 0000000..23512b1
--- /dev/null
+++ b/multimedia/dragon/pkg-plist
@@ -0,0 +1,29 @@
+bin/dragon
+lib/kde4/dragonpart.so
+share/applications/kde4/dragonplayer.desktop
+share/apps/dragonplayer/dragonlogo.png
+share/apps/dragonplayer/dragonplayerui.rc
+share/apps/solid/actions/dragonplayer-opendvd.desktop
+share/config/dragonplayerrc
+share/doc/HTML/en/dragonplayer/common
+share/doc/HTML/en/dragonplayer/index.cache.bz2
+share/doc/HTML/en/dragonplayer/index.docbook
+share/doc/HTML/en/dragonplayer/main.png
+share/doc/HTML/en/dragonplayer/man-dragon.1.docbook
+share/doc/HTML/en/dragonplayer/playmedia.png
+share/icons/hicolor/128x128/apps/dragonplayer.png
+share/icons/hicolor/16x16/apps/dragonplayer.png
+share/icons/hicolor/22x22/apps/dragonplayer.png
+share/icons/hicolor/32x32/apps/dragonplayer.png
+share/icons/hicolor/48x48/apps/dragonplayer.png
+share/icons/hicolor/64x64/apps/dragonplayer.png
+share/icons/hicolor/scalable/apps/dragonplayer.svgz
+share/icons/oxygen/16x16/actions/player-volume-muted.png
+share/icons/oxygen/22x22/actions/player-volume-muted.png
+share/icons/oxygen/32x32/actions/player-volume-muted.png
+share/icons/oxygen/48x48/actions/player-volume-muted.png
+share/icons/oxygen/scalable/actions/player-volume-muted.svgz
+share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
+share/kde4/services/dragonplayer_part.desktop
+@dirrm share/doc/HTML/en/dragonplayer
+@dirrm share/apps/dragonplayer
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
new file mode 100644
index 0000000..9cc5794
--- /dev/null
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
@@ -0,0 +1,27 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= ffmpegthumbs
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= multimedia kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= kdemultimedia-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= ffmpeg-based thumbnail creator for video files
+
+LICENSE= GPLv2
+
+LIB_DEPENDS= swscale.1:${PORTSDIR}/multimedia/ffmpeg
+
+CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE= yes
+KDE4_BUILDENV= yes
+USE_KDE4= automoc4 kdehier kdelibs kdeprefix
+USE_QT4= moc_build qmake_build rcc_build uic_build
+USE_XZ= yes
+
+.include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/distinfo b/multimedia/kdemultimedia4-ffmpegthumbs/distinfo
new file mode 100644
index 0000000..d299818
--- /dev/null
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/ffmpegthumbs-4.9.5.tar.xz) = 32efd9b83c569aafaae64cb9f5cc78943adf54fb4061a131749cb921a5ac0e46
+SIZE (KDE/ffmpegthumbs-4.9.5.tar.xz) = 20788
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/pkg-descr b/multimedia/kdemultimedia4-ffmpegthumbs/pkg-descr
new file mode 100644
index 0000000..c5d495c
--- /dev/null
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/pkg-descr
@@ -0,0 +1,3 @@
+ffmpeg-based thumbnail creator for video files.
+
+WWW: http://www.kde.org/
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/pkg-plist b/multimedia/kdemultimedia4-ffmpegthumbs/pkg-plist
new file mode 100644
index 0000000..812a259
--- /dev/null
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/pkg-plist
@@ -0,0 +1,2 @@
+lib/kde4/ffmpegthumbs.so
+share/kde4/services/ffmpegthumbs.desktop
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/Makefile b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
new file mode 100644
index 0000000..c8fe86c
--- /dev/null
+++ b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
@@ -0,0 +1,27 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= mplayerthumbs
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= multimedia kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= kdemultimedia-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= MPlayer-based thumbnail generator for video files
+
+LICENSE= LGPL21
+
+RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
+
+CONFLICTS_INSTALL= kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE= yes
+KDE4_BUILDENV= yes
+USE_KDE4= automoc4 kdehier kdelibs kdeprefix
+USE_QT4= phonon moc_build qmake_build rcc_build uic_build
+USE_XZ= yes
+
+.include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/distinfo b/multimedia/kdemultimedia4-mplayerthumbs/distinfo
new file mode 100644
index 0000000..24c8c88
--- /dev/null
+++ b/multimedia/kdemultimedia4-mplayerthumbs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/mplayerthumbs-4.9.5.tar.xz) = fbb6dfd2c283ff37279564241397d2806b7ec3e42c570fc269d2d925a201b074
+SIZE (KDE/mplayerthumbs-4.9.5.tar.xz) = 28104
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/pkg-descr b/multimedia/kdemultimedia4-mplayerthumbs/pkg-descr
new file mode 100644
index 0000000..b57a25f
--- /dev/null
+++ b/multimedia/kdemultimedia4-mplayerthumbs/pkg-descr
@@ -0,0 +1,3 @@
+MPlayer-based thumbnail generator for video files.
+
+WWW: http://www.kde.org/
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/pkg-plist b/multimedia/kdemultimedia4-mplayerthumbs/pkg-plist
new file mode 100644
index 0000000..cf2392d
--- /dev/null
+++ b/multimedia/kdemultimedia4-mplayerthumbs/pkg-plist
@@ -0,0 +1,8 @@
+bin/mplayerthumbsconfig
+lib/kde4/videopreview.so
+share/apps/videothumbnail/sprocket-large.png
+share/apps/videothumbnail/sprocket-medium.png
+share/apps/videothumbnail/sprocket-small.png
+share/config.kcfg/mplayerthumbs.kcfg
+share/kde4/services/videopreview.desktop
+@dirrm share/apps/videothumbnail
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 7bd81f8..5bd2a05 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,62 +1,61 @@
-# New ports collection Makefile for: kdemultimedia
-# Date created: 2008-01-30
-# Whom: Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
# $FreeBSD$
PORTNAME= kdemultimedia
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
-CATEGORIES= multimedia kde ipv6
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE
+CATEGORIES= multimedia kde
+MASTER_SITES= # empty
+DISTFILES= # empty
MAINTAINER= kde@FreeBSD.org
-COMMENT= KDE Multimedia applications
-
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
- cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
- ogg:${PORTSDIR}/audio/libogg \
- tag.1:${PORTSDIR}/audio/taglib \
- vorbis.4:${PORTSDIR}/audio/libvorbis \
- musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
- swscale.1:${PORTSDIR}/multimedia/ffmpeg
-
-.if !defined(PACKAGE_BUILDING)
-RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
-.endif
+COMMENT= KDE Multimedia applications (meta-port)
LATEST_LINK= ${PORTNAME}4
-USE_KDE4= automoc4 kdehier kdelibs kdeprefix
-KDE4_BUILDENV= yes
-USE_QT4= dbus qt3support svg xml \
- moc_build qmake_build rcc_build uic_build
-USE_XZ= yes
-MAKE_JOBS_SAFE= yes
-CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF
+NO_BUILD= yes
+USE_KDE4= kdeprefix
-OPTIONS= ALSA "Build with ALSA compatibility library" off \
- PULSEAUDIO "KMix control for PulseAudio" off
+OPTIONS_DEFINE= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
+OPTIONS_DEFAULT= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
+DRAGON_DESC= Simple video player
+FFMPEG_DESC= FFMPEG-based video thumbnailer
+JUK_DESC= Audio player
+KIO_AUDIOCD_DESC= Audio CD IOSlave
+KMIX_DESC= Audio mixer
+KSCD_DESC= CD Player
+MPLAYER_DESC= MPlayer-based video thumbnailer
.include <bsd.port.options.mk>
-.if !defined(WITH_ALSA)
-EXTRA_PATCHES+= ${FILESDIR}/extrapatch-no_alsa
-.else
-LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
+.if ${PORT_OPTIONS:MDRAGON}
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/dragon:${PORTSDIR}/multimedia/dragon
+.endif
+
+.if ${PORT_OPTIONS:MFFMPEG}
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/ffmpegthumbs.so:${PORTSDIR}/multimedia/kdemultimedia4-ffmpegthumbs
+.endif
+
+.if ${PORT_OPTIONS:MJUK}
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/juk:${PORTSDIR}/audio/juk
+.endif
+
+.if ${PORT_OPTIONS:MKIO_AUDIOCD}
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/libaudiocdplugins.so.5:${PORTSDIR}/audio/kio-audiocd
+.endif
+
+.if ${PORT_OPTIONS:MKMIX}
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kmix:${PORTSDIR}/audio/kmix
+.endif
+
+.if ${PORT_OPTIONS:MKSCD}
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kscd:${PORTSDIR}/audio/kscd
.endif
-.if defined(WITH_PULSEAUDIO)
-CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=ON
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-USE_GNOME= glib20
-.else
-CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
+.if ${PORT_OPTIONS:MMPLAYER}
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/mplayerthumbsconfig:${PORTSDIR}/multimedia/kdemultimedia4-mplayerthumbs
.endif
-post-install:
- @${CAT} ${PKGMESSAGE}
+do-install:
+ ${DO_NADA}
.include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
deleted file mode 100644
index 24a0836..0000000
--- a/multimedia/kdemultimedia4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/kdemultimedia-4.8.4.tar.xz) = 845e30056e48eef00e966b9d64d1a0fc2ed9877c82a8bbc7253aac7984dfa640
-SIZE (KDE/kdemultimedia-4.8.4.tar.xz) = 1500644
diff --git a/multimedia/kdemultimedia4/files/extrapatch-no_alsa b/multimedia/kdemultimedia4/files/extrapatch-no_alsa
deleted file mode 100644
index fdb9b46..0000000
--- a/multimedia/kdemultimedia4/files/extrapatch-no_alsa
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./CMakeLists.txt.orig 2012-05-13 11:39:57.594807250 +0200
-+++ ./CMakeLists.txt 2012-05-13 11:40:43.204991538 +0200
-@@ -6,7 +6,6 @@
- find_package(KDE4 REQUIRED)
- include(KDE4Defaults)
- include(MacroLibrary)
--find_package(Alsa)
-
- set(PULSEAUDIO_MINIMUM_VERSION "0.9.12")
- macro_optional_find_package(PulseAudio)
-@@ -15,7 +14,8 @@
- macro_optional_find_package(MusicBrainz3)
- macro_log_feature(MUSICBRAINZ3_FOUND "MusicBrainz3" "A library that provides access to metadata lookup on the MusicBrainz server" "http://www.musicbrainz.org" FALSE "" "Music metadata lookup for KDE multimedia applications. You need version 3.x of libmusicbrainz, otherwise kscd will not be compiled.")
-
--alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
-+find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH})
-+configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
-
- macro_optional_find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE)
- macro_log_feature(FFMPEG_FOUND "FFmpeg" "FFmpeg libraries" "FFmpeg" FALSE "http://www.ffmpeg.org" "FFmpeg required for FFMpegVideoPreview backend")
---- ./kmix/CMakeLists.txt.orig 2012-05-13 11:40:48.034926108 +0200
-+++ ./kmix/CMakeLists.txt 2012-05-13 11:41:22.134856828 +0200
-@@ -4,7 +4,6 @@
- include(KDE4Defaults)
- include(MacroLibrary)
-
--find_package(Alsa)
-
- macro_optional_find_package(PulseAudio "0.9.12")
- macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server" "http://www.pulseaudio.org/" FALSE "0.9.12" "libpulse is needed to let KMix control PulseAudio")
-@@ -12,7 +11,8 @@
- pkg_check_modules(CANBERRA libcanberra)
- macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback")
-
--alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
-+find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH})
-+configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
-
-
- add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
diff --git a/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp b/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp
deleted file mode 100644
index 715610f..0000000
--- a/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./kioslave/audiocd/audiocd.cpp.orig 2010-06-06 08:15:20.000000000 -0400
-+++ ./kioslave/audiocd/audiocd.cpp 2010-06-06 08:18:01.000000000 -0400
-@@ -229,20 +229,21 @@
- // name associated with the device, which throws the rest of audiocd
- // for a loop.
- //
-+ QString devname;
- if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) )
- {
- // For ATAPI devices, we have no real choice. Use the
- // user selected value, even if there is none.
- //
- kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user.";
-- cd->setDevice( drive->cdda_device_name );
-+ devname = drive->cdda_device_name;
- }
- else
- {
- kDebug(7117) << "Found a SCSI or ATAPICAM device.";
- if ( strlen(drive->dev->device_path) > 0 )
- {
-- cd->setDevice( drive->dev->device_path );
-+ devname = drive->dev->device_path;
- }
- else
- {
-@@ -250,13 +251,14 @@
- // circumstances, so build a representation from
- // the unit number and SCSI device name.
- //
-- QString devname = QString::fromLatin1( "/dev/%1%2" )
-+ devname = QString::fromLatin1( "/dev/%1%2" )
- .arg( drive->dev->given_dev_name )
- .arg( drive->dev->given_unit_number ) ;
- kDebug(7117) << " Using derived name " << devname;
-- cd->setDevice( devname );
- }
- }
-+ if ( cd->deviceName() != devname )
-+ cd->setDevice( devname );
- #else
- #ifdef __GNUC__
- #warning audiocd ioslave is not going to work for you
diff --git a/multimedia/kdemultimedia4/pkg-descr b/multimedia/kdemultimedia4/pkg-descr
index 47c201e..af1709e 100644
--- a/multimedia/kdemultimedia4/pkg-descr
+++ b/multimedia/kdemultimedia4/pkg-descr
@@ -1 +1,3 @@
Multimedia tools for KDE4.
+
+WWW: http://multimedia.kde.org
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
deleted file mode 100644
index af3129e..0000000
--- a/multimedia/kdemultimedia4/pkg-plist
+++ /dev/null
@@ -1,195 +0,0 @@
-bin/dragon
-bin/juk
-bin/kmix
-bin/kmixctrl
-bin/kscd
-bin/mplayerthumbsconfig
-include/audiocdencoder.h
-include/libkcddb/cdinfo.h
-include/libkcddb/cdinfodialog.h
-include/libkcddb/client.h
-include/libkcddb/configbase.h
-include/libkcddb/genres.h
-include/libkcddb/kcddb.h
-include/libkcddb/kcddb_export.h
-include/libkcddb/kcddbconfig.h
-include/libkcompactdisc/kcompactdisc.h
-lib/kde4/dragonpart.so
-lib/kde4/ffmpegthumbs.so
-lib/kde4/kcm_audiocd.so
-lib/kde4/kcm_cddb.so
-lib/kde4/kded_kmixd.so
-lib/kde4/kio_audiocd.so
-lib/kde4/libaudiocd_encoder_flac.so
-lib/kde4/libaudiocd_encoder_lame.so
-lib/kde4/libaudiocd_encoder_vorbis.so
-lib/kde4/libaudiocd_encoder_wav.so
-lib/kde4/plasma_engine_mixer.so
-lib/kde4/videopreview.so
-lib/libaudiocdplugins.so
-lib/libaudiocdplugins.so.5
-lib/libaudiocdplugins.so.5.0.1
-lib/libkcddb.so
-lib/libkcddb.so.5
-lib/libkcddb.so.5.0.1
-lib/libkcompactdisc.so
-lib/libkcompactdisc.so.5
-lib/libkcompactdisc.so.5.0.1
-lib/libkdeinit4_kmix.so
-lib/libkdeinit4_kmixctrl.so
-share/applications/kde4/dragonplayer.desktop
-share/applications/kde4/juk.desktop
-share/applications/kde4/kmix.desktop
-share/applications/kde4/kscd.desktop
-share/apps/dragonplayer/dragonlogo.png
-share/apps/dragonplayer/dragonplayerui.rc
-share/apps/juk/juk.notifyrc
-share/apps/juk/jukui-rtl.rc
-share/apps/juk/jukui.rc
-share/apps/juk/pics/playing.png
-share/apps/juk/pics/splash.png
-share/apps/juk/pics/theme.svg
-share/apps/juk/pics/yahoo_credit.png
-share/apps/kconf_update/audiocd.upd
-share/apps/kconf_update/kcmcddb-emailsettings.upd
-share/apps/kconf_update/upgrade-metadata.sh
-share/apps/kmix/kmixui.rc
-share/apps/kmix/pics/kmixdocked.png
-share/apps/kmix/pics/kmixdocked_error.png
-share/apps/kmix/pics/kmixdocked_mute.png
-share/apps/kmix/pics/mixer-ac97.png
-share/apps/kmix/pics/mixer-capture.png
-share/apps/kmix/pics/mixer-cd.png
-share/apps/kmix/pics/mixer-digital.png
-share/apps/kmix/pics/mixer-front.png
-share/apps/kmix/pics/mixer-headset.png
-share/apps/kmix/pics/mixer-lfe.png
-share/apps/kmix/pics/mixer-line.png
-share/apps/kmix/pics/mixer-master.png
-share/apps/kmix/pics/mixer-microphone.png
-share/apps/kmix/pics/mixer-midi.png
-share/apps/kmix/pics/mixer-pcm-default.png
-share/apps/kmix/pics/mixer-pcm.png
-share/apps/kmix/pics/mixer-surround.png
-share/apps/kmix/pics/mixer-video.png
-share/apps/kmix/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml
-share/apps/kmix/profiles/ALSA.capture.xml
-share/apps/kmix/profiles/ALSA.default.xml
-share/apps/kmix/profiles/ALSA.playback.xml
-share/apps/kmix/profiles/OSS.default.xml
-share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/kscd/skin/Chrome.svg
-share/apps/kscd/skin/Obsidian-Coast.svg
-share/apps/kscd/skin/Steel.svg
-share/apps/kscd/skin/default.svg
-share/apps/plasma/services/mixer.operations
-share/apps/solid/actions/dragonplayer-opendvd.desktop
-share/apps/solid/actions/kscd-play-audiocd.desktop
-share/apps/solid/actions/solid_audiocd.desktop
-share/apps/videothumbnail/sprocket-large.png
-share/apps/videothumbnail/sprocket-medium.png
-share/apps/videothumbnail/sprocket-small.png
-share/autostart/kmix_autostart.desktop
-share/autostart/restore_kmix_volumes.desktop
-share/config.kcfg/audiocd_lame_encoder.kcfg
-share/config.kcfg/audiocd_vorbis_encoder.kcfg
-share/config.kcfg/kscd.kcfg
-share/config.kcfg/libkcddb.kcfg
-share/config.kcfg/mplayerthumbs.kcfg
-share/config/dragonplayerrc
-share/dbus-1/interfaces/org.kde.juk.collection.xml
-share/dbus-1/interfaces/org.kde.juk.player.xml
-share/dbus-1/interfaces/org.kde.juk.search.xml
-share/dbus-1/interfaces/org.kde.kmix.control.xml
-share/dbus-1/interfaces/org.kde.kmix.mixer.xml
-share/dbus-1/interfaces/org.kde.kmix.mixset.xml
-share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
-share/doc/HTML/en/dragonplayer/common
-share/doc/HTML/en/dragonplayer/index.cache.bz2
-share/doc/HTML/en/dragonplayer/index.docbook
-share/doc/HTML/en/dragonplayer/main.png
-share/doc/HTML/en/dragonplayer/playmedia.png
-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/kcontrol/cddbretrieval/common
-share/doc/HTML/en/kcontrol/cddbretrieval/index.cache.bz2
-share/doc/HTML/en/kcontrol/cddbretrieval/index.docbook
-share/doc/HTML/en/kcontrol/cddbretrieval/kscd13.png
-share/doc/HTML/en/kcontrol/cddbretrieval/kscd14.png
-share/doc/HTML/en/kcontrol/cddbretrieval/kscd16.png
-share/doc/HTML/en/kioslave/audiocd/common
-share/doc/HTML/en/kioslave/audiocd/index.cache.bz2
-share/doc/HTML/en/kioslave/audiocd/index.docbook
-share/doc/HTML/en/kmix/common
-share/doc/HTML/en/kmix/index.cache.bz2
-share/doc/HTML/en/kmix/index.docbook
-share/doc/HTML/en/kmix/kmix-channels.png
-share/doc/HTML/en/kmix/kmix-configure.png
-share/doc/HTML/en/kmix/kmix-file.png
-share/doc/HTML/en/kmix/kmix-master.png
-share/doc/HTML/en/kmix/kmix-options.png
-share/doc/HTML/en/kmix/kmix.png
-share/icons/hicolor/128x128/apps/dragonplayer.png
-share/icons/hicolor/128x128/apps/juk.png
-share/icons/hicolor/128x128/apps/kmix.png
-share/icons/hicolor/128x128/apps/kscd.png
-share/icons/hicolor/16x16/apps/dragonplayer.png
-share/icons/hicolor/16x16/apps/juk.png
-share/icons/hicolor/16x16/apps/kmix.png
-share/icons/hicolor/16x16/apps/kscd.png
-share/icons/hicolor/22x22/apps/dragonplayer.png
-share/icons/hicolor/32x32/apps/dragonplayer.png
-share/icons/hicolor/32x32/apps/juk.png
-share/icons/hicolor/32x32/apps/kmix.png
-share/icons/hicolor/32x32/apps/kscd.png
-share/icons/hicolor/48x48/apps/dragonplayer.png
-share/icons/hicolor/48x48/apps/juk.png
-share/icons/hicolor/48x48/apps/kmix.png
-share/icons/hicolor/48x48/apps/kscd.png
-share/icons/hicolor/64x64/apps/dragonplayer.png
-share/icons/hicolor/64x64/apps/juk.png
-share/icons/hicolor/64x64/apps/kmix.png
-share/icons/hicolor/64x64/apps/kscd.png
-share/icons/hicolor/scalable/apps/dragonplayer.svgz
-share/icons/oxygen/16x16/actions/player-volume-muted.png
-share/icons/oxygen/22x22/actions/kscd-dock.png
-share/icons/oxygen/22x22/actions/player-volume-muted.png
-share/icons/oxygen/32x32/actions/player-volume-muted.png
-share/icons/oxygen/48x48/actions/player-volume-muted.png
-share/icons/oxygen/scalable/actions/player-volume-muted.svgz
-share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
-share/kde4/services/ServiceMenus/jukservicemenu.desktop
-share/kde4/services/audiocd.desktop
-share/kde4/services/audiocd.protocol
-share/kde4/services/dragonplayer_part.desktop
-share/kde4/services/ffmpegthumbs.desktop
-share/kde4/services/kded/kmixd.desktop
-share/kde4/services/kmixctrl_restore.desktop
-share/kde4/services/libkcddb.desktop
-share/kde4/services/plasma-engine-mixer.desktop
-share/kde4/services/videopreview.desktop
-@dirrm share/doc/HTML/en/kmix
-@dirrm share/doc/HTML/en/kioslave/audiocd
-@dirrm share/doc/HTML/en/kcontrol/cddbretrieval
-@dirrm share/doc/HTML/en/juk
-@dirrm share/doc/HTML/en/dragonplayer
-@dirrm share/apps/videothumbnail
-@dirrm share/apps/kscd/skin
-@dirrm share/apps/kscd
-@dirrm share/apps/kmix/profiles
-@dirrm share/apps/kmix/pics
-@dirrm share/apps/kmix
-@dirrm share/apps/juk/pics
-@dirrm share/apps/juk
-@dirrm share/apps/dragonplayer
-@dirrm include/libkcompactdisc
-@dirrm include/libkcddb
OpenPOWER on IntegriCloud