Date: Saturday, May 16, 2020 @ 21:13:31 Author: foutrelis Revision: 384859
Fix build with gstreamer 1.16 Also store the patch for gstreamer 1.6 locally due to changing checksum. Added: qt-gstreamer/trunk/gstreamer-1.16.patch qt-gstreamer/trunk/gstreamer-1.6.patch Modified: qt-gstreamer/trunk/PKGBUILD ----------------------+ PKGBUILD | 13 +++++++++---- gstreamer-1.16.patch | 28 ++++++++++++++++++++++++++++ gstreamer-1.6.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-16 21:00:08 UTC (rev 384858) +++ PKGBUILD 2020-05-16 21:13:31 UTC (rev 384859) @@ -15,16 +15,21 @@ provides=(qt5-gstreamer) replaces=(qt5-gstreamer) source=("https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz" - qt-gstreamer-1.6.patch::"http://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094") + gstreamer-1.6.patch + gstreamer-1.16.patch) sha256sums=('9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4' - '82abf6564c36dcd944704c94a07894c976a1d4bd871cb378bdddf71422e2937f') + 'adffd16ceb13a324858ff38b7bc01ea5129a439bda170e322598df4c7fa24637' + 'dfc2681ab1d157e08b838fb48f51d64fddf3b8ac25a4ec00051632db4f938668') prepare() { mkdir -p build + cd $pkgbase-$pkgver # Fix build with gstreamer 1.6 - cd $pkgbase-$pkgver - patch -p1 -i ../qt-gstreamer-1.6.patch + patch -p1 -i ../gstreamer-1.6.patch + +# Fix build with gstreamer 1.16 + patch -p1 -i ../gstreamer-1.16.patch } build() { Added: gstreamer-1.16.patch =================================================================== --- gstreamer-1.16.patch (rev 0) +++ gstreamer-1.16.patch 2020-05-16 21:13:31 UTC (rev 384859) @@ -0,0 +1,28 @@ +From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiada...@collabora.com> +Date: Sat, 7 Sep 2019 10:49:38 +0300 +Subject: QGst/caps: compilation fix from + https://bugs.kde.org/show_bug.cgi?id=406676#c2 + +Because the macro version of gst_caps_copy() confuses the C++ compiler +--- + src/QGst/caps.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp +index 3824d82..a15b701 100644 +--- a/src/QGst/caps.cpp ++++ b/src/QGst/caps.cpp +@@ -54,7 +54,8 @@ QString Caps::toString() const + + void Caps::append(const CapsPtr & caps2) + { +- gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2)); ++ const GstCaps * caps2ptr = caps2; ++ gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2ptr)); + } + + CapsPtr Caps::merge(CapsPtr & caps2) +-- +cgit v1.2.1 + Added: gstreamer-1.6.patch =================================================================== --- gstreamer-1.6.patch (rev 0) +++ gstreamer-1.6.patch 2020-05-16 21:13:31 UTC (rev 384859) @@ -0,0 +1,43 @@ +From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfa...@gmail.com> +Date: Fri, 2 Oct 2015 15:00:29 +0300 +Subject: Fix compilation with GStreamer >= 1.5.1 + +apply gstreamer pkg-config definitions To ensure gstreamer builds correctly, +pick up its cflags in FindGstreamer and apply them to the build as definitions + +https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html + +https://bugzilla.gnome.org/show_bug.cgi?id=751382 +--- + CMakeLists.txt | 1 + + cmake/modules/FindGStreamer.cmake | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d3e7dd..5744015 100644 +--- 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/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake +index dab91ac..fe6cde1 100644 +--- 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 +-- +cgit v1.2.1 +