diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwebkit/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 |
2 files changed, 23 insertions, 1 deletions
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog index 8f8eee203f8b..7fb6e2861a5f 100644 --- a/dev-qt/qtwebkit/ChangeLog +++ b/dev-qt/qtwebkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.18 2014/09/28 18:24:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.19 2014/09/28 18:27:38 pesa Exp $ + + 28 Sep 2014; Davide Pesavento <pesa@gentoo.org> + +files/qtwebkit-5.3.2-use-gstreamer010.patch: + Add missing patch. *qtwebkit-5.3.2-r1 (28 Sep 2014) diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch new file mode 100644 index 000000000000..1c02e45690b4 --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch @@ -0,0 +1,18 @@ +--- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 ++++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100 +@@ -96,14 +96,8 @@ + use?(3d_graphics): WEBKIT_CONFIG += webgl + + # HTML5 Media Support for builds with GStreamer +- unix:!mac:!contains(QT_CONFIG, no-pkg-config) { +- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { +- WEBKIT_CONFIG += video use_gstreamer +- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { +- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 +- } ++ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 + use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video +- } + + !enable?(video):qtHaveModule(multimediawidgets) { + WEBKIT_CONFIG += video use_qt_multimedia |