From 83c0688ee8dc710286091d30cc1fbaea32ce1554 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 10 Dec 2015 12:39:35 +0100 Subject: KDE 5_15.11: recompilations as a result of major library updates in -current. --- .../telepathy-qt5/patches/gstreamer-1.0.patch | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch (limited to 'deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch') diff --git a/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch b/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch new file mode 100644 index 0000000..403bb3e --- /dev/null +++ b/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch @@ -0,0 +1,106 @@ +From c9ce33029e75c104b8a6f04098ba2aaa16df0c30 Mon Sep 17 00:00:00 2001 +From: Iain Lane +Date: Fri, 31 Jul 2015 10:08:51 +0100 +Subject: [PATCH] Fix FindGstreamer.cmake to grab the include directories from + gstreamer's pcfile properly + +Resolves build failure with gstreamer shipped in some distros. +--- + TelepathyQt/Farstream/CMakeLists.txt | 2 +- + cmake/modules/FindGStreamer.cmake | 38 ++++++++++++++++++++---------------- + 2 files changed, 22 insertions(+), 18 deletions(-) + +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..25ce180 100644 +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -2,7 +2,7 @@ + # Once done this will define + # + # GSTREAMER_FOUND - system has GStreamer +-# GSTREAMER_INCLUDE_DIR - the GStreamer include directory ++# GSTREAMER_INCLUDE_DIRS - the GStreamer include directories + # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer + # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer + +@@ -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 +@@ -31,12 +31,16 @@ IF (NOT WIN32) + SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER}) + ENDIF (NOT WIN32) + +-FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h +- PATHS +- ${PC_GSTREAMER_INCLUDEDIR} +- ${PC_GSTREAMER_INCLUDE_DIRS} +- PATH_SUFFIXES gstreamer-1.0 +- ) ++if (DEFINED PC_GSTREAMER_INCLUDE_DIRS) ++ SET(GSTREAMER_INCLUDE_DIRS ${PC_GSTREAMER_INCLUDE_DIRS}) ++ELSE (DEFINED PC_GSTREAMER_INCLUDE_DIRS) ++ FIND_PATH(GSTREAMER_INCLUDE_DIRS gst/gst.h ++ PATHS ++ ${PC_GSTREAMER_INCLUDEDIR} ++ ${PC_GSTREAMER_INCLUDE_DIRS} ++ PATH_SUFFIXES gstreamer-1.0 ++ ) ++ENDIF (DEFINED PC_GSTREAMER_INCLUDE_DIRS) + + FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 + PATHS +@@ -51,11 +55,11 @@ FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0 + ) + + +-IF (GSTREAMER_INCLUDE_DIR) +- #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}") +-ELSE (GSTREAMER_INCLUDE_DIR) +- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") +-ENDIF (GSTREAMER_INCLUDE_DIR) ++IF (GSTREAMER_INCLUDE_DIRS) ++ #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIRS}") ++ELSE (GSTREAMER_INCLUDE_DIRS) ++ MESSAGE(STATUS "GStreamer: WARNING: include dirs not found") ++ENDIF (GSTREAMER_INCLUDE_DIRS) + + IF (GSTREAMER_LIBRARIES) + #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") +@@ -65,6 +69,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) +-- +2.4.6 + -- cgit v1.2.3