commit: 6bf584ff1904e088ae9be93b3fe63d47a4d37584 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Nov 22 17:47:57 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Nov 22 17:48:20 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf584ff
net-libs/telepathy-qt: backport patch from upstream solving build failure with >=media-libs/gstreamer-1.5 Package-Manager: portage-2.2.25 .../files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch | 83 ++++++++++++++++++++++ net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild | 1 + 2 files changed, 84 insertions(+) diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch new file mode 100644 index 0000000..bf519fa --- /dev/null +++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-gstreamer-1.5.patch @@ -0,0 +1,83 @@ +From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001 +From: Niels Ole Salscheider <[email protected]> +Date: Tue, 29 Sep 2015 20:52:15 +0200 +Subject: Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly + +Since GStreamer-1.5.1 config header file moved to LIBDIR. + +Reviewed-by: Alexandr Akulich <[email protected]> + +diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt +index 250bfdb..dd71430 100644 +--- a/TelepathyQt/Farstream/CMakeLists.txt ++++ b/TelepathyQt/Farstream/CMakeLists.txt +@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND) + include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR} + ${TELEPATHY_GLIB_INCLUDE_DIR} + ${FARSTREAM_INCLUDE_DIR} +- ${GSTREAMER_INCLUDE_DIR} ++ ${GSTREAMER_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${DBUS_INCLUDE_DIR}) +diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index 63fb41c..ffdd7a9 100644 +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -13,12 +13,12 @@ + + # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) + +-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) ++IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + # in cache already + SET(GSTREAMER_FIND_QUIETLY TRUE) +-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) ++ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + SET(GSTREAMER_FIND_QUIETLY FALSE) +-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) ++ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + + IF (NOT WIN32) + # use pkg-config to get the directories and then use these values +@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h + PATH_SUFFIXES gstreamer-1.0 + ) + ++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h ++ PATHS ++ ${PC_GSTREAMER_INCLUDEDIR} ++ ${PC_GSTREAMER_INCLUDE_DIRS} ++ PATH_SUFFIXES gstreamer-1.0 ++ ) ++ ++SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR}) ++ + FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 + PATHS + ${PC_GSTREAMER_LIBDIR} +@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR) + MESSAGE(STATUS "GStreamer: WARNING: include dir not found") + ENDIF (GSTREAMER_INCLUDE_DIR) + ++IF (GSTREAMER_CONF_INCLUDE_DIR) ++ #MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}") ++ELSE (GSTREAMER_CONF_INCLUDE_DIR) ++ MESSAGE(STATUS "GStreamer: WARNING: config include dir not found") ++ENDIF (GSTREAMER_CONF_INCLUDE_DIR) ++ + IF (GSTREAMER_LIBRARIES) + #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") + ELSE (GSTREAMER_LIBRARIES) +@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES) + + + INCLUDE(FindPackageHandleStandardArgs) +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY) + +-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) ++MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) +-- +cgit v0.10.2 + diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild index 4beccda..e783322 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild @@ -53,6 +53,7 @@ DOCS=( AUTHORS ChangeLog HACKING NEWS README ) PATCHES=( "${FILESDIR}/${PV}-default-source.patch" "${FILESDIR}/${PV}-yes-release.patch" + "${FILESDIR}/${P}-gstreamer-1.5.patch" "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch" )
