* [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/webkit-gtk/
@ 2011-09-28 3:00 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 3:00 UTC (permalink / raw
To: gentoo-commits
commit: 9b18fb0472a7be4ce8ad30db315b39d53cb02aea
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 02:45:11 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 02:45:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9b18fb04
net-libs/webkit-gtk: 1.6.0 → 1.6.1
Needed for epiphany-3.2.0
---
....0-r200.ebuild => webkit-gtk-1.6.1-r200.ebuild} | 0
....0-r300.ebuild => webkit-gtk-1.6.1-r300.ebuild} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.0-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.6.0-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.0-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
similarity index 100%
rename from net-libs/webkit-gtk/webkit-gtk-1.6.0-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/webkit-gtk/
@ 2011-09-28 19:56 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 3faf95c09078a59f784cbd8a001ab5791c367e7d
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 18:44:47 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 19:06:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3faf95c0
net-libs/webkit-gtk: enable websockets
As suggested by Priit Laes, hard-enable websockets. Note that webgl
still fails to build:
GEN DerivedSources/ANGLE/glslang.cpp
flex: could not create DerivedSources/ANGLE/glslang.cpp
---
....1-r200.ebuild => webkit-gtk-1.6.1-r201.ebuild} | 3 +--
....1-r300.ebuild => webkit-gtk-1.6.1-r301.ebuild} | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
index 6dd0911..e52b88e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
@@ -108,9 +108,8 @@ src_configure() {
--disable-webgl
--with-gtk=2.0
--disable-webkit2
- --disable-web-sockets
+ --enable-web-sockets
$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
- # Disable web-sockets per bug #326547
econf ${myconf}
}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
index 99f3845..fc44f1a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
@@ -111,10 +111,9 @@ src_configure() {
--disable-webgl
--with-gtk=3.0
--disable-webkit2
- --disable-web-sockets
+ --enable-web-sockets
$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
# Aqua support in gtk3 is untested
- # Disable web-sockets per bug #326547
econf ${myconf}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/webkit-gtk/
@ 2011-09-29 18:03 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-29 18:03 UTC (permalink / raw
To: gentoo-commits
commit: b139ef5ac42c73f70cd0afaa9d7cbff5ca0904cb
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Sep 29 17:20:10 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep 29 17:20:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b139ef5a
net-libs/webkit-gtk: optionally enable webgl
Thanks to Priit Laes for figuring out how to get it to build (upstream
bug https://bugs.webkit.org/show_bug.cgi?id=69085).
---
net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild | 10 +++++++---
net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
index e52b88e..bbcdfa8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2 LGPL-2.1 BSD"
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 doc +gstreamer +introspection +jit spell"
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
# bug 372493
REQUIRED_USE="introspection? ( gstreamer )"
@@ -42,6 +42,8 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
spell? ( >=app-text/enchant-0.22 )
+
+ webgl? ( virtual/opengl )
"
DEPEND="${RDEPEND}
>=sys-devel/flex-2.5.33
@@ -78,6 +80,9 @@ src_prepare() {
# XXX: Fails to apply
#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+ # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
+ mkdir -p DerivedSources/ANGLE
+
# Prevent maintainer mode from being triggered during make
AT_M4DIR=Source/autotools eautoreconf
}
@@ -95,7 +100,6 @@ src_configure() {
local myconf
# XXX: Check Web Audio support
- # XXX: webgl fails compilation
# WebKit2 can only be built with gtk3
myconf="
$(use_enable coverage)
@@ -105,7 +109,7 @@ src_configure() {
$(use_enable introspection)
$(use_enable gstreamer video)
$(use_enable jit)
- --disable-webgl
+ $(use_enable webgl)
--with-gtk=2.0
--disable-webkit2
--enable-web-sockets
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
index fc44f1a..b006019 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2 LGPL-2.1 BSD"
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 +gstreamer +introspection +jit spell"
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
# bug 372493
REQUIRED_USE="introspection? ( gstreamer )"
@@ -44,6 +44,8 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
spell? ( >=app-text/enchant-0.22 )
+
+ webgl? ( virtual/opengl )
"
DEPEND="${RDEPEND}
>=sys-devel/flex-2.5.33
@@ -80,6 +82,9 @@ src_prepare() {
# XXX: Fails to apply
#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+ # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
+ mkdir -p DerivedSources/ANGLE
+
# Prevent maintainer mode from being triggered during make
AT_M4DIR=Source/autotools eautoreconf
}
@@ -97,7 +102,6 @@ src_configure() {
local myconf
# XXX: Check Web Audio support
- # XXX: webgl fails compilation
# XXX: files for generating DerivedSources/WebKit2/* are missing, see
# https://bugs.webkit.org/show_bug.cgi?id=66527
myconf="
@@ -108,7 +112,7 @@ src_configure() {
$(use_enable introspection)
$(use_enable gstreamer video)
$(use_enable jit)
- --disable-webgl
+ $(use_enable webgl)
--with-gtk=3.0
--disable-webkit2
--enable-web-sockets
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-29 18:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-29 18:03 [gentoo-commits] proj/gnome:gnome-next commit in: net-libs/webkit-gtk/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 19:56 Alexandre Restovtsev
2011-09-28 3:00 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox