Update to webkit 1.1.15.4, fix stupid mistake in build output that tried
to execute every target in Makefile, and enable Gstreamer support (which is on by default upstream since months)
This commit is contained in:
landry
parent
dc2aa4c933
commit
5ead73dbfa
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2009/11/18 00:49:09 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2009/11/29 10:08:26 landry Exp $
|
||||
|
||||
COMMENT = open source web browser engine
|
||||
|
||||
V = 1.1.15.2
|
||||
V = 1.1.15.4
|
||||
DISTNAME = webkit-${V}
|
||||
# XXX do not remove v0. pX comes before vX.
|
||||
PKGNAME = webkit-${V}p2v0
|
||||
PKGNAME = webkit-${V}v0
|
||||
CATEGORIES = www
|
||||
|
||||
HOMEPAGE = http://webkitgtk.org/
|
||||
@ -36,15 +36,6 @@ MODGCC4_LANGS = c c++
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
|
||||
CONFIGURE_ARGS = --disable-video
|
||||
|
||||
#LIB_DEPENDS+= gstreamer-0.10,gstbase-0.10::multimedia/gstreamer-0.10/core \
|
||||
# gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base \
|
||||
#RUN_DEPENDS = ::multimedia/gstreamer-0.10/plugins-base,-ogg \
|
||||
# ::multimedia/gstreamer-0.10/plugins-base,-vorbis \
|
||||
# ::multimedia/gstreamer-0.10/plugins-base,-theora
|
||||
|
||||
|
||||
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" \
|
||||
ac_cv_path_FLEX=${LOCALBASE}/bin/gflex
|
||||
@ -59,6 +50,8 @@ WANTLIB = ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
|
||||
tasn1 z cairo pixman-1 png pthread-stubs stdc++ xcb xml2
|
||||
|
||||
LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0,gailutil::x11/gtk+2,-main \
|
||||
gstreamer-0.10,gstbase-0.10::multimedia/gstreamer-0.10/core \
|
||||
gstvideo-0.10,gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base \
|
||||
icudata,icui18n,icuuc::textproc/icu4c \
|
||||
sqlite3::databases/sqlite3 \
|
||||
xslt::textproc/libxslt \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (webkit-1.1.15.2.tar.gz) = XghnlrEBbXyfXG0v5q2B8g==
|
||||
RMD160 (webkit-1.1.15.2.tar.gz) = ISmNMSIUrQZVcDVxKG6B1VMJj7s=
|
||||
SHA1 (webkit-1.1.15.2.tar.gz) = 6/D9gF3YOXrhFwE0GAbNeAArqhg=
|
||||
SHA256 (webkit-1.1.15.2.tar.gz) = rna/Ur17V/1LTuWJT3LQ/batVQBR77ZCT2pEZnlnmKw=
|
||||
SIZE (webkit-1.1.15.2.tar.gz) = 6081293
|
||||
MD5 (webkit-1.1.15.4.tar.gz) = RzAftxIEIaw4v3FNuPXUKA==
|
||||
RMD160 (webkit-1.1.15.4.tar.gz) = 3Prob3ovxjtHh0GzcKxiDRZZUT4=
|
||||
SHA1 (webkit-1.1.15.4.tar.gz) = B3ixMHIHVtiAwrvp7u9581vPhho=
|
||||
SHA256 (webkit-1.1.15.4.tar.gz) = 7CUR/B1KHmRTRXTNX5srxVLem7Itezg33RcUb7XxyQ8=
|
||||
SIZE (webkit-1.1.15.4.tar.gz) = 6093252
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-GNUmakefile_in,v 1.3 2009/10/11 18:31:12 landry Exp $
|
||||
$OpenBSD: patch-GNUmakefile_in,v 1.4 2009/11/29 10:08:26 landry Exp $
|
||||
--- GNUmakefile.in.orig Tue Oct 6 15:18:56 2009
|
||||
+++ GNUmakefile.in Sat Oct 10 10:31:55 2009
|
||||
@@ -5622,7 +5622,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.3 2009/10/11 18:31:12 landry Exp $
|
||||
AM_V_CC = $(am__v_CC_$(V))
|
||||
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
|
||||
-am__v_CC_0 = @echo " CC " $@;
|
||||
+am__v_CC_0 = $@;
|
||||
+am__v_CC_0 =
|
||||
AM_V_at = $(am__v_at_$(V))
|
||||
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_at_0 = @
|
||||
@ -15,13 +15,13 @@ $OpenBSD: patch-GNUmakefile_in,v 1.3 2009/10/11 18:31:12 landry Exp $
|
||||
AM_V_CCLD = $(am__v_CCLD_$(V))
|
||||
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
|
||||
-am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
+am__v_CCLD_0 = $@;
|
||||
+am__v_CCLD_0 =
|
||||
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
||||
AM_V_CXX = $(am__v_CXX_$(V))
|
||||
am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
|
||||
-am__v_CXX_0 = @echo " CXX " $@;
|
||||
+am__v_CXX_0 = $@;
|
||||
+am__v_CXX_0 =
|
||||
CXXLD = $(CXX)
|
||||
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
||||
@ -29,11 +29,11 @@ $OpenBSD: patch-GNUmakefile_in,v 1.3 2009/10/11 18:31:12 landry Exp $
|
||||
AM_V_CXXLD = $(am__v_CXXLD_$(V))
|
||||
am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
|
||||
-am__v_CXXLD_0 = @echo " CXXLD " $@;
|
||||
+am__v_CXXLD_0 = $@;
|
||||
+am__v_CXXLD_0 =
|
||||
AM_V_GEN = $(am__v_GEN_$(V))
|
||||
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
|
||||
-am__v_GEN_0 = @echo " GEN " $@;
|
||||
+am__v_GEN_0 = $@;
|
||||
+am__v_GEN_0 =
|
||||
SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \
|
||||
$(libJavaScriptCore_la_SOURCES) \
|
||||
$(nodist_libJavaScriptCore_la_SOURCES) \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.9 2009/10/11 18:31:12 landry Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.10 2009/11/29 10:08:26 landry Exp $
|
||||
%%SHARED%%
|
||||
@bin bin/jsc
|
||||
include/webkit-1.0/
|
||||
@ -54,6 +54,9 @@ share/locale/es/LC_MESSAGES/webkit.mo
|
||||
share/locale/it/
|
||||
share/locale/it/LC_MESSAGES/
|
||||
share/locale/it/LC_MESSAGES/webkit.mo
|
||||
share/locale/lt/
|
||||
share/locale/lt/LC_MESSAGES/
|
||||
share/locale/lt/LC_MESSAGES/webkit.mo
|
||||
share/locale/nl/
|
||||
share/locale/nl/LC_MESSAGES/
|
||||
share/locale/nl/LC_MESSAGES/webkit.mo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user