diff options
Diffstat (limited to '')
-rw-r--r-- | deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch | 29 | ||||
-rwxr-xr-x | deps/qt-gstreamer/qt-gstreamer.SlackBuild | 7 |
2 files changed, 35 insertions, 1 deletions
diff --git a/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch b/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch new file mode 100644 index 0000000..7371a93 --- /dev/null +++ b/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch @@ -0,0 +1,29 @@ +Description: apply gstreamer pkg-config definitions + To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer + and apply them to the build as definitions +Author: José Manuel SantamarÃa <panfaust@gmail.com> +Origin: vendor, https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html +Forwarded: https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html +Reviewed-by: Harald Sitter <sitter@kde.org> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/cmake/modules/FindGStreamer.cmake ++++ b/cmake/modules/FindGStreamer.cmake +@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) + exec_program(${PKG_CONFIG_EXECUTABLE} + ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} + OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) ++ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) + endif() + + find_library(GSTREAMER_LIBRARY +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,7 @@ find_package(GObject) + macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) + + set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) ++add_definitions(${GSTREAMER_DEFINITIONS}) + include(CheckCXXSourceCompiles) + check_cxx_source_compiles(" + #include <QtCore/QtGlobal> diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/qt-gstreamer/qt-gstreamer.SlackBuild index 91950df..cc904ed 100755 --- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild +++ b/deps/qt-gstreamer/qt-gstreamer.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=qt-gstreamer VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} @@ -67,6 +67,11 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 + +# Find the gstreamer header files: +cat $CWD/patches/qt-gstreamer_find_gstconfig.patch \ + | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |