Fix gstreamer detection with some pkgconfig implementations (bug #416057, thanks to pingouin21). Require USE=geoloc if introspection is enabled (bug #416331, thanks to lxg). jit is now a global flag.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

5 files changed, 49 insertions, 9 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index cc7669a739c1..39ae88dac3db 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.162 2012/05/05 02:54:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.163 2012/05/19 07:48:23 tetromino Exp $
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.8.1-r201.ebuild, webkit-gtk-1.8.1-r301.ebuild,
+  +files/webkit-gtk-1.8.1-gst-required-version.patch, metadata.xml:
+  Fix gstreamer detection with some pkgconfig implementations (bug #416057,
+  thanks to pingouin21). Require USE=geoloc if introspection is enabled (bug
+  #416331, thanks to lxg). jit is now a global flag.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> webkit-gtk-1.6.1-r201.ebuild,
   webkit-gtk-1.6.1-r301.ebuild, webkit-gtk-1.6.3-r200.ebuild,
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
new file mode 100644
index 000000000000..cd0337bf7db0
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
@@ -0,0 +1,29 @@
+2012-05-01  Landry Breuil  <landry@openbsd.org>
+
+        [GTK] Fix gstreamer detection during configure
+        https://bugs.webkit.org/show_bug.cgi?id=84325
+
+        Reviewed by Philippe Normand.
+
+        * configure.ac: Fix GSTREAMER_REQUIRED_VERSION and
+        GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION assignments.
+
+Index: /trunk/configure.ac
+===================================================================
+--- /trunk/configure.ac	(revision 115666)
++++ /trunk/configure.ac	(revision 115737)
+@@ -343,10 +343,10 @@
+ 
+ case "$with_gstreamer" in
+-     0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
+-           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
++     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
++           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
+            GST_API_VERSION=0.10
+            ;;
+-     0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
+-           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
++     0.11) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_11_REQUIRED_VERSION
++           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
+            GST_API_VERSION=0.11
+            ;;
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index f6718a8bf879..4232b5dfac60 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -8,8 +8,6 @@
 		<pkg>app-misc/geoclue</pkg></flag>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 		for introspection</flag>
-	<flag name="jit">Enable JIT javascript compiler (disabling it will
-		cause performance penalty)</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using
 		<pkg>virtual/opengl</pkg></flag>
 	<flag name="webkit2">Enable WebKit2 API that splits web content rendering
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.1-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r201.ebuild
index e27fcedf9995..e1b1e1befddc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.1-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r201.ebuild,v 1.2 2012/05/05 02:54:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r201.ebuild,v 1.3 2012/05/19 07:48:23 tetromino Exp $
 
 EAPI="4"
 
@@ -18,8 +18,8 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
 IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
-# bug 372493
-REQUIRED_USE="introspection? ( gstreamer )"
+# bugs 372493, 416331
+REQUIRED_USE="introspection? ( geoloc gstreamer )"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
@@ -87,6 +87,9 @@ src_prepare() {
 	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
 	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
 
+	# bug #416057; in 1.9.x
+	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
+
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
 	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild
index 27dde5c63ce4..172bd39db1f9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild,v 1.2 2012/05/05 02:54:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild,v 1.3 2012/05/19 07:48:23 tetromino Exp $
 
 EAPI="4"
 
@@ -18,8 +18,8 @@ SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
 IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
-# bug 372493
-REQUIRED_USE="introspection? ( gstreamer )"
+# bugs 372493, 416331
+REQUIRED_USE="introspection? ( geoloc gstreamer )"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
@@ -97,6 +97,9 @@ src_prepare() {
 	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
 	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
 
+	# bug #416057; in 1.9.x
+	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
+
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
 	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch