- Update to 4.5.0.

Submitted by:	Raphael Kubo da Costa <kubito@gmail.com> via area51

5 files changed, 4 insertions, 66 deletions

diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 29de4a7aa617..b8acfa923c62 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.4.4
-CATEGORIES=	multimedia kde ipv6
+PORTVERSION=	4.5.0
+CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-gstreamer
@@ -37,10 +37,6 @@ CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
 IGNORE=		conflicts with Qt4 phonon. Please, deinstall qt4-phonon-gst and set WITH_KDE_PHONON to continue
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
-		${PATCH_WRKSRC}/CMakeLists.txt
-
 pre-su-install:
 	${MKDIR} ${QT_PLUGINDIR}/phonon_backend
 
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
index 521a3919b8e1..8daf59bb9783 100644
--- a/multimedia/phonon-gstreamer/distinfo
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-gstreamer-4.4.4.tar.bz2) = 5696eadfab929bede4b04991e35291317571b8584b3c5fa6cdb158052fd3909e
-SIZE (KDE/phonon-backend-gstreamer-4.4.4.tar.bz2) = 87242
+SHA256 (KDE/phonon-backend-gstreamer-4.5.0.tar.bz2) = a90874728b4eba089eb427fa1df2b65df387c08380df880ff5fa8f9beb85f79e
+SIZE (KDE/phonon-backend-gstreamer-4.5.0.tar.bz2) = 89682
diff --git a/multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake b/multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake
index cfcd9876a824..fa79f7cd042f 100644
--- a/multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake
+++ b/multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake
@@ -1,18 +1,5 @@
 --- ./cmake/FindGObject.cmake.orig	2008-11-24 20:11:55.000000000 +0300
 +++ ./cmake/FindGObject.cmake	2009-02-21 01:19:39.000000000 +0300
-@@ -23,10 +23,12 @@
-    # in the FIND_PATH() and FIND_LIBRARY() calls
-    PKG_CHECK_MODULES(PKG_GOBJECT2 REQUIRED gobject-2.0)
-    SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
-+   PKG_CHECK_MODULES(PKG_GLIB REQUIRED glib-2.0)
- ENDIF (NOT WIN32)
- 
- FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
-    PATHS
-+   ${PKG_GLIB_INCLUDE_DIRS}
-    ${PKG_GOBJECT2_INCLUDE_DIRS}
-    /usr/include/glib-2.0/
-    PATH_SUFFIXES glib-2.0
 @@ -52,7 +54,7 @@
  IF (WIN32)
  SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs})
diff --git a/multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt b/multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt
deleted file mode 100644
index 26036ba4be74..000000000000
--- a/multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./gstreamer/CMakeLists.txt.orig	2010-11-24 21:26:19.000000000 +0300
-+++ ./gstreamer/CMakeLists.txt	2010-11-27 00:44:31.334007404 +0300
-@@ -19,6 +19,7 @@
- if (BUILD_PHONON_GSTREAMER)
-    include_directories(
-           ${CMAKE_CURRENT_BINARY_DIR}
-+          ${PHONON_INCLUDES}
-           ${GSTREAMER_INCLUDE_DIR}
-           ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR}
-           ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR}
diff --git a/multimedia/phonon-gstreamer/files/patch-gstreamer__mediaobject.cpp b/multimedia/phonon-gstreamer/files/patch-gstreamer__mediaobject.cpp
deleted file mode 100644
index b3d41d3dc006..000000000000
--- a/multimedia/phonon-gstreamer/files/patch-gstreamer__mediaobject.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
---- gstreamer/mediaobject.cpp
-+++ gstreamer/mediaobject.cpp
-@@ -31,6 +31,7 @@
- #include <QtCore/QEvent>
- #include <QtCore/QFile>
- #include <QtCore/QLibrary>
-+#include <QtCore/QPointer>
- #include <QtCore/QStringList>
- #include <QtCore/QTimer>
- #include <QtCore/QVector>
-@@ -244,10 +245,11 @@ void MediaObject::pluginInstallationResult(GstInstallPluginsReturn result)
- 
- void MediaObject::pluginInstallationDone(GstInstallPluginsReturn result, gpointer userData)
- {
--    MediaObject *mediaObject = static_cast<MediaObject*>(userData);
--    Q_ASSERT(mediaObject);
--    qRegisterMetaType<GstInstallPluginsReturn>("GstInstallPluginsReturn");
--    QMetaObject::invokeMethod(mediaObject, "pluginInstallationResult", Qt::QueuedConnection, Q_ARG(GstInstallPluginsReturn, result));
-+    QPointer<MediaObject> *that = static_cast<QPointer<MediaObject>*>(userData);
-+    if (*that) {
-+        qRegisterMetaType<GstInstallPluginsReturn>("GstInstallPluginsReturn");
-+        QMetaObject::invokeMethod(*that, "pluginInstallationResult", Qt::QueuedConnection, Q_ARG(GstInstallPluginsReturn, result));
-+    }
- }
- #endif // PLUGIN_INSTALL_API
- 
-@@ -268,7 +270,7 @@ void MediaObject::installMissingCodecs()
-         details[1] = NULL;
-         GstInstallPluginsReturn status;
- 
--        status = gst_install_plugins_async(details, ctx, pluginInstallationDone, this);
-+        status = gst_install_plugins_async(details, ctx, pluginInstallationDone, new QPointer<MediaObject>(this));
-         gst_install_plugins_context_free(ctx);
- 
-         if (status != GST_INSTALL_PLUGINS_STARTED_OK) {