Attachment #157111 for bug #200437

View | Details | Raw Unified | Return to bug 200437
Collapse All | Expand All

Lines 2-9 Link Here

(-)webkit-gtk2/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.4.8	5	PORTVERSION= 2.4.9
6	PORTREVISION= 2
7	CATEGORIES= www	6	CATEGORIES= www
8	MASTER_SITES= http://webkitgtk.org/releases/	7	MASTER_SITES= http://webkitgtk.org/releases/
9	PKGNAMESUFFIX= -gtk2	8	PKGNAMESUFFIX= -gtk2

Lines 1-2 Link Here

(-)webkit-gtk2/distinfo (-2 / +2 lines)
1	SHA256 (webkitgtk-2.4.8.tar.xz) = 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23	1	SHA256 (webkitgtk-2.4.9.tar.xz) = afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
2	SIZE (webkitgtk-2.4.8.tar.xz) = 9827632	2	SIZE (webkitgtk-2.4.9.tar.xz) = 9840740




--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-02-12 01:22:34.449468000 +0100
+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-02-12 01:24:42.777620000 +0100
@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
 #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::tr
     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::pa
     if (!m_player->visible())
         return;
 
-    GMutexLocker lock(m_bufferMutex);
+    WebCore::GMutexLocker lock(m_bufferMutex);
     if (!m_buffer)
         return;
 




--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-02-12 01:22:25.261692000 +0100
+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-02-12 01:24:34.127107000 +0100
@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa
     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 webkitVideoSinkRend
     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(G
 
 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 webkitVideoSinkUnlockSto
     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(Gst
 {
     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
 
-    GMutexLocker lock(priv->bufferMutex);
+    WebCore::GMutexLocker lock(priv->bufferMutex);
     priv->unlocked = false;
     return TRUE;
 }




--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-02-12 01:22:42.081133000 +0100
+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-02-12 01:25:08.298076000 +0100
@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj
 
     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(GObj
     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(WebKitW
 
     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(WebKit
 
     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 webKitWebSrc
         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 webKitWebSrcQueryWithPar
         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 webKitWebSrcQueryWithPar
         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(GstURIH
     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(GstUR
         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 webKitWebSrcNeedDataMain
 
     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(GstAp
 
     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 webKitWebSrcEnoughDataMa
 
     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(Gst
 
     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(W
 
     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(G
     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(G
 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(
 
     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::handleResponseRece
         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
     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::handleNotifyFinish
 
     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::wasB
 
     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::cann
 
     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();
 




--- configure.orig	2015-01-07 09:47:51 UTC
+++ configure
@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
 #error Not a supported GCC compiler
 #endif
 
@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
 #error Not a supported G++ compiler
 #endif
 

Lines 255-264 Link Here

(-)webkit-gtk2/pkg-plist (-2 / +2 lines)
255	lib/girepository-1.0/WebKit-1.0.typelib	255	lib/girepository-1.0/WebKit-1.0.typelib
256	lib/libjavascriptcoregtk-1.0.so	256	lib/libjavascriptcoregtk-1.0.so
257	lib/libjavascriptcoregtk-1.0.so.0	257	lib/libjavascriptcoregtk-1.0.so.0
258	lib/libjavascriptcoregtk-1.0.so.0.16.16	258	lib/libjavascriptcoregtk-1.0.so.0.16.17
259	lib/libwebkitgtk-1.0.so	259	lib/libwebkitgtk-1.0.so
260	lib/libwebkitgtk-1.0.so.0	260	lib/libwebkitgtk-1.0.so.0
261	lib/libwebkitgtk-1.0.so.0.22.14	261	lib/libwebkitgtk-1.0.so.0.22.15
262	libdata/pkgconfig/javascriptcoregtk-1.0.pc	262	libdata/pkgconfig/javascriptcoregtk-1.0.pc
263	libdata/pkgconfig/webkit-1.0.pc	263	libdata/pkgconfig/webkit-1.0.pc
264	share/gir-1.0/JavaScriptCore-1.0.gir	264	share/gir-1.0/JavaScriptCore-1.0.gir

Lines 2-9 Link Here

(-)webkit-gtk3/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.4.8	5	PORTVERSION= 2.4.9
6	PORTREVISION= 2
7	CATEGORIES= www	6	CATEGORIES= www
8	MASTER_SITES= http://webkitgtk.org/releases/	7	MASTER_SITES= http://webkitgtk.org/releases/
9	PKGNAMESUFFIX= -gtk3	8	PKGNAMESUFFIX= -gtk3

Lines 1-2 Link Here

(-)webkit-gtk3/distinfo (-2 / +2 lines)
1	SHA256 (webkitgtk-2.4.8.tar.xz) = 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23	1	SHA256 (webkitgtk-2.4.9.tar.xz) = afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
2	SIZE (webkitgtk-2.4.8.tar.xz) = 9827632	2	SIZE (webkitgtk-2.4.9.tar.xz) = 9840740




--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-02-12 01:22:34.449468000 +0100
+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-02-12 01:24:42.777620000 +0100
@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
 #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::tr
     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::pa
     if (!m_player->visible())
         return;
 
-    GMutexLocker lock(m_bufferMutex);
+    WebCore::GMutexLocker lock(m_bufferMutex);
     if (!m_buffer)
         return;
 




--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-02-12 01:22:25.261692000 +0100
+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-02-12 01:24:34.127107000 +0100
@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa
     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 webkitVideoSinkRend
     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(G
 
 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 webkitVideoSinkUnlockSto
     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(Gst
 {
     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
 
-    GMutexLocker lock(priv->bufferMutex);
+    WebCore::GMutexLocker lock(priv->bufferMutex);
     priv->unlocked = false;
     return TRUE;
 }




--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-02-12 01:22:42.081133000 +0100
+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-02-12 01:25:08.298076000 +0100
@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj
 
     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(GObj
     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(WebKitW
 
     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(WebKit
 
     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 webKitWebSrc
         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 webKitWebSrcQueryWithPar
         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 webKitWebSrcQueryWithPar
         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(GstURIH
     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(GstUR
         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 webKitWebSrcNeedDataMain
 
     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(GstAp
 
     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 webKitWebSrcEnoughDataMa
 
     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(Gst
 
     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(W
 
     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(G
     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(G
 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(
 
     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::handleResponseRece
         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
     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::handleNotifyFinish
 
     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::wasB
 
     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::cann
 
     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();
 




--- configure.orig	2015-01-07 09:47:51 UTC
+++ configure
@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
 #error Not a supported GCC compiler
 #endif
 
@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
 #error Not a supported G++ compiler
 #endif
 




lib/girepository-1.0/WebKit2WebExtension-3.0.typelib
lib/libjavascriptcoregtk-3.0.so
lib/libjavascriptcoregtk-3.0.so.0
lib/libjavascriptcoregtk-3.0.so.0.16.17
lib/libwebkit2gtk-3.0.so
lib/libwebkit2gtk-3.0.so.25
lib/libwebkit2gtk-3.0.so.25.10.12
lib/libwebkitgtk-3.0.so
lib/libwebkitgtk-3.0.so.0
lib/libwebkitgtk-3.0.so.0.22.15
lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-3.0.pc
libdata/pkgconfig/webkit2gtk-3.0.pc

Return to bug 200437

Lines 1-29 Link Here

(-)webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp (-29 lines)
1	--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-02-12 01:22:34.449468000 +0100
2	+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-12 01:24:42.777620000 +0100
3	@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
4	#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
5	PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
6	{
7	- GMutexLocker lock(m_bufferMutex);
8	+ WebCore::GMutexLocker lock(m_bufferMutex);
9	if (!m_buffer)
10	return nullptr;
11
12	@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr
13	g_return_if_fail(GST_IS_BUFFER(buffer));
14
15	{
16	- GMutexLocker lock(m_bufferMutex);
17	+ WebCore::GMutexLocker lock(m_bufferMutex);
18	gst_buffer_replace(&m_buffer, buffer);
19	}
20
21	@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa
22	if (!m_player->visible())
23	return;
24
25	- GMutexLocker lock(m_bufferMutex);
26	+ WebCore::GMutexLocker lock(m_bufferMutex);
27	if (!m_buffer)
28	return;
29

Lines 1-20 Link Here

(-)webkit-gtk2/files/patch-configure (-20 lines)
1	--- configure.orig 2015-01-07 09:47:51 UTC
2	+++ configure
3	@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5	/* end confdefs.h. */
6
7	-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
8	+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
9	#error Not a supported GCC compiler
10	#endif
11
12	@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14	/* end confdefs.h. */
15
16	-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
17	+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
18	#error Not a supported G++ compiler
19	#endif
20

Lines 1-29 Link Here

(-)webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp (-29 lines)
1	--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-02-12 01:22:34.449468000 +0100
2	+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-12 01:24:42.777620000 +0100
3	@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
4	#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
5	PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
6	{
7	- GMutexLocker lock(m_bufferMutex);
8	+ WebCore::GMutexLocker lock(m_bufferMutex);
9	if (!m_buffer)
10	return nullptr;
11
12	@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr
13	g_return_if_fail(GST_IS_BUFFER(buffer));
14
15	{
16	- GMutexLocker lock(m_bufferMutex);
17	+ WebCore::GMutexLocker lock(m_bufferMutex);
18	gst_buffer_replace(&m_buffer, buffer);
19	}
20
21	@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa
22	if (!m_player->visible())
23	return;
24
25	- GMutexLocker lock(m_bufferMutex);
26	+ WebCore::GMutexLocker lock(m_bufferMutex);
27	if (!m_buffer)
28	return;
29

Lines 1-20 Link Here

(-)webkit-gtk3/files/patch-configure (-20 lines)
1	--- configure.orig 2015-01-07 09:47:51 UTC
2	+++ configure
3	@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5	/* end confdefs.h. */
6
7	-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
8	+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
9	#error Not a supported GCC compiler
10	#endif
11
12	@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14	/* end confdefs.h. */
15
16	-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
17	+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
18	#error Not a supported G++ compiler
19	#endif
20

Lines 258-270 Link Here

(-)webkit-gtk3/pkg-plist (-3 / +3 lines)
258	lib/girepository-1.0/WebKit2WebExtension-3.0.typelib	258	lib/girepository-1.0/WebKit2WebExtension-3.0.typelib
259	lib/libjavascriptcoregtk-3.0.so	259	lib/libjavascriptcoregtk-3.0.so
260	lib/libjavascriptcoregtk-3.0.so.0	260	lib/libjavascriptcoregtk-3.0.so.0
261	lib/libjavascriptcoregtk-3.0.so.0.16.16	261	lib/libjavascriptcoregtk-3.0.so.0.16.17
262	lib/libwebkit2gtk-3.0.so	262	lib/libwebkit2gtk-3.0.so
263	lib/libwebkit2gtk-3.0.so.25	263	lib/libwebkit2gtk-3.0.so.25
264	lib/libwebkit2gtk-3.0.so.25.10.11	264	lib/libwebkit2gtk-3.0.so.25.10.12
265	lib/libwebkitgtk-3.0.so	265	lib/libwebkitgtk-3.0.so
266	lib/libwebkitgtk-3.0.so.0	266	lib/libwebkitgtk-3.0.so.0
267	lib/libwebkitgtk-3.0.so.0.22.14	267	lib/libwebkitgtk-3.0.so.0.22.15
268	lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so	268	lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
269	libdata/pkgconfig/javascriptcoregtk-3.0.pc	269	libdata/pkgconfig/javascriptcoregtk-3.0.pc
270	libdata/pkgconfig/webkit2gtk-3.0.pc	270	libdata/pkgconfig/webkit2gtk-3.0.pc