From 431622844fcecf9286bca43cbdd9e3ae5ff5e273 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Tue, 12 Sep 2006 23:26:52 +0000 Subject: KDE 3.5.4 / KOffice 1.5.2 --- multimedia/kdemultimedia3/Makefile | 9 ++++-- multimedia/kdemultimedia3/distinfo | 6 ++-- ...patch-akode_artsplugin_akodePlayObject_impl.cpp | 33 ---------------------- .../files/patch-kioslave_audiocd-audiocd.cpp | 14 --------- multimedia/kdemultimedia3/pkg-plist | 16 ++++++----- 5 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp delete mode 100644 multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp (limited to 'multimedia/kdemultimedia3') diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 859e159c612b..c64189e81f68 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -25,7 +24,6 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ ogg:${PORTSDIR}/audio/libogg \ tag:${PORTSDIR}/audio/taglib \ - theora:${PORTSDIR}/multimedia/libtheora \ vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 @@ -50,6 +48,13 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include +.if ${OSVERSION} > 500035 +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +PLIST_SUB+= THEORA="" +.else +PLIST_SUB+= THEORA="@comment " +.endif + .if !defined(WITHOUT_AKODE) RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode .endif diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 51232e3eeb35..a3c9dfa3cb96 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.3.tar.bz2) = 61bd938c564e3280034944338955712b -SHA256 (KDE/kdemultimedia-3.5.3.tar.bz2) = 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f -SIZE (KDE/kdemultimedia-3.5.3.tar.bz2) = 6276838 +MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33 +SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b +SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789 diff --git a/multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp b/multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp deleted file mode 100644 index cf6e40c60d1c..000000000000 --- a/multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- akode_artsplugin/akodePlayObject_impl.cpp.orig Fri Jul 21 22:10:02 2006 -+++ akode_artsplugin/akodePlayObject_impl.cpp Fri Jul 21 22:13:13 2006 -@@ -82,6 +82,8 @@ - - akodePlayObject_impl::~akodePlayObject_impl() - { -+ delete m_packetQueue; -+ - unload(); - } - -@@ -219,10 +221,9 @@ - delete bufferedDecoder; - bufferedDecoder = 0; - } --#else -- delete frameDecoder -- frameDecoder = 0; - #endif -+ delete frameDecoder; -+ frameDecoder = 0; - decoder = 0; - if (buffer != inBuffer) - delete inBuffer; -@@ -301,7 +302,7 @@ - { - arts_debug("akode: readFrame"); - -- if (!buffer || !decoder) return false; -+ if (!inBuffer || !decoder) return false; - if (m_bytebuffer) processQueue(); - if(!decoder->readFrame(inBuffer)) { - if (decoder->eof()) { \ No newline at end of file diff --git a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp deleted file mode 100644 index 32f3f1f33d70..000000000000 --- a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- kioslave/audiocd/audiocd.cpp.orig Fri May 26 21:28:16 2006 -+++ kioslave/audiocd/audiocd.cpp Fri May 26 21:29:42 2006 -@@ -213,7 +213,11 @@ - return 0; - - // Update our knowledge of the disc -+#if defined(Q_OS_LINUX) - d->cd.setDevice(drive->ioctl_device_name, 50, false); -+#elif defined(Q_OS_FREEBSD) -+ d->cd.setDevice(drive->cdda_device_name, 50, false); -+#endif - #if 0 - // FreeBSD's cdparanoia as of january 5th 2006 has rather broken - // support for non-SCSI devices. Although it finds ATA cdroms just diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist index ef21594fa8e2..f70efa92cd89 100644 --- a/multimedia/kdemultimedia3/pkg-plist +++ b/multimedia/kdemultimedia3/pkg-plist @@ -105,9 +105,9 @@ lib/kde3/kfile_ogg.so lib/kde3/kfile_sid.a lib/kde3/kfile_sid.la lib/kde3/kfile_sid.so -lib/kde3/kfile_theora.a -lib/kde3/kfile_theora.la -lib/kde3/kfile_theora.so +%%THEORA%%lib/kde3/kfile_theora.a +%%THEORA%%lib/kde3/kfile_theora.la +%%THEORA%%lib/kde3/kfile_theora.so lib/kde3/kfile_wav.a lib/kde3/kfile_wav.la lib/kde3/kfile_wav.so @@ -207,6 +207,11 @@ lib/kde3/noatunsimple.so lib/libarts_akode.a lib/libarts_akode.la lib/libarts_akode.so +lib/libarts_akode.so.0 +lib/libarts_audiofile.a +lib/libarts_audiofile.la +lib/libarts_audiofile.so +lib/libarts_audiofile.so.0 lib/libartsbuilder.a lib/libartsbuilder.la lib/libartsbuilder.so @@ -266,9 +271,6 @@ lib/libaudiocdplugins.a lib/libaudiocdplugins.la lib/libaudiocdplugins.so lib/libaudiocdplugins.so.1 -lib/libaudiofilearts.a -lib/libaudiofilearts.la -lib/libaudiofilearts.so lib/libkcddb.a lib/libkcddb.la lib/libkcddb.so @@ -1126,7 +1128,7 @@ share/services/kfile_mpc.desktop share/services/kfile_mpeg.desktop share/services/kfile_ogg.desktop share/services/kfile_sid.desktop -share/services/kfile_theora.desktop +%%THEORA%%share/services/kfile_theora.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop -- cgit v1.2.3