Update to 4.4.2

8 files changed, 15 insertions, 66 deletions

diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 1519d9806b68..0784acbca240 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -5,12 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.4.1
-PORTREVISION=	0
+PORTVERSION=	4.4.2
 CATEGORIES=	multimedia kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE} \
-		http://ns.ael.ru/~fluffy.khv/distfiles/
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_KDE}
 PKGNAMESUFFIX=	-gstreamer
 DIST_SUBDIR=	KDE
 
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
index f8471851a1b8..5a88286e5da7 100644
--- a/multimedia/phonon-gstreamer/distinfo
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/phonon-4.4.1.tar.bz2) = 5a1444f009a77054f16fea38c08e6cb5
-SHA256 (KDE/phonon-4.4.1.tar.bz2) = 8a52b0e74c5fb5c8dd3ce65d745c7052cdcea0e7535658fbc655671cef5e5277
-SIZE (KDE/phonon-4.4.1.tar.bz2) = 625008
+MD5 (KDE/phonon-4.4.2.tar.bz2) = d9eab28383783261254f1cef3b92a3fa
+SHA256 (KDE/phonon-4.4.2.tar.bz2) = f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
+SIZE (KDE/phonon-4.4.2.tar.bz2) = 629193
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index 3775cba3045d..57fcce5cbb5c 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -5,12 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.4.1
-PORTREVISION=	0
+PORTVERSION=	4.4.2
 CATEGORIES=	multimedia kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE} \
-		http://ns.ael.ru/~fluffy.khv/distfiles/
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_KDE}
 PKGNAMESUFFIX=	-xine
 DIST_SUBDIR=	KDE
 
diff --git a/multimedia/phonon-xine/distinfo b/multimedia/phonon-xine/distinfo
index f8471851a1b8..5a88286e5da7 100644
--- a/multimedia/phonon-xine/distinfo
+++ b/multimedia/phonon-xine/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/phonon-4.4.1.tar.bz2) = 5a1444f009a77054f16fea38c08e6cb5
-SHA256 (KDE/phonon-4.4.1.tar.bz2) = 8a52b0e74c5fb5c8dd3ce65d745c7052cdcea0e7535658fbc655671cef5e5277
-SIZE (KDE/phonon-4.4.1.tar.bz2) = 625008
+MD5 (KDE/phonon-4.4.2.tar.bz2) = d9eab28383783261254f1cef3b92a3fa
+SHA256 (KDE/phonon-4.4.2.tar.bz2) = f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
+SIZE (KDE/phonon-4.4.2.tar.bz2) = 629193
diff --git a/multimedia/phonon-xine/files/patch-xine_audiooutput.cpp b/multimedia/phonon-xine/files/patch-xine_audiooutput.cpp
deleted file mode 100644
index b491d312385e..000000000000
--- a/multimedia/phonon-xine/files/patch-xine_audiooutput.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./xine/audiooutput.cpp
-+++ ./xine/audiooutput.cpp
-@@ -48,6 +48,7 @@
- 
- AudioOutput::AudioOutput(QObject *parent)
-     : AbstractAudioOutput(new AudioOutputXT, parent)
-+    , m_volume(1.0)
- {
- }
- 
\ No newline at end of file
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 4bce3580139f..d1ecce4c0970 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.4.1
+PORTVERSION=	4.4.2
 CATEGORIES=	multimedia kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE} \
-		http://ns.ael.ru/~fluffy.khv/distfiles/
+MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	KDE
 
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index f8471851a1b8..5a88286e5da7 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/phonon-4.4.1.tar.bz2) = 5a1444f009a77054f16fea38c08e6cb5
-SHA256 (KDE/phonon-4.4.1.tar.bz2) = 8a52b0e74c5fb5c8dd3ce65d745c7052cdcea0e7535658fbc655671cef5e5277
-SIZE (KDE/phonon-4.4.1.tar.bz2) = 625008
+MD5 (KDE/phonon-4.4.2.tar.bz2) = d9eab28383783261254f1cef3b92a3fa
+SHA256 (KDE/phonon-4.4.2.tar.bz2) = f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
+SIZE (KDE/phonon-4.4.2.tar.bz2) = 629193
diff --git a/multimedia/phonon/files/patch-phonon_pulsesupport.cpp b/multimedia/phonon/files/patch-phonon_pulsesupport.cpp
deleted file mode 100644
index 3b54bdce8fcf..000000000000
--- a/multimedia/phonon/files/patch-phonon_pulsesupport.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./phonon/pulsesupport.cpp
-+++ ./phonon/pulsesupport.cpp
-@@ -569,6 +569,31 @@
-                 return;
-             }
-             pa_operation_unref(o);
-+
-+            // In the case of reconnection or simply lagging behind the stream object creation
-+            // on startup (due to the probe+reconnect system), we invalidate all loaded streams
-+            // and then load up info about all streams.
-+            for (QMap<QString, PulseStream*>::iterator it = s_outputStreams.begin(); it != s_outputStreams.end(); ++it) {
-+              PulseStream *stream = *it;
-+              logMessage(QString("Phonon Output Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid()));
-+              stream->setIndex(PA_INVALID_INDEX);
-+            }
-+            if (!(o = pa_context_get_sink_input_info_list(c, sink_input_cb, NULL))) {
-+              logMessage(QString("pa_context_get_sink_input_info_list() failed"));
-+              return;
-+            }
-+            pa_operation_unref(o);
-+
-+            for (QMap<QString, PulseStream*>::iterator it = s_captureStreams.begin(); it != s_captureStreams.end(); ++it) {
-+              PulseStream *stream = *it;
-+              logMessage(QString("Phonon Capture Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid()));
-+              stream->setIndex(PA_INVALID_INDEX);
-+            }
-+            if (!(o = pa_context_get_source_output_info_list(c, source_output_cb, NULL))) {
-+              logMessage(QString("pa_context_get_source_output_info_list() failed"));
-+              return;
-+            }
-+            pa_operation_unref(o);
-         }
- 
- #ifdef HAVE_PULSEAUDIO_DEVICE_MANAGER
\ No newline at end of file