summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2004-12-13 20:12:15 +0000
committerlofi <lofi@FreeBSD.org>2004-12-13 20:12:15 +0000
commite39fbc5ae2bd5a22dad60f202c9563d3ee921f21 (patch)
treee4eecdbd1e46c824811adef86d0864427b661dde /multimedia
parent7c5b4afdcf5a87158973d62ec09dcf9fdc41765c (diff)
downloadFreeBSD-ports-e39fbc5ae2bd5a22dad60f202c9563d3ee921f21.zip
FreeBSD-ports-e39fbc5ae2bd5a22dad60f202c9563d3ee921f21.tar.gz
Update to KDE 3.3.2
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/kdemultimedia3/distinfo4
-rw-r--r--multimedia/kdemultimedia3/files/patch-akode-lib-localfile.h23
-rw-r--r--multimedia/kdemultimedia3/files/patch-arts-midi-Makefile.in15
-rw-r--r--multimedia/kdemultimedia3/files/patch-noatun-library-Makefile.in11
-rw-r--r--multimedia/kdemultimedia3/pkg-plist18
-rw-r--r--multimedia/kdemultimedia4/distinfo4
-rw-r--r--multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h23
-rw-r--r--multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in15
-rw-r--r--multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in11
-rw-r--r--multimedia/kdemultimedia4/pkg-plist18
-rw-r--r--multimedia/noatun-plugins/distinfo4
-rw-r--r--multimedia/noatun-plugins/pkg-plist2
-rw-r--r--multimedia/xine_artsplugin/distinfo4
13 files changed, 65 insertions, 87 deletions
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 871927d..86bf7c8 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdemultimedia-3.3.1.tar.bz2) = 4a3462ba7b37e0057eadd24541908f95
-SIZE (KDE/kdemultimedia-3.3.1.tar.bz2) = 5362949
+MD5 (KDE/kdemultimedia-3.3.2.tar.bz2) = 2f393da809542dab5bf75bf7a91d1ec0
+SIZE (KDE/kdemultimedia-3.3.2.tar.bz2) = 5384470
diff --git a/multimedia/kdemultimedia3/files/patch-akode-lib-localfile.h b/multimedia/kdemultimedia3/files/patch-akode-lib-localfile.h
new file mode 100644
index 0000000..e1fad24
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-akode-lib-localfile.h
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /home/kde/kdemultimedia/akode/lib/localfile.h,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- akode/lib/localfile.h 2004/07/29 14:45:13 1.6
++++ akode/lib/localfile.h 2004/09/19 19:16:50 1.7
+@@ -23,6 +23,15 @@
+
+ #include "file.h"
+
++#ifdef __FreeBSD__
++// There is an unfortunate #define in some obscure FBSD system
++// header that turns fileno into a macro to account for threading
++// issues; we undef it in this case.
++#ifdef fileno
++#undef fileno
++#endif
++#endif
++
+ namespace aKode {
+
+ //! An implementation of the File interface for local-file access
diff --git a/multimedia/kdemultimedia3/files/patch-arts-midi-Makefile.in b/multimedia/kdemultimedia3/files/patch-arts-midi-Makefile.in
deleted file mode 100644
index 6fc28e6..0000000
--- a/multimedia/kdemultimedia3/files/patch-arts-midi-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- arts/midi/Makefile.in.orig Mon Aug 16 12:41:44 2004
-+++ arts/midi/Makefile.in Thu Oct 7 23:04:57 2004
-@@ -687,10 +687,10 @@
- done
- midisend$(EXEEXT): $(midisend_OBJECTS) $(midisend_DEPENDENCIES)
- @rm -f midisend$(EXEEXT)
-- $(CXXLINK) $(midisend_LDFLAGS) $(midisend_OBJECTS) $(midisend_LDADD) $(LIBS)
-+ $(CXXLINK) $(midisend_LDFLAGS) $(midisend_OBJECTS) $(midisend_LDADD) $(LIBS) $(LIBPTHREAD)
- midisynctest$(EXEEXT): $(midisynctest_OBJECTS) $(midisynctest_DEPENDENCIES)
- @rm -f midisynctest$(EXEEXT)
-- $(CXXLINK) $(midisynctest_LDFLAGS) $(midisynctest_OBJECTS) $(midisynctest_LDADD) $(LIBS)
-+ $(CXXLINK) $(midisynctest_LDFLAGS) $(midisynctest_OBJECTS) $(midisynctest_LDADD) $(LIBS) $(LIBPTHREAD)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/multimedia/kdemultimedia3/files/patch-noatun-library-Makefile.in b/multimedia/kdemultimedia3/files/patch-noatun-library-Makefile.in
deleted file mode 100644
index b42c27d..0000000
--- a/multimedia/kdemultimedia3/files/patch-noatun-library-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- noatun/library/Makefile.in.orig Thu Jan 29 01:38:34 2004
-+++ noatun/library/Makefile.in Thu Jan 29 01:39:01 2004
-@@ -638,7 +638,7 @@
- done
- gentable$(EXEEXT): $(gentable_OBJECTS) $(gentable_DEPENDENCIES)
- @rm -f gentable$(EXEEXT)
-- $(CXXLINK) $(gentable_LDFLAGS) $(gentable_OBJECTS) $(gentable_LDADD) $(LIBS)
-+ $(CXXLINK) $(gentable_LDFLAGS) $(gentable_OBJECTS) $(gentable_LDADD) $(LIBS) $(USE_THREADS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index 6359bd8..39e1068 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -554,6 +554,11 @@ share/apps/kmid/maps/YamahaPSS790.map
share/apps/kmid/maps/YamahaQY10.map
share/apps/kmid/maps/gm.map
share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/Listener.png
+share/apps/kmix/pics/SpeakerFrontLeft.png
+share/apps/kmix/pics/SpeakerFrontRight.png
+share/apps/kmix/pics/SpeakerRearLeft.png
+share/apps/kmix/pics/SpeakerRearRight.png
share/apps/kmix/pics/kmixdocked.png
share/apps/kmix/pics/kmixdocked_error.png
share/apps/kmix/pics/kmixdocked_mute.png
@@ -1056,26 +1061,17 @@ 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/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
@@ -1120,8 +1116,6 @@ share/servicetypes/krec_exportitem.desktop
@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
@@ -1135,8 +1129,6 @@ share/servicetypes/krec_exportitem.desktop
@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
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 871927d..86bf7c8 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdemultimedia-3.3.1.tar.bz2) = 4a3462ba7b37e0057eadd24541908f95
-SIZE (KDE/kdemultimedia-3.3.1.tar.bz2) = 5362949
+MD5 (KDE/kdemultimedia-3.3.2.tar.bz2) = 2f393da809542dab5bf75bf7a91d1ec0
+SIZE (KDE/kdemultimedia-3.3.2.tar.bz2) = 5384470
diff --git a/multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h b/multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h
new file mode 100644
index 0000000..e1fad24
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /home/kde/kdemultimedia/akode/lib/localfile.h,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- akode/lib/localfile.h 2004/07/29 14:45:13 1.6
++++ akode/lib/localfile.h 2004/09/19 19:16:50 1.7
+@@ -23,6 +23,15 @@
+
+ #include "file.h"
+
++#ifdef __FreeBSD__
++// There is an unfortunate #define in some obscure FBSD system
++// header that turns fileno into a macro to account for threading
++// issues; we undef it in this case.
++#ifdef fileno
++#undef fileno
++#endif
++#endif
++
+ namespace aKode {
+
+ //! An implementation of the File interface for local-file access
diff --git a/multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in b/multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in
deleted file mode 100644
index 6fc28e6..0000000
--- a/multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- arts/midi/Makefile.in.orig Mon Aug 16 12:41:44 2004
-+++ arts/midi/Makefile.in Thu Oct 7 23:04:57 2004
-@@ -687,10 +687,10 @@
- done
- midisend$(EXEEXT): $(midisend_OBJECTS) $(midisend_DEPENDENCIES)
- @rm -f midisend$(EXEEXT)
-- $(CXXLINK) $(midisend_LDFLAGS) $(midisend_OBJECTS) $(midisend_LDADD) $(LIBS)
-+ $(CXXLINK) $(midisend_LDFLAGS) $(midisend_OBJECTS) $(midisend_LDADD) $(LIBS) $(LIBPTHREAD)
- midisynctest$(EXEEXT): $(midisynctest_OBJECTS) $(midisynctest_DEPENDENCIES)
- @rm -f midisynctest$(EXEEXT)
-- $(CXXLINK) $(midisynctest_LDFLAGS) $(midisynctest_OBJECTS) $(midisynctest_LDADD) $(LIBS)
-+ $(CXXLINK) $(midisynctest_LDFLAGS) $(midisynctest_OBJECTS) $(midisynctest_LDADD) $(LIBS) $(LIBPTHREAD)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in b/multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in
deleted file mode 100644
index b42c27d..0000000
--- a/multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- noatun/library/Makefile.in.orig Thu Jan 29 01:38:34 2004
-+++ noatun/library/Makefile.in Thu Jan 29 01:39:01 2004
-@@ -638,7 +638,7 @@
- done
- gentable$(EXEEXT): $(gentable_OBJECTS) $(gentable_DEPENDENCIES)
- @rm -f gentable$(EXEEXT)
-- $(CXXLINK) $(gentable_LDFLAGS) $(gentable_OBJECTS) $(gentable_LDADD) $(LIBS)
-+ $(CXXLINK) $(gentable_LDFLAGS) $(gentable_OBJECTS) $(gentable_LDADD) $(LIBS) $(USE_THREADS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 6359bd8..39e1068 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -554,6 +554,11 @@ share/apps/kmid/maps/YamahaPSS790.map
share/apps/kmid/maps/YamahaQY10.map
share/apps/kmid/maps/gm.map
share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/Listener.png
+share/apps/kmix/pics/SpeakerFrontLeft.png
+share/apps/kmix/pics/SpeakerFrontRight.png
+share/apps/kmix/pics/SpeakerRearLeft.png
+share/apps/kmix/pics/SpeakerRearRight.png
share/apps/kmix/pics/kmixdocked.png
share/apps/kmix/pics/kmixdocked_error.png
share/apps/kmix/pics/kmixdocked_mute.png
@@ -1056,26 +1061,17 @@ 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/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
@@ -1120,8 +1116,6 @@ share/servicetypes/krec_exportitem.desktop
@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
@@ -1135,8 +1129,6 @@ share/servicetypes/krec_exportitem.desktop
@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
diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo
index ddf6c6f..cdd24c4 100644
--- a/multimedia/noatun-plugins/distinfo
+++ b/multimedia/noatun-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeaddons-3.3.1.tar.bz2) = 69ec1deff7ae2d0c3602bb141ed4c546
-SIZE (KDE/kdeaddons-3.3.1.tar.bz2) = 1556965
+MD5 (KDE/kdeaddons-3.3.2.tar.bz2) = d1ad11def2ac30965642144ef29d738a
+SIZE (KDE/kdeaddons-3.3.2.tar.bz2) = 1563856
diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist
index f7b497c..4514115 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.3.1
+share/applications/kdeaddons-noatun-plugins-3.3.2
share/apps/noatun/alsaplayerui.plugin
share/apps/noatun/blurscope.plugin
share/apps/noatun/charlatanui.plugin
diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo
index 871927d..86bf7c8 100644
--- a/multimedia/xine_artsplugin/distinfo
+++ b/multimedia/xine_artsplugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdemultimedia-3.3.1.tar.bz2) = 4a3462ba7b37e0057eadd24541908f95
-SIZE (KDE/kdemultimedia-3.3.1.tar.bz2) = 5362949
+MD5 (KDE/kdemultimedia-3.3.2.tar.bz2) = 2f393da809542dab5bf75bf7a91d1ec0
+SIZE (KDE/kdemultimedia-3.3.2.tar.bz2) = 5384470
OpenPOWER on IntegriCloud