Accepting request 713234 from GNOME:Next
GAAAAH -- I forgot to superseede OBS-URL: https://build.opensuse.org/request/show/713234 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=222
This commit is contained in:
Git OBS Bridge
parent
dee1b1a85b
commit
c1c34861e4
@ -1,40 +0,0 @@
|
||||
From e2dd6decbe25ea9498f1ba213808f34b232740c7 Mon Sep 17 00:00:00 2001
|
||||
From: "commit-queue@webkit.org"
|
||||
<commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
|
||||
Date: Mon, 1 Apr 2019 09:47:08 +0000
|
||||
Subject: [PATCH] Build failure after r243644 in GTK Linux 64-bit stable builds
|
||||
https://bugs.webkit.org/show_bug.cgi?id=196440
|
||||
|
||||
Patch by Pablo Saavedra <psaavedra@igalia.com> on 2019-04-01
|
||||
Reviewed by Philippe Normand.
|
||||
|
||||
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
|
||||
(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
|
||||
|
||||
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@243690 268f45cc-cd09-0410-ab3c-d52691b4dbfc
|
||||
---
|
||||
Source/WebCore/ChangeLog | 10 ++++++++++
|
||||
.../graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp | 2 ++
|
||||
2 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
index 00a2af6489e..5cb5f7536ac 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()
|
||||
break;
|
||||
}
|
||||
|
||||
+#if USE(GSTREAMER_GL)
|
||||
// When the imxvpudecoder is used, the texture sampling of the
|
||||
// directviv-uploaded texture returns an RGB value, so there's no need to
|
||||
// convert it.
|
||||
if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
|
||||
m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
index 205ee4bd296..51089792283 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
@@ -66,24 +66,6 @@
|
||||
|
||||
#include <gst/app/gstappsink.h>
|
||||
|
||||
-#if USE(LIBEPOXY)
|
||||
-// Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
|
||||
-#include <epoxy/gl.h>
|
||||
-
|
||||
-// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639>
|
||||
-#if !GST_CHECK_VERSION(1, 14, 0)
|
||||
-#include <gst/gl/gstglconfig.h>
|
||||
-#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX
|
||||
-#define __gl2_h_
|
||||
-#undef GST_GL_HAVE_GLSYNC
|
||||
-#define GST_GL_HAVE_GLSYNC 1
|
||||
-#endif
|
||||
-#endif // !GST_CHECK_VERSION(1, 14, 0)
|
||||
-#endif // USE(LIBEPOXY)
|
||||
-
|
||||
-#define GST_USE_UNSTABLE_API
|
||||
-#include <gst/gl/gl.h>
|
||||
-#undef GST_USE_UNSTABLE_API
|
||||
|
||||
#include "GLContext.h"
|
||||
#if USE(GLX)
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
|
||||
index 59afdfcc01b..980ea1986c4 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
|
||||
@@ -37,6 +37,25 @@
|
||||
#include <wtf/RunLoop.h>
|
||||
#include <wtf/WeakPtr.h>
|
||||
|
||||
+#if USE(LIBEPOXY)
|
||||
+// Include the <epoxy/gl.h> header before <gst/gl/gl.h>.
|
||||
+#include <epoxy/gl.h>
|
||||
+
|
||||
+// Workaround build issue with RPi userland GLESv2 headers and libepoxy <https://webkit.org/b/185639>
|
||||
+#if !GST_CHECK_VERSION(1, 14, 0)
|
||||
+#include <gst/gl/gstglconfig.h>
|
||||
+#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX
|
||||
+#define __gl2_h_
|
||||
+#undef GST_GL_HAVE_GLSYNC
|
||||
+#define GST_GL_HAVE_GLSYNC 1
|
||||
+#endif
|
||||
+#endif // !GST_CHECK_VERSION(1, 14, 0)
|
||||
+#endif // USE(LIBEPOXY)
|
||||
+
|
||||
+#define GST_USE_UNSTABLE_API
|
||||
+#include <gst/gl/gl.h>
|
||||
+#undef GST_USE_UNSTABLE_API
|
||||
+
|
||||
#if USE(TEXTURE_MAPPER_GL)
|
||||
#include "TextureMapperGL.h"
|
||||
#if USE(NICOSIA)
|
||||
@ -15,6 +15,9 @@ Tue Jul 2 11:17:11 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
+ Fix the build with video and audio disabled.
|
||||
+ Fix several crashes and rendering issues.
|
||||
+ Updated translations.
|
||||
- Drop upstream fixed patches:
|
||||
+ webkit2gtk3-bug196440-build-fix.patch.
|
||||
+ webkit2gtk3-bug198080-build-fix.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 22 18:34:57 UTC 2019 - mgorse@suse.com
|
||||
|
||||
@ -52,12 +52,10 @@ Source0: https://webkitgtk.org/releases/%{_name}-%{version}.tar.xz
|
||||
Source1: https://webkitgtk.org/releases/%{_name}-%{version}.tar.xz.asc
|
||||
Source98: baselibs.conf
|
||||
Source99: webkit2gtk3.keyring
|
||||
|
||||
# PATCH-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed
|
||||
Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch
|
||||
# PATCH-FIX-UPSTREAM webkit2gtk3-bug196440-build-fix.patch mgorse@suse.com -- fix a build failure.
|
||||
Patch2: webkit2gtk3-bug196440-build-fix.patch
|
||||
# PATCh-FIX-UPSTREAM webkit2gtk3-bug198080-build-fix.patch mgorse@suse.com -- fix build with gstreamer 1.12.x.
|
||||
Patch3: webkit2gtk3-bug198080-build-fix.patch
|
||||
|
||||
BuildRequires: Mesa-libEGL-devel
|
||||
BuildRequires: Mesa-libGL-devel
|
||||
BuildRequires: Mesa-libGLESv1_CM-devel
|
||||
@ -292,10 +290,7 @@ A small test browswer from webkit, useful for testing features.
|
||||
%lang_package -n %{_pkgname_no_slpp}
|
||||
|
||||
%prep
|
||||
%setup -q -n webkitgtk-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%autosetup -p1 -n webkitgtk-%{version}
|
||||
|
||||
%build
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user