kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try to improve options.mk and update buildlink3.mk and Makefile.common

Browse source 
accordingly:
 o add an "opengl" option (ATM disabled by default) to enable GLX, WebGL
   and accelerated composite support
 o add an "enchant" option to enable spellcheck support (enabled by default,
   like www/webkit-gtk)
This commit is contained in:
Leonardo Taccari 2014-06-02 10:27:50 +00:00 committed by Thomas Klausner
parent 7a73602be6
commit 459b3bfe6c
3 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webkit-gtk/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.5 2014/05/30 19:16:00 leot1990 Exp $
# $NetBSD: Makefile.common,v 1.6 2014/06/02 10:27:50 leot1990 Exp $
# used by wip/webkit-gtk/Makefile
DISTNAME= webkitgtk-2.4.3
@ -43,7 +43,7 @@ REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
REPLACE_PYTHON+= Tools/gtk/*.py \
Tools/gtk/generate-feature-defines-files \
Tools/gtk/generate-gtkdoc \
Tools/gtk/generate-webkitdom-doc-files
Tools/gtk/generate-webkitdom-doc-files
.include "../../lang/ruby/rubyversion.mk"
@ -91,7 +91,6 @@ BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.42.2nb3
.include "../../net/libsoup24/buildlink3.mk"
.include "../../security/libsecret/buildlink3.mk"
.include "../../textproc/enchant/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"

10
webkit-gtk/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.5 2014/04/27 10:05:23 leot1990 Exp $
# $NetBSD: buildlink3.mk,v 1.6 2014/06/02 10:27:50 leot1990 Exp $
BUILDLINK_TREE+= webkit-gtk
@ -9,6 +9,13 @@ BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=1.1.3
BUILDLINK_ABI_DEPENDS.webkit-gtk+= webkit-gtk>=1.10.2nb13
BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../wip/webkit-gtk
pkgbase := webkit-gtk
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant)
.include "../../textproc/enchant/buildlink3.mk"
.endif
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gperf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
@ -19,7 +26,6 @@ BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../wip/webkit-gtk
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../net/libsoup24/buildlink3.mk"
.include "../../security/libsecret/buildlink3.mk"
.include "../../textproc/enchant/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"

37
webkit-gtk/options.mk
View file

@ -1,9 +1,9 @@
# $NetBSD: options.mk,v 1.2 2014/06/02 08:09:02 leot1990 Exp $
# $NetBSD: options.mk,v 1.3 2014/06/02 10:27:50 leot1990 Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
PKG_SUPPORTED_OPTIONS= webkit-jit debug
PKG_SUGGESTED_OPTIONS=
PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit
PKG_SUGGESTED_OPTIONS= enchant
.include "../../mk/bsd.prefs.mk"
@ -14,14 +14,45 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit
.include "../../mk/bsd.options.mk"
#
# JIT support
#
.if !empty(PKG_OPTIONS:Mwebkit-jit)
CONFIGURE_ARGS+= --enable-jit
.else
CONFIGURE_ARGS+= --disable-jit
.endif
#
# debug support
#
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug
.else
CONFIGURE_ARGS+= --disable-debug
.endif
#
# OpenGL support: enable support for GLX, WebGL and accelerated compositing
#
# TODO: should we split them in multiple options?
#
.if !empty(PKG_OPTIONS:Mopengl)
CONFIGURE_ARGS+= --enable-glx
CONFIGURE_ARGS+= --enable-webgl
CONFIGURE_ARGS+= --enable-accelerated-compositing
.else
CONFIGURE_ARGS+= --disable-glx
CONFIGURE_ARGS+= --disable-webgl
CONFIGURE_ARGS+= --disable-accelerated-compositing
.endif
#
# Spellcheck support using enchant
#
.if !empty(PKG_OPTIONS:Menchant)
CONFIGURE_ARGS+= --enable-spellcheck
.include "../../textproc/enchant/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-spellcheck
.endif