cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to webkit-2.4.9.

Browse Source
This commit is contained in:
ajacoutot 2015-05-20 15:32:54 +00:00
parent 4c002a68c5
commit 8e11a8faa7
10 changed files with 44 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/webkit/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.137 2015/04/15 09:40:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.138 2015/05/20 15:32:54 ajacoutot Exp $
PORTROACH = limit:^2\.4
@ -6,14 +6,13 @@ COMMENT = open source web browser engine for Gtk+
BROKEN-alpha = error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
BROKEN-hppa = error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
V = 2.4.8
V = 2.4.9
DISTNAME = webkitgtk-${V}
PKGNAME = webkit-${V}
EPOCH = 1
CATEGORIES = www
DPB_PROPERTIES =parallel
EXTRACT_SUFX = .tar.xz
REVISION = 5
HOMEPAGE = http://webkitgtk.org/
MASTER_SITES = ${HOMEPAGE}/releases/

4
www/webkit/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.4.8.tar.xz) = aPEVWcsXhnnKkqzJ46PX/r7eest7mK/X+3YYdbvGvSM=
SIZE (webkitgtk-2.4.8.tar.xz) = 9827632
SHA256 (webkitgtk-2.4.9.tar.xz) = r98p54KIFsrQviYEzxlCHpbZa/STmHMo/8iBO7IKxWQ=
SIZE (webkitgtk-2.4.9.tar.xz) = 9840740

24
www/webkit/patches/patch-GNUmakefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
$OpenBSD: patch-GNUmakefile_in,v 1.39 2015/05/20 15:32:54 ajacoutot Exp $
- chunk 1->4 : remove silent build lines
- chunk 5 : append extra -O0 cflags for sparc64 which otherwise result in overoptimization
@ -6,9 +6,9 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
(on Source/JavaScriptCore/runtime/NumberPrototype.cpp)
- chunk 6->9 : fix variable quoting to properly install doc in a versionned dir
--- GNUmakefile.in.orig Wed Jan 7 10:48:04 2015
+++ GNUmakefile.in Fri Jan 9 18:30:52 2015
@@ -12429,11 +12429,11 @@ am__v_P_0 = false
--- GNUmakefile.in.orig Wed May 20 11:29:33 2015
+++ GNUmakefile.in Wed May 20 15:16:37 2015
@@ -12574,11 +12574,11 @@ am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
@ -22,7 +22,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/Source/autotools/depcomp
@@ -12443,7 +12443,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
@@ -12588,7 +12588,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
@ -31,7 +31,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -12451,13 +12451,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
@@ -12596,13 +12596,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
@ -47,7 +47,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
am__v_CXX_1 =
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -12465,7 +12465,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
@@ -12610,7 +12610,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
@ -56,7 +56,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
am__v_CXXLD_1 =
SOURCES = $(Libraries_WebExtensions_libWebExtensionTest_la_SOURCES) \
$(Libraries_WebExtensions_libWebProcessTest_la_SOURCES) \
@@ -72779,7 +72779,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
@@ -72933,7 +72933,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo `test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp
Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo: Source/JavaScriptCore/runtime/NumberPrototype.cpp
@ -65,7 +65,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/JavaScriptCore/runtime/NumberPrototype.cpp' object='Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -82350,8 +82350,8 @@ install-data-local:
@@ -82504,8 +82504,8 @@ install-data-local:
@ENABLE_WEBKIT1_TRUE@ then echo 1>&2 'No documentation to install' ; \
@ENABLE_WEBKIT1_TRUE@ else \
@ENABLE_WEBKIT1_TRUE@ DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
@ -76,7 +76,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
@ENABLE_WEBKIT1_TRUE@ else \
@ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
@ENABLE_WEBKIT1_TRUE@ fi; \
@@ -82360,9 +82360,9 @@ install-data-local:
@@ -82514,9 +82514,9 @@ install-data-local:
@ENABLE_WEBKIT1_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \
@ENABLE_WEBKIT1_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \
@ENABLE_WEBKIT1_TRUE@ done; \
@ -88,7 +88,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
@ENABLE_WEBKIT1_TRUE@ fi; \
@ENABLE_WEBKIT1_TRUE@ fi
@ENABLE_WEBKIT2_TRUE@ @installfiles=`echo ./Documentation/webkit2gtk/html/*`; \
@@ -82390,8 +82390,8 @@ install-data-local:
@@ -82544,8 +82544,8 @@ install-data-local:
then echo 1>&2 'No documentation to install' ; \
else \
DOC_MODULE_VERSION=`cat ./Documentation/webkitdomgtk/version.xml`; \
@ -99,7 +99,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.38 2015/01/10 00:38:39 ajacoutot Exp $
else \
installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk"; \
fi; \
@@ -82400,9 +82400,9 @@ install-data-local:
@@ -82554,9 +82554,9 @@ install-data-local:
echo ' $(INSTALL_DATA) '$$i ; \
$(INSTALL_DATA) $$i $${installdir}; \
done; \

8
www/webkit/patches/patch-Source_WTF_wtf_MathExtras_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Source_WTF_wtf_MathExtras_h,v 1.3 2014/09/28 06:52:14 ajacoutot Exp $
$OpenBSD: patch-Source_WTF_wtf_MathExtras_h,v 1.4 2015/05/20 15:32:54 ajacoutot Exp $
signbit & isfinite are defined in gcc's cmath for 4.6 & 4.8..
so partly revert https://bugs.webkit.org/show_bug.cgi?id=19975, make it conditional to older gcc
https://bugs.webkit.org/show_bug.cgi?id=129927
--- Source/WTF/wtf/MathExtras.h.orig Tue Jan 21 15:06:51 2014
+++ Source/WTF/wtf/MathExtras.h Fri Feb 14 20:41:39 2014
@@ -94,7 +94,8 @@ inline bool isinf(double x) { return !finite(x) && !is
--- Source/WTF/wtf/MathExtras.h.orig Wed May 20 11:03:24 2015
+++ Source/WTF/wtf/MathExtras.h Wed May 20 15:16:37 2015
@@ -100,7 +100,8 @@ inline bool isinf(double x) { return !finite(x) && !is
#endif

58
www/webkit/patches/patch-Source_WTF_wtf_Platform_h
View File

@ -1,29 +1,23 @@
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.6 2015/01/10 00:38:39 ajacoutot Exp $
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.7 2015/05/20 15:32:54 ajacoutot Exp $
Add defines for sparc64/mips64.
Disable yarr jit on anything not having a jit
https://bugs.webkit.org/show_bug.cgi?id=113638
https://bugs.webkit.org/show_bug.cgi?id=129839
sparc defines/code was removed upstream in
http://trac.webkit.org/changeset/159817
chunk 4
https://bugs.webkit.org/show_bug.cgi?id=126502
chunk 5
http://trac.webkit.org/changeset/164220
https://bugs.webkit.org/show_bug.cgi?id=128898
(also check https://bugs.webkit.org/show_bug.cgi?id=128549)
https://bugs.webkit.org/show_bug.cgi?id=128549
https://bugs.webkit.org/show_bug.cgi?id=129963
https://bugs.webkit.org/show_bug.cgi?id=129963 for dfg_jit/llint
http://trac.webkit.org/changeset/164220
sparc defines/code was removed upstream in:
http://trac.webkit.org/changeset/159817
last chunk needed to build on ppc/sparc64, otherwise yarr jit and
assembler is enabled (because of llint cloop) but there's no asm
for those
--- Source/WTF/wtf/Platform.h.orig Wed Jan 7 10:45:42 2015
+++ Source/WTF/wtf/Platform.h Fri Jan 9 18:32:23 2015
--- Source/WTF/wtf/Platform.h.orig Wed May 20 11:03:24 2015
+++ Source/WTF/wtf/Platform.h Wed May 20 15:23:50 2015
@@ -71,6 +71,12 @@
#define WTF_CPU_BIG_ENDIAN 1
#endif
@ -37,44 +31,26 @@ for those
/* CPU(IA64) - Itanium / IA-64 */
#if defined(__ia64__)
#define WTF_CPU_IA64 1
@@ -82,9 +88,14 @@
/* CPU(MIPS) - MIPS 32-bit */
/* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
- && defined(_ABIO32)
+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) || defined(__mips64__))
+#if defined(_ABIO32)
#define WTF_CPU_MIPS 1
+#endif
+#if defined(__mips64__)
+#define WTF_CPU_MIPS64 1
+#define USE_SYSTEM_MALLOC 1
+#endif
#if defined(__MIPSEB__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
@@ -327,7 +338,7 @@
@@ -330,7 +336,7 @@
#endif /* ARM */
-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(MIPS64) || CPU(SPARC64)
+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC64)
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
@@ -656,7 +667,9 @@
|| CPU(ARM64) \
@@ -658,7 +664,8 @@
|| CPU(S390X) \
|| CPU(MIPS64) \
|| CPU(PPC64) \
- || CPU(PPC64LE)
+ || CPU(PPC64LE) \
+ || CPU(SPARC64) \
+ || CPU(MIPS64)
+ || CPU(SPARC64)
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
@@ -723,7 +736,7 @@
@@ -725,7 +732,7 @@
low-level interpreter. */
#if !defined(ENABLE_LLINT) \
&& ENABLE(JIT) \
@ -83,7 +59,7 @@ for those
&& (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
#define ENABLE_LLINT 1
@@ -731,7 +744,7 @@
@@ -733,7 +740,7 @@
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
/* Enable the DFG JIT on X86 and X86_64. */
@ -92,7 +68,7 @@ for those
#define ENABLE_DFG_JIT 1
#endif
/* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt/GTK+ Linux. */
@@ -822,7 +835,7 @@
@@ -824,7 +831,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */

11
www/webkit/patches/patch-Source_WTF_wtf_dtoa_utils_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.4 2014/08/26 21:31:03 ajacoutot Exp $
--- Source/WTF/wtf/dtoa/utils.h.orig Mon Aug 25 13:27:53 2014
+++ Source/WTF/wtf/dtoa/utils.h Tue Aug 26 13:54:25 2014
@@ -50,6 +50,7 @@ defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(MIPS64) || CPU(SPARC64)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)

33
www/webkit/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase_cpp
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase_cpp,v 1.1 2015/03/27 16:02:49 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig Wed Jan 7 10:45:43 2015
+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp Thu Mar 26 08:14:20 2015
@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::muteChanged()
#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
{
- GMutexLocker lock(m_bufferMutex);
+ WebCore::GMutexLocker lock(m_bufferMutex);
if (!m_buffer)
return nullptr;
@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::triggerRepaint(G
g_return_if_fail(GST_IS_BUFFER(buffer));
{
- GMutexLocker lock(m_bufferMutex);
+ WebCore::GMutexLocker lock(m_bufferMutex);
gst_buffer_replace(&m_buffer, buffer);
}
@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsCo
if (!m_player->visible())
return;
- GMutexLocker lock(m_bufferMutex);
+ WebCore::GMutexLocker lock(m_bufferMutex);
if (!m_buffer)
return;

51
www/webkit/patches/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer_cpp
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer_cpp,v 1.1 2015/03/27 16:02:49 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig Wed Jan 7 10:45:43 2015
+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp Thu Mar 26 08:14:20 2015
@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCallback(gpointe
WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
GstBuffer* buffer = priv->buffer;
priv->buffer = 0;
priv->timeoutId = 0;
@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRender(GstBaseSink
WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
if (priv->unlocked)
return GST_FLOW_OK;
@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(GObject* object
static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
{
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
if (priv->buffer) {
gst_buffer_unref(priv->buffer);
@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockStop(GstBaseSink*
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
{
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
priv->unlocked = false;
}
@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(GstBaseSink* base
{
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- GMutexLocker lock(priv->bufferMutex);
+ WebCore::GMutexLocker lock(priv->bufferMutex);
priv->unlocked = false;
return TRUE;
}

204
www/webkit/patches/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer_cpp
View File

@ -1,204 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer_cpp,v 1.1 2015/03/27 16:02:49 ajacoutot Exp $
https://trac.webkit.org/changeset/179866
--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig Wed Jan 7 10:45:43 2015
+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp Thu Mar 26 08:14:20 2015
@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObject* object, g
switch (propID) {
case PROP_IRADIO_MODE: {
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->iradioMode = g_value_get_boolean(value);
break;
}
@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObject* object, g
WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
WebKitWebSrcPrivate* priv = src->priv;
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
switch (propID) {
case PROP_IRADIO_MODE:
g_value_set_boolean(value, priv->iradioMode);
@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
bool seeking = priv->seekID;
@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->startID = 0;
priv->corsAccessCheck = CORSNoCheck;
@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(Gs
return ret;
}
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_DEBUG_OBJECT(src, "READY->PAUSED");
@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pa
gst_query_parse_duration(query, &format, NULL);
GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
gst_query_set_duration(query, format, src->priv->size);
result = TRUE;
@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pa
break;
}
case GST_QUERY_URI: {
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
gst_query_set_uri(query, src->priv->uri);
result = TRUE;
break;
@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handle
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
gchar* ret;
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
ret = g_strdup(src->priv->uri);
return ret;
}
@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* hand
return FALSE;
}
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
g_free(priv->uri);
priv->uri = 0;
@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSr
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
// already stopped
if (!priv->needDataID)
return FALSE;
@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint l
GST_DEBUG_OBJECT(src, "Need more data: %u", length);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (priv->needDataID || !priv->paused) {
return;
}
@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWeb
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
// already stopped
if (!priv->enoughDataID)
return FALSE;
@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpoin
GST_DEBUG_OBJECT(src, "Have enough data");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (priv->enoughDataID || priv->paused) {
return;
}
@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* s
ASSERT(isMainThread());
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
// already stopped
if (!priv->seekID)
return FALSE;
@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, gui
WebKitWebSrcPrivate* priv = src->priv;
GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (offset == priv->offset && priv->requestedOffset == priv->offset)
return TRUE;
@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, gui
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
{
ASSERT(player);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
src->priv->player = player;
}
@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer(size_t request
mapGstBuffer(buffer);
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->buffer = adoptGRef(buffer);
locker.unlock();
@@ -867,7 +867,7 @@ void StreamingClient::handleResponseReceived(const Res
return;
}
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
priv->corsAccessCheck = corsAccessCheck;
@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived(const char* d
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
WebKitWebSrcPrivate* priv = src->priv;
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinished()
GST_DEBUG_OBJECT(src, "Have EOS");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
if (!priv->seekID) {
locker.unlock();
gst_app_src_end_of_stream(priv->appsrc);
@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasBlocked(Resourc
GST_ERROR_OBJECT(src, "Request was blocked");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();
@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cannotShowURL(Reso
GST_ERROR_OBJECT(src, "Cannot show URL");
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();

14
www/webkit/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.23 2014/07/15 19:58:52 espie Exp $
$OpenBSD: patch-configure,v 1.24 2015/05/20 15:32:54 ajacoutot Exp $
- Chunk 1: GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD
glib commit 136e705e8383ff8848e425ac01278102d7badc52
@ -9,9 +9,9 @@ https://bugs.webkit.org/show_bug.cgi?id=129973
- Chunk 3 : Don't force the use of -O2, the ports infrastructure
takes care of that
--- configure.orig Mon May 26 09:48:45 2014
+++ configure Tue Jul 15 16:11:41 2014
@@ -17659,26 +17659,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
--- configure.orig Wed May 20 11:29:21 2015
+++ configure Wed May 20 15:16:37 2015
@@ -17665,26 +17665,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
all-am: $(gsettings_SCHEMAS:.xml=.valid)
uninstall-am: uninstall-gsettings-schemas
@ -41,7 +41,7 @@ takes care of that
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:
@@ -20588,7 +20576,7 @@ if test "$found_opengl" = "yes"; then
@@ -20693,7 +20681,7 @@ if test "$found_opengl" = "yes"; then
fi
if test "$enable_egl" = "yes"; then
acceleration_description="$acceleration_description, egl"
@ -50,7 +50,7 @@ takes care of that
fi
if test "$enable_glx" = "yes"; then
acceleration_description="$acceleration_description, glx"
@@ -21164,7 +21152,7 @@ $as_echo "$ac_cv_search_shm_open" >&6; }
@@ -21271,7 +21259,7 @@ $as_echo "$ac_cv_search_shm_open" >&6; }
ac_res=$ac_cv_search_shm_open
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@ -59,7 +59,7 @@ takes care of that
fi
@@ -21860,8 +21848,8 @@ fi
@@ -21967,8 +21955,8 @@ fi
# Add the appropriate 'O' level for optimized builds.
if test "$enable_optimizations" = "yes"; then