From 2a6ade2008b084b79b034e657a035221631ff1a4 Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 30 Nov 2011 14:08:50 +0000 Subject: Add javascriptcoregtk to pkgconfig file [1]. Switch video support and replace it with a optional webgl support. (default off). remove trash file in webkit-gtk2 port. Obtained from: webkit upstream [1] (found by looking at the debian patches) git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16602 df743ca5-7f9a-e211-a948-0013205c9059 --- www/webkit-gtk3/Makefile | 16 ++++++++-------- .../files/patch-Source_WebKit_gtk_webkit.pc.in | 10 ++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in (limited to 'www/webkit-gtk3') diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index fb3e2f561..f4051b9ad 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk3/Makefile,v 1.22 2011/10/04 15:20:36 kwm Exp $ +# $MCom: ports/www/webkit-gtk3/Makefile,v 1.23 2011/10/14 18:21:53 kwm Exp $ # PORTNAME= webkit PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk3 @@ -26,7 +26,7 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ soup-2.4.1:${PORTSDIR}/devel/libsoup USE_GETTEXT= yes -WANT_GSTREAMER= yes +USE_GSTREAMER= yes MAKE_JOBS_SAFE= yes USE_XORG= xt USE_BISON= build @@ -50,16 +50,16 @@ GLIB_SCHEMAS= org.webkitgtk-3.0.gschema.xml BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", -OPTIONS= VIDEO "Enable video support" on \ +OPTIONS= WEBGL "Enable webGL support (experimental)" off \ DEBUG "Build with debug support" off .include -.if defined(WITH_VIDEO) -USE_GSTREAMER+= yes -CONFIGURE_ARGS+=--enable-video +.if defined(WITH_WEBGL) +USE_GL= gl +CONFIGURE_ARGS+=--enable-webgl .else -CONFIGURE_ARGS+=--disable-video +CONFIGURE_ARGS+=--disable-webgl .endif .if defined(WITH_DEBUG) diff --git a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in new file mode 100644 index 000000000..eaa546d10 --- /dev/null +++ b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in @@ -0,0 +1,10 @@ +--- Source/WebKit/gtk/webkit.pc.in.orig 2011-11-30 14:16:35.000000000 +0100 ++++ Source/WebKit/gtk/webkit.pc.in 2011-11-30 14:20:00.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: WebKit + Description: Web content engine for GTK+ + Version: @VERSION@ +-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 ++Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ + Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@ + Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@ -- cgit v1.2.3