| 1 |
commit: 130397a485c632e705b789bbc72f1c31e9ffcf17 |
| 2 |
Author: Zamarin Arthur <arthurzam <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 28 12:25:32 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 28 14:15:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=130397a4 |
| 7 |
|
| 8 |
dev-qt/qtwebkit: fix 5.8 gstreamer patches |
| 9 |
|
| 10 |
.../files/qtwebkit-5.8.0-disable-gstreamer.patch | 15 +++++++++++++++ |
| 11 |
.../files/qtwebkit-5.8.0-use-gstreamer010.patch | 18 ++++++++++++++++++ |
| 12 |
dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild | 4 ++-- |
| 13 |
dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild | 4 ++-- |
| 14 |
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 4 ++-- |
| 15 |
5 files changed, 39 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..867e8dc |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch |
| 22 |
@@ -0,0 +1,15 @@ |
| 23 |
+--- a/Tools/qmake/mkspecs/features/features.prf |
| 24 |
++++ b/Tools/qmake/mkspecs/features/features.prf |
| 25 |
+@@ -101,12 +101,6 @@ defineTest(detectFeatures) { |
| 26 |
+ |
| 27 |
+ # HTML5 Media Support for builds with GStreamer |
| 28 |
+ unix:!mac:qtConfig(pkg-config) { |
| 29 |
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { |
| 30 |
+- WEBKIT_CONFIG += video use_gstreamer |
| 31 |
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { |
| 32 |
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
| 33 |
+- } |
| 34 |
+- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video |
| 35 |
+ } |
| 36 |
+ |
| 37 |
+ !enable?(video):qtHaveModule(multimediawidgets) { |
| 38 |
|
| 39 |
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch |
| 40 |
new file mode 100644 |
| 41 |
index 0000000..b286059 |
| 42 |
--- /dev/null |
| 43 |
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-use-gstreamer010.patch |
| 44 |
@@ -0,0 +1,18 @@ |
| 45 |
+--- a/Tools/qmake/mkspecs/features/features.prf |
| 46 |
++++ b/Tools/qmake/mkspecs/features/features.prf |
| 47 |
+@@ -99,14 +99,8 @@ defineTest(detectFeatures) { |
| 48 |
+ qtConfig(dynamicgl): WEBKIT_CONFIG += have_dynamicgl |
| 49 |
+ |
| 50 |
+ # HTML5 Media Support for builds with GStreamer |
| 51 |
+- unix:!mac:qtConfig(pkg-config) { |
| 52 |
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { |
| 53 |
+- WEBKIT_CONFIG += video use_gstreamer |
| 54 |
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { |
| 55 |
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
| 56 |
+- } |
| 57 |
++ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 |
| 58 |
+ use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video |
| 59 |
+- } |
| 60 |
+ |
| 61 |
+ !enable?(video):false { |
| 62 |
+ WEBKIT_CONFIG += video use_qt_multimedia |
| 63 |
|
| 64 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild |
| 65 |
index f3b7436..21f6368 100644 |
| 66 |
--- a/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild |
| 67 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.8.0.ebuild |
| 68 |
@@ -89,9 +89,9 @@ src_prepare() { |
| 69 |
Source/WebKit2/WebKit2.pri |
| 70 |
|
| 71 |
if use gstreamer010; then |
| 72 |
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") |
| 73 |
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch") |
| 74 |
elif ! use gstreamer; then |
| 75 |
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") |
| 76 |
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 77 |
fi |
| 78 |
|
| 79 |
# bug 562396 |
| 80 |
|
| 81 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild |
| 82 |
index 6f84eba..b110c3f 100644 |
| 83 |
--- a/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild |
| 84 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.8.9999.ebuild |
| 85 |
@@ -88,9 +88,9 @@ src_prepare() { |
| 86 |
Source/WebKit2/WebKit2.pri |
| 87 |
|
| 88 |
if use gstreamer010; then |
| 89 |
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") |
| 90 |
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch") |
| 91 |
elif ! use gstreamer; then |
| 92 |
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") |
| 93 |
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 94 |
fi |
| 95 |
|
| 96 |
# bug 562396 |
| 97 |
|
| 98 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 99 |
index 6f84eba..b110c3f 100644 |
| 100 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 101 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 102 |
@@ -88,9 +88,9 @@ src_prepare() { |
| 103 |
Source/WebKit2/WebKit2.pri |
| 104 |
|
| 105 |
if use gstreamer010; then |
| 106 |
- PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") |
| 107 |
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-use-gstreamer010.patch") |
| 108 |
elif ! use gstreamer; then |
| 109 |
- PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") |
| 110 |
+ PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch") |
| 111 |
fi |
| 112 |
|
| 113 |
# bug 562396 |
Archives