Accepting request 1206244 from GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/1206244 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=202
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
ff406ce4bf
@ -1,65 +0,0 @@
|
||||
From: Carlos Garcia Campos <cgarcia@igalia.com>
|
||||
Subject: Disable DMABuf renderer for NVIDIA proprietary drivers
|
||||
Bug: https://bugs.webkit.org/show_bug.cgi?id=262607
|
||||
Bug-Debian: https://bugs.debian.org/1039720
|
||||
Origin: https://github.com/WebKit/WebKit/pull/18614
|
||||
Index: webkitgtk-2.44.0/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
|
||||
===================================================================
|
||||
--- webkitgtk-2.44.0.orig/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
|
||||
+++ webkitgtk-2.44.0/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <WebCore/GLContext.h>
|
||||
#include <WebCore/IntRect.h>
|
||||
#include <WebCore/PlatformDisplay.h>
|
||||
+#include <WebCore/PlatformDisplaySurfaceless.h>
|
||||
#include <WebCore/ShareableBitmap.h>
|
||||
#include <WebCore/SharedMemory.h>
|
||||
#include <epoxy/egl.h>
|
||||
@@ -45,6 +46,7 @@
|
||||
|
||||
#if USE(GBM)
|
||||
#include <drm_fourcc.h>
|
||||
+#include <WebCore/PlatformDisplayGBM.h>
|
||||
#include <gbm.h>
|
||||
|
||||
static constexpr uint64_t s_dmabufInvalidModifier = DRM_FORMAT_MOD_INVALID;
|
||||
@@ -58,6 +60,29 @@ static constexpr uint64_t s_dmabufInvali
|
||||
|
||||
namespace WebKit {
|
||||
|
||||
+static bool isNVIDIA()
|
||||
+{
|
||||
+ const char* forceDMABuf = getenv("WEBKIT_FORCE_DMABUF_RENDERER");
|
||||
+ if (forceDMABuf && strcmp(forceDMABuf, "0"))
|
||||
+ return false;
|
||||
+
|
||||
+ std::unique_ptr<WebCore::PlatformDisplay> platformDisplay;
|
||||
+#if USE(GBM)
|
||||
+ const char* disableGBM = getenv("WEBKIT_DMABUF_RENDERER_DISABLE_GBM");
|
||||
+ if (!disableGBM || !strcmp(disableGBM, "0")) {
|
||||
+ if (auto* device = WebCore::PlatformDisplay::sharedDisplay().gbmDevice())
|
||||
+ platformDisplay = WebCore::PlatformDisplayGBM::create(device);
|
||||
+ }
|
||||
+#endif
|
||||
+ if (!platformDisplay)
|
||||
+ platformDisplay = WebCore::PlatformDisplaySurfaceless::create();
|
||||
+
|
||||
+ WebCore::GLContext::ScopedGLContext glContext(WebCore::GLContext::createOffscreen(platformDisplay ? *platformDisplay : WebCore::PlatformDisplay::sharedDisplay()));
|
||||
+ if (strstr(reinterpret_cast<const char*>(glGetString(GL_VENDOR)), "NVIDIA"))
|
||||
+ return true;
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
OptionSet<DMABufRendererBufferMode> AcceleratedBackingStoreDMABuf::rendererBufferMode()
|
||||
{
|
||||
static OptionSet<DMABufRendererBufferMode> mode;
|
||||
@@ -73,6 +98,9 @@ OptionSet<DMABufRendererBufferMode> Acce
|
||||
return;
|
||||
}
|
||||
|
||||
+ if (isNVIDIA())
|
||||
+ return;
|
||||
+
|
||||
mode.add(DMABufRendererBufferMode::SharedMemory);
|
||||
|
||||
const char* forceSHM = getenv("WEBKIT_DMABUF_RENDERER_FORCE_SHM");
|
||||
@ -1,3 +1,41 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 11 16:53:03 UTC 2024 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- Update to version 2.45.92:
|
||||
+ Add webkit://gpu/stdout to dump the information from
|
||||
webkit://gpu to stdout.
|
||||
+ Undeprecate injected bundle frame access interfaces.
|
||||
+ Fix drag and drop.
|
||||
+ Fix connection to a11y bus under flatpak.
|
||||
+ Fix the build with Wayland and GBM disabled.
|
||||
+ Fix linker relocation errors on Debug/RelWithDebInfo builds.
|
||||
+ Fix several crashes and rendering issues.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 10 21:35:51 UTC 2024 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- Up gcc requirement to match cmake check.
|
||||
Remove wpe and wpebackend-fdo from BuildRequires: no longer used.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 21:12:42 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 2.45.91:
|
||||
+ Add new API to WebKitAutomationSession to be notified when the
|
||||
session is about to be closed.
|
||||
+ Fix WebGL with accelerated compositing disabled.
|
||||
+ Fix image filtering not being applied in some cases.
|
||||
+ Fix the build on 32 bits systems.
|
||||
+ Fix the build with -DUSE_TEXTURE_MAPPER_DMABUF=OFF
|
||||
+ Fix several crashes and rendering issues.
|
||||
+ Updated translations.
|
||||
- Rebase patch with quilt.
|
||||
- Drop webkit2gtk3-disable-dmabuf-nvidia.patch: Should not be
|
||||
needed anymore.
|
||||
- Pass USE_SYSTEM_SYSPROF_CAPTURE=NO to cmake, avoid building
|
||||
sysprof capture for now.
|
||||
- Disable LTO on x86 and ppc64le.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 20:12:42 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
@ -363,7 +401,6 @@ Sun Aug 13 09:33:40 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
+ Add support for P010 video format.
|
||||
+ Fix non-accelerated rendering that broke web inspector.
|
||||
+ Fix several crashes and rendering issue
|
||||
- Temp disable LTO during build via define.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 18:25:13 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
@ -79,7 +79,7 @@ ExclusiveArch: do-not-build
|
||||
%endif
|
||||
|
||||
Name: webkit2%{_gtknamesuffix}
|
||||
Version: 2.44.4
|
||||
Version: 2.45.92
|
||||
Release: 0
|
||||
Summary: Library for rendering web content, GTK+ Port
|
||||
License: BSD-3-Clause AND LGPL-2.0-or-later
|
||||
@ -92,8 +92,6 @@ Source99: webkit2gtk3.keyring
|
||||
|
||||
# PATCH-FEATURE-OPENSUSE reproducibility.patch -- Make build reproducible
|
||||
Patch0: reproducibility.patch
|
||||
# PATCH-FIX-UPSTREAM webkit2gtk3-disable-dmabuf-nvidia.patch boo#1216778 mgorse@suse.com -- disable the DMABuf renderer for NVIDIA proprietary drivers.
|
||||
Patch2: webkit2gtk3-disable-dmabuf-nvidia.patch
|
||||
|
||||
BuildRequires: Mesa-libEGL-devel
|
||||
BuildRequires: Mesa-libGL-devel
|
||||
@ -111,7 +109,7 @@ BuildRequires: libbacktrace-devel
|
||||
%if %usegcc11
|
||||
BuildRequires: gcc11-c++
|
||||
%else
|
||||
BuildRequires: gcc-c++ >= 10.2
|
||||
BuildRequires: gcc-c++ >= 11.2
|
||||
%endif
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: gperf >= 3.0.1
|
||||
@ -186,8 +184,6 @@ BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(upower-glib)
|
||||
BuildRequires: pkgconfig(wayland-protocols)
|
||||
BuildRequires: pkgconfig(wpe-1.0) >= 1.3.0
|
||||
BuildRequires: pkgconfig(wpebackend-fdo-1.0) >= 1.6.0
|
||||
BuildRequires: pkgconfig(xdamage)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
@ -521,6 +517,7 @@ export PYTHON=%{_bindir}/python3
|
||||
%if !%{use_jxl}
|
||||
-DUSE_JPEGXL=OFF \
|
||||
%endif
|
||||
-DUSE_SYSTEM_SYSPROF_CAPTURE=NO
|
||||
|
||||
%ninja_build -j $max_link_jobs
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796
|
||||
size 35858056
|
||||
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABEDAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCZt6j0AAKCRCRxVnb5MkS
|
||||
O8uuAJ4hLC/UXFDJsanfXyaQ6/y3hf684ACdEdyKE/nxBYL9dQEzL/50xEBsl5o=
|
||||
=aQH7
|
||||
-----END PGP SIGNATURE-----
|
||||
3
webkitgtk-2.45.92.tar.xz
Normal file
3
webkitgtk-2.45.92.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:753f6c638c72633f22305a606dbd6c825b8fde3a7d01184a8f18f740493ca79f
|
||||
size 42757216
|
||||
16
webkitgtk-2.45.92.tar.xz.asc
Normal file
16
webkitgtk-2.45.92.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmbVem0ACgkQbBAJtpOX
|
||||
U5Mhow/7BbBjIf5ZUZrhRxYB0mxiezZU5fBBd/Dn9jugCI+NiZ+U403/MQfdFmey
|
||||
ZmntQSEwBhRH0tVEUfizCKkP6IOzZCOYt/eBmF+ecFJedoMsNT2P6YHWSRyoi2wo
|
||||
5ntCQQHlbGlbr1qLw9jXg83m8mV5/BDWG0QhpOrylfh3O+Dhj/z9h9PGFJ/FNxrQ
|
||||
bgAEmzvfS/sQk/mvwvKKbUG4O2hIJbW8QEzwhwXAJz6dHaXMHpnCi2QOzxBqGsif
|
||||
hTKvi1n225c6lvzX+mj788zCB4H7/sRKHzKN4iHBBZS42uddm1zE9NXPQjdfT0Ex
|
||||
YmSABnEjkg/fmKSgpnI2clmxvLXJsK5g5d53FF/b3CXop80u+BqSfs3Upa6g+/+Z
|
||||
9wlbeeJc/++XbaAOCB98fmeCTWohE8nDFPGOG1FNLsQZjTKb6SKK/lSD0u+Jo0wV
|
||||
I0jnBqwpsuH9tFVQlIBom7pAWZ3cq2mVESLzZXnCa33TAuh+AhAhURxNeYTLukWb
|
||||
VT4gLerC8GtKHx3mONVDI2JYXs8WqYlmbY3GjhKYZqsEBCKgq+YP8tWM9/U1ZHp+
|
||||
sg0SRCjQm4M3RObE7LBX9XwnSUpMs33KCHZa3Gy4AEz2IsFOlRN9DwaMrmI4nrDf
|
||||
eSB7x0QOYswlPNnzX7yl2wfTQzezo/pbcxtXolUFOPWY2NaHZHw=
|
||||
=WcF7
|
||||
-----END PGP SIGNATURE-----
|
||||
Loading…
x
Reference in New Issue
Block a user