Fix building with USE -gstreamer, bug #524518 by Xavier Miller, Lars Wendler (Polynomial-C), Michael Weber

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 39 insertions, 3 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index e3957476215f..7b2629f4ec0c 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.285 2014/10/11 11:50:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.286 2014/10/11 14:48:43 pacho Exp $
+
+  11 Oct 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/webkit-gtk-2.4.6-gstreamer-check.patch, webkit-gtk-2.4.6-r200.ebuild,
+  webkit-gtk-2.4.6.ebuild:
+  Fix building with USE -gstreamer, bug #524518 by Xavier Miller, Lars Wendler
+  (Polynomial-C), Michael Weber
 
   11 Oct 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.4.4-r1.ebuild,
   webkit-gtk-2.4.4-r201.ebuild:
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch
new file mode 100644
index 000000000000..b78d04a15c30
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.6-gstreamer-check.patch
@@ -0,0 +1,22 @@
+--- webkitgtk-2.4.6/Source/autotools/SetupWebKitFeatures.m4
++++ webkitgtk-2.4.6/Source/autotools/SetupWebKitFeatures.m4
+@@ -24,9 +24,9 @@
+ fi
+ 
+ if test "$enable_video" = "yes"; then
+-    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1"
++    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1 ENABLE_VIDEO_TRACK=1"
+ else
+-    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0"
++    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0"
+ fi
+ 
+ if test "$enable_css_filters" = "yes"; then
+@@ -171,7 +171,6 @@
+     ENABLE_TOUCH_ICON_LOADING=0 \
+     ENABLE_USER_TIMING=0 \
+     ENABLE_VIBRATION=0 \
+-    ENABLE_VIDEO_TRACK=1 \
+     ENABLE_VIEW_MODE_CSS_MEDIA=1 \
+     ENABLE_WEB_SOCKETS=1 \
+     ENABLE_WEB_TIMING=1 \
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.6-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.6-r200.ebuild
index eff49e1a760d..bb61df70d078 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.6-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.6-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.6-r200.ebuild,v 1.2 2014/10/05 11:08:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.6-r200.ebuild,v 1.3 2014/10/11 14:48:43 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -178,6 +178,10 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
 
+	# Fix building with USE -gstreamer, bug #524518
+	# https://bugs.webkit.org/show_bug.cgi?id=137445
+	epatch "${FILESDIR}"/${PN}-2.4.6-gstreamer-check.patch
+
 	AT_M4DIR=Source/autotools eautoreconf
 
 	gnome2_src_prepare
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.6.ebuild
index 2d1eb7f0087b..df6562b07173 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.6.ebuild,v 1.2 2014/10/05 11:08:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.6.ebuild,v 1.3 2014/10/11 14:48:43 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -188,6 +188,10 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
 
+	# Fix building with USE -gstreamer, bug #524518
+	# https://bugs.webkit.org/show_bug.cgi?id=137445
+	epatch "${FILESDIR}"/${PN}-2.4.6-gstreamer-check.patch
+
 	AT_M4DIR=Source/autotools eautoreconf
 
 	gnome2_src_prepare