diff options
| author | markd <markd@pkgsrc.org> | 2015-11-30 08:36:36 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2015-11-30 08:36:36 +0000 |
| commit | e160ccebd0021c1fb19a3ee4316edc0a2498cee7 (patch) | |
| tree | 8e595e467fe989f5dc4770341c272517c5660edd /multimedia | |
| parent | a6b1a459ae4f5b031f68054a0d7d5df49261b4d6 (diff) | |
| download | pkgsrc-e160ccebd0021c1fb19a3ee4316edc0a2498cee7.tar.gz | |
Fix build with latest gstreamer-1.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/phonon-backend-gstreamer/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake | 50 |
2 files changed, 52 insertions, 1 deletions
diff --git a/multimedia/phonon-backend-gstreamer/distinfo b/multimedia/phonon-backend-gstreamer/distinfo index ec9e458b7d5..ae9abd1c804 100644 --- a/multimedia/phonon-backend-gstreamer/distinfo +++ b/multimedia/phonon-backend-gstreamer/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:54:31 agc Exp $ +$NetBSD: distinfo,v 1.9 2015/11/30 08:36:36 markd Exp $ SHA1 (phonon-backend-gstreamer-4.8.2.tar.xz) = 9998ba3a002af09e1ba4072508d1813af1d1e5be RMD160 (phonon-backend-gstreamer-4.8.2.tar.xz) = 9c0ec7ef27e925c207e769edc225b1d7202c7e37 SHA512 (phonon-backend-gstreamer-4.8.2.tar.xz) = a18534b89d424bb2cc9f8a7f63a794d9711d895ad1db6cd5f4bd8748ea38310ffeacd916d16443986f89d3097e108aaf5631eaba6dd37e76a7360d5f1d02ecea Size (phonon-backend-gstreamer-4.8.2.tar.xz) = 76044 bytes +SHA1 (patch-cmake_FindGStreamer.cmake) = 61ea66ec1a89eec428b94c220e82ff4d0479fda8 diff --git a/multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake b/multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake new file mode 100644 index 00000000000..8ec6e8d4968 --- /dev/null +++ b/multimedia/phonon-backend-gstreamer/patches/patch-cmake_FindGStreamer.cmake @@ -0,0 +1,50 @@ +$NetBSD: patch-cmake_FindGStreamer.cmake,v 1.1 2015/11/30 08:36:36 markd Exp $ + +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.orig 2015-11-30 08:02:28.000000000 +0000 ++++ cmake/FindGStreamer.cmake +@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst. + 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 + ${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") |