[146626] trunk/dports/audio/phonon-backend-gstreamer

[ryandesign at macports.org]

Revision: 146626
          https://trac.macports.org/changeset/146626
Author:   ryandesign at macports.org
Date:     2016-03-14 02:14:57 -0700 (Mon, 14 Mar 2016)
Log Message:
-----------
phonon-backend-gstreamer: fix build failure with recent gstreamer (#50049)

Modified Paths:
--------------
    trunk/dports/audio/phonon-backend-gstreamer/Portfile

Added Paths:
-----------
    trunk/dports/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff

Modified: trunk/dports/audio/phonon-backend-gstreamer/Portfile
===================================================================
--- trunk/dports/audio/phonon-backend-gstreamer/Portfile	2016-03-14 08:06:40 UTC (rev 146625)
+++ trunk/dports/audio/phonon-backend-gstreamer/Portfile	2016-03-14 09:14:57 UTC (rev 146626)
@@ -25,14 +25,13 @@
 
 depends_build-append port:automoc
 
-# do VPATH (out of source tree) build
+patchfiles          patch-cmake-FindGStreamer.cmake.diff \
+                    phononBGSTr-avoid-x11renderer.patch
 
 cmake.out_of_source yes
 
 configure.args-append -DPhonon_DIR=${cmake_share_module_dir}/phonon
 
-patchfiles          phononBGSTr-avoid-x11renderer.patch
-
 livecheck.type		regex
 livecheck.url		http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/
 livecheck.regex		"\(\\d+(?:\\.\\d+)*)\/"

Added: trunk/dports/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff
===================================================================
--- trunk/dports/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff	                        (rev 0)
+++ trunk/dports/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff	2016-03-14 09:14:57 UTC (rev 146626)
@@ -0,0 +1,43 @@
+https://git.reviewboard.kde.org/r/125690/
+--- cmake/FindGStreamer.cmake.orig
++++ cmake/FindGStreamer.cmake
+@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+    PATH_SUFFIXES gstreamer-1.0
+    )
+ 
++IF (NOT GSTREAMER_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
++ENDIF (NOT GSTREAMER_INCLUDE_DIR)
++
++# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
++   PATHS
++   ${PKG_GSTREAMER_INCLUDE_DIRS}
++   PATH_SUFFIXES gstreamer-1.0
++   )
++
++IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
++ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++
++IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++   IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
++      LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
++   ENDIF()
++ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+    PATHS
+    ${PKG_GSTREAMER_LIBRARY_DIRS}
+@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
+    ${PKG_GSTREAMER_LIBRARY_DIRS}
+    )
+ 
+-IF (GSTREAMER_INCLUDE_DIR)
+-ELSE (GSTREAMER_INCLUDE_DIR)
+-   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+-ENDIF (GSTREAMER_INCLUDE_DIR)
+-
+ IF (GSTREAMER_LIBRARIES)
+ ELSE (GSTREAMER_LIBRARIES)
+    MESSAGE(STATUS "GStreamer: WARNING: library not found")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160314/c463f9ba/attachment-0001.html>