[arch-commits] Commit in qt-gstreamer/repos/extra-x86_64 (7 files)
Antonio Rojas
arojas at archlinux.org
Tue Oct 27 08:32:35 UTC 2020
Date: Tuesday, October 27, 2020 @ 08:32:34
Author: arojas
Revision: 398845
archrelease: copy trunk to extra-x86_64
Added:
qt-gstreamer/repos/extra-x86_64/PKGBUILD
(from rev 398844, qt-gstreamer/trunk/PKGBUILD)
qt-gstreamer/repos/extra-x86_64/gstreamer-1.16.patch
(from rev 398844, qt-gstreamer/trunk/gstreamer-1.16.patch)
qt-gstreamer/repos/extra-x86_64/gstreamer-1.6.patch
(from rev 398844, qt-gstreamer/trunk/gstreamer-1.6.patch)
qt-gstreamer/repos/extra-x86_64/qt-gstreamer-1.18.patch
(from rev 398844, qt-gstreamer/trunk/qt-gstreamer-1.18.patch)
Deleted:
qt-gstreamer/repos/extra-x86_64/PKGBUILD
qt-gstreamer/repos/extra-x86_64/gstreamer-1.16.patch
qt-gstreamer/repos/extra-x86_64/gstreamer-1.6.patch
-------------------------+
PKGBUILD | 89 ++++++++++++++++++++--------------------------
gstreamer-1.16.patch | 56 ++++++++++++++--------------
gstreamer-1.6.patch | 86 ++++++++++++++++++++++----------------------
qt-gstreamer-1.18.patch | 26 +++++++++++++
4 files changed, 137 insertions(+), 120 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-27 08:32:21 UTC (rev 398844)
+++ PKGBUILD 2020-10-27 08:32:34 UTC (rev 398845)
@@ -1,49 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: laloch <laloch at atlas.cz>
-
-pkgname=qt-gstreamer
-pkgver=1.2.0
-pkgrel=3
-arch=(x86_64)
-pkgdesc="Qt bindings for GStreamer"
-url='https://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
-license=(LGPL2.1)
-depends=(qt5-declarative gst-plugins-good)
-makedepends=(cmake boost doxygen python)
-conflicts=(qt5-gstreamer)
-provides=(qt5-gstreamer)
-replaces=(qt5-gstreamer)
-source=("https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
- gstreamer-1.6.patch
- gstreamer-1.16.patch)
-sha256sums=('9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4'
- 'adffd16ceb13a324858ff38b7bc01ea5129a439bda170e322598df4c7fa24637'
- 'dfc2681ab1d157e08b838fb48f51d64fddf3b8ac25a4ec00051632db4f938668')
-
-prepare() {
- mkdir -p build
- cd $pkgbase-$pkgver
-
-# Fix build with gstreamer 1.6
- patch -p1 -i ../gstreamer-1.6.patch
-
-# Fix build with gstreamer 1.16
- patch -p1 -i ../gstreamer-1.16.patch
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DQTGSTREAMER_EXAMPLES=OFF \
- -DQT_VERSION=5
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: qt-gstreamer/repos/extra-x86_64/PKGBUILD (from rev 398844, qt-gstreamer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-27 08:32:34 UTC (rev 398845)
@@ -0,0 +1,40 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: laloch <laloch at atlas.cz>
+
+pkgname=qt-gstreamer
+pkgver=1.2.0
+pkgrel=4
+arch=(x86_64)
+pkgdesc="Qt bindings for GStreamer"
+url='https://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
+license=(LGPL2.1)
+depends=(qt5-declarative gst-plugins-good)
+makedepends=(cmake boost doxygen python)
+source=("https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+ gstreamer-1.6.patch
+ gstreamer-1.16.patch
+ qt-gstreamer-1.18.patch)
+sha256sums=('9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4'
+ 'adffd16ceb13a324858ff38b7bc01ea5129a439bda170e322598df4c7fa24637'
+ 'dfc2681ab1d157e08b838fb48f51d64fddf3b8ac25a4ec00051632db4f938668'
+ 'c62ddf19ef0079eed669585459d7031f69ddd18f7db2122c6e84f221ccb8afb5')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../gstreamer-1.6.patch # Fix build with gstreamer 1.6
+ patch -p1 -i ../gstreamer-1.16.patch # Fix build with gstreamer 1.16
+ patch -p1 -i ../qt-gstreamer-1.18.patch # Fix build with gstreamer 1.18
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DQTGSTREAMER_EXAMPLES=OFF \
+ -DQT_VERSION=5
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Deleted: gstreamer-1.16.patch
===================================================================
--- gstreamer-1.16.patch 2020-10-27 08:32:21 UTC (rev 398844)
+++ gstreamer-1.16.patch 2020-10-27 08:32:34 UTC (rev 398845)
@@ -1,28 +0,0 @@
-From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis at 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
-
Copied: qt-gstreamer/repos/extra-x86_64/gstreamer-1.16.patch (from rev 398844, qt-gstreamer/trunk/gstreamer-1.16.patch)
===================================================================
--- gstreamer-1.16.patch (rev 0)
+++ gstreamer-1.16.patch 2020-10-27 08:32:34 UTC (rev 398845)
@@ -0,0 +1,28 @@
+From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis at 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
+
Deleted: gstreamer-1.6.patch
===================================================================
--- gstreamer-1.6.patch 2020-10-27 08:32:21 UTC (rev 398844)
+++ gstreamer-1.6.patch 2020-10-27 08:32:34 UTC (rev 398845)
@@ -1,43 +0,0 @@
-From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust at 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
-
Copied: qt-gstreamer/repos/extra-x86_64/gstreamer-1.6.patch (from rev 398844, qt-gstreamer/trunk/gstreamer-1.6.patch)
===================================================================
--- gstreamer-1.6.patch (rev 0)
+++ gstreamer-1.6.patch 2020-10-27 08:32:34 UTC (rev 398845)
@@ -0,0 +1,43 @@
+From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust at 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
+
Copied: qt-gstreamer/repos/extra-x86_64/qt-gstreamer-1.18.patch (from rev 398844, qt-gstreamer/trunk/qt-gstreamer-1.18.patch)
===================================================================
--- qt-gstreamer-1.18.patch (rev 0)
+++ qt-gstreamer-1.18.patch 2020-10-27 08:32:34 UTC (rev 398845)
@@ -0,0 +1,26 @@
+diff --git a/src/QGst/event.cpp b/src/QGst/event.cpp
+index 0530f0b..260a909 100644
+--- a/src/QGst/event.cpp
++++ b/src/QGst/event.cpp
+@@ -125,7 +125,7 @@ Segment SegmentEvent::segment() const
+ //********************************************************
+ TagEventPtr TagEvent::create(const TagList & taglist)
+ {
+- GstEvent * e = gst_event_new_tag(gst_tag_list_copy(taglist));
++ GstEvent * e = gst_event_new_tag(gst_tag_list_copy(&taglist));
+ return TagEventPtr::wrap(e, false);
+ }
+
+diff --git a/src/QGst/message.cpp b/src/QGst/message.cpp
+index ae845cc..1044b88 100644
+--- a/src/QGst/message.cpp
++++ b/src/QGst/message.cpp
+@@ -157,7 +157,7 @@ QString InfoMessage::debugMessage() const
+
+ TagMessagePtr TagMessage::create(const ObjectPtr & source, const TagList & taglist)
+ {
+- GstMessage *m = gst_message_new_tag(source, gst_tag_list_copy(taglist));
++ GstMessage *m = gst_message_new_tag(source, gst_tag_list_copy(&taglist));
+ return TagMessagePtr::wrap(m, false);
+ }
+
More information about the arch-commits
mailing list