diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-10-28 02:44:03 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-10-28 02:44:51 +1100 |
| commit | 55eb518528a1627c0de95d9812c6d8defb7b6476 (patch) | |
| tree | 5fa0b9d06a55754c55ed6a12a3bf868b8f187eaf | |
| parent | f05e8b5530c454a335e392d09c1669960056453f (diff) | |
| download | gentoo-55eb518528a1627c0de95d9812c6d8defb7b6476.tar.gz gentoo-55eb518528a1627c0de95d9812c6d8defb7b6476.tar.xz | |
media-libs/phonon-gstreamer: backport patch from upstream fixing build with media-libs/gstreamer-1.6.0
Gentoo-bug: 564206
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch | 61 | ||||
| -rw-r--r-- | media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild | 2 |
2 files changed, 63 insertions, 0 deletions
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch new file mode 100644 index 00000000000..039aebc0dc1 --- /dev/null +++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.8.2-gstreamer-1.6.0.patch @@ -0,0 +1,61 @@ +From da48b7fceed0238884f341530b5f4d84005dab57 Mon Sep 17 00:00:00 2001 +From: Alex Merry <alex.merry@kde.org> +Date: Sun, 18 Oct 2015 15:21:45 +0100 +Subject: [PATCH] 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 d7243d4..e30c349 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.4.10 + diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild index 9159564c04c..4c6c7fdab15 100644 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.8.2.ebuild @@ -54,6 +54,8 @@ DEPEND="${RDEPEND} [[ ${PV} == 9999 ]] || S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}/${P}-gstreamer-1.6.0.patch" ) + pkg_setup() { MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) } |