| 1 |
commit: 8bde2c6895dd6bef4c5d7bee86f584b19fcbc080 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 4 12:25:41 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 4 12:26:03 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bde2c68 |
| 7 |
|
| 8 |
media-libs/qt-gstreamer: backport patch from upstream solving build failure with >=media-libs/gstreamer-1.5 |
| 9 |
|
| 10 |
Gentoo-bug: 564652 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
.../files/qt-gstreamer-1.2.0-gstreamer15.patch | 39 ++++++++++++++++++++++ |
| 15 |
.../qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild | 5 ++- |
| 16 |
2 files changed, 43 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..6e875f6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer15.patch |
| 23 |
@@ -0,0 +1,39 @@ |
| 24 |
+From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= <panfaust@×××××.com> |
| 26 |
+Date: Fri, 2 Oct 2015 15:00:29 +0300 |
| 27 |
+Subject: Fix compilation with GStreamer >= 1.5.1 |
| 28 |
+ |
| 29 |
+apply gstreamer pkg-config definitions To ensure gstreamer builds correctly, |
| 30 |
+pick up its cflags in FindGstreamer and apply them to the build as definitions |
| 31 |
+ |
| 32 |
+https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html |
| 33 |
+ |
| 34 |
+https://bugzilla.gnome.org/show_bug.cgi?id=751382 |
| 35 |
+ |
| 36 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 37 |
+index 4d3e7dd..5744015 100644 |
| 38 |
+--- a/CMakeLists.txt |
| 39 |
++++ b/CMakeLists.txt |
| 40 |
+@@ -106,6 +106,7 @@ find_package(GObject) |
| 41 |
+ macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) |
| 42 |
+ |
| 43 |
+ set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) |
| 44 |
++add_definitions(${GSTREAMER_DEFINITIONS}) |
| 45 |
+ include(CheckCXXSourceCompiles) |
| 46 |
+ check_cxx_source_compiles(" |
| 47 |
+ #include <QtCore/QtGlobal> |
| 48 |
+diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake |
| 49 |
+index dab91ac..fe6cde1 100644 |
| 50 |
+--- a/cmake/modules/FindGStreamer.cmake |
| 51 |
++++ b/cmake/modules/FindGStreamer.cmake |
| 52 |
+@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) |
| 53 |
+ exec_program(${PKG_CONFIG_EXECUTABLE} |
| 54 |
+ ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} |
| 55 |
+ OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) |
| 56 |
++ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) |
| 57 |
+ endif() |
| 58 |
+ |
| 59 |
+ find_library(GSTREAMER_LIBRARY |
| 60 |
+-- |
| 61 |
+cgit v0.10.2 |
| 62 |
+ |
| 63 |
|
| 64 |
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild |
| 65 |
index a33c8fe..3995ad0 100644 |
| 66 |
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild |
| 67 |
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild |
| 68 |
@@ -53,7 +53,10 @@ DEPEND=" |
| 69 |
) |
| 70 |
" |
| 71 |
|
| 72 |
-PATCHES=( "${FILESDIR}/${P}-boost157.patch" ) |
| 73 |
+PATCHES=( |
| 74 |
+ "${FILESDIR}/${P}-boost157.patch" |
| 75 |
+ "${FILESDIR}/${P}-gstreamer15.patch" |
| 76 |
+) |
| 77 |
|
| 78 |
# bug 497880 |
| 79 |
RESTRICT="test" |
Archives