[lfs-patches] r3296 - trunk/phonon-backend-gstreamer

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Wed Nov 4 10:05:27 PST 2015


Author: bdubbs
Date: Wed Nov  4 10:05:27 2015
New Revision: 3296

Log:
Add phonon-backend patch for updated gstreamer

Added:
   trunk/phonon-backend-gstreamer/
   trunk/phonon-backend-gstreamer/phonon-backend-gstreamer-4.6.2-compatibility-1.patch

Added: trunk/phonon-backend-gstreamer/phonon-backend-gstreamer-4.6.2-compatibility-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/phonon-backend-gstreamer/phonon-backend-gstreamer-4.6.2-compatibility-1.patch	Wed Nov  4 10:05:27 2015	(r3296)
@@ -0,0 +1,53 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
+Date: 2015-11-04
+Initial Package Version: 4.6.2
+Upstream Status: Committed
+Origin: KDE
+Description: This is the patch allows building phonon-backend-gstreamer
+             with the gstreamer-1.6.x phonon series
+
+Author: Alex Merry
+Description: Fix finding recent version of gstreamer
+Commit: https://git.reviewboard.kde.org/r/125690/
+--- a/cmake/FindGStreamer.cmake
++++ b/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")


More information about the patches mailing list