Hello community,
here is the log from the commit of package phonon4qt5-backend-gstreamer for
openSUSE:Factory checked in at 2015-11-24 22:29:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phonon4qt5-backend-gstreamer (Old)
and /work/SRC/openSUSE:Factory/.phonon4qt5-backend-gstreamer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon4qt5-backend-gstreamer"
Changes:
--------
---
/work/SRC/openSUSE:Factory/phonon4qt5-backend-gstreamer/phonon4qt5-backend-gstreamer.changes
2015-01-07 09:38:14.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.phonon4qt5-backend-gstreamer.new/phonon4qt5-backend-gstreamer.changes
2015-11-24 22:29:31.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 20 19:57:37 UTC 2015 - [email protected]
+
+- Added Fix-finding-recent-versions-of-GStreamer.patch: search for
+ gstreamer in new location since gstreamer >= 1.6
+
+-------------------------------------------------------------------
New:
----
Fix-finding-recent-versions-of-GStreamer.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon4qt5-backend-gstreamer.spec ++++++
--- /var/tmp/diff_new_pack.VdGICh/_old 2015-11-24 22:29:31.000000000 +0100
+++ /var/tmp/diff_new_pack.VdGICh/_new 2015-11-24 22:29:31.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package phonon4qt5-backend-gstreamer
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@
%define filename phonon-backend-gstreamer
%define _phonon4qt5_version 4.8.0
Source:
http://download.kde.org/stable/phonon/%{filename}/%{version}/src/%{filename}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM Fix-finding-recent-versions-of-GStreamer.patch
+Patch0: Fix-finding-recent-versions-of-GStreamer.patch
BuildRequires: alsa-devel
BuildRequires: cmake
BuildRequires: kf5-filesystem
@@ -55,6 +57,7 @@
%prep
%setup -q -n %{filename}-%{version}
+%patch0 -p1
%build
%cmake_kf5 -d build -- -DPHONON_BUILD_PHONON4QT5=ON
++++++ Fix-finding-recent-versions-of-GStreamer.patch ++++++
>From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001
From: Alex Merry <[email protected]>
Date: Sun, 18 Oct 2015 15:21:45 +0100
Subject: [PATCH 1/1] Fix finding recent versions of GStreamer.
Newer versions of GStreamer put gst-config.h under
lib/gstreamer-1.0/include, so we need to make sure that directory will
be added to the include path as well.
REVIEW: 125690
---
cmake/FindGStreamer.cmake | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index
d7243d4c1b86d38ba27b3350f0460f29eb563ba7..e30c3499d2c0e7f3fd74c6d0aeaa4b78d8c00b15
100644
--- 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")
--
2.6.2
