From patchwork Mon Apr 1 18:39:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1918542 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V7fv30kS4z1yWv for ; Tue, 2 Apr 2024 05:39:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4E28C40561; Mon, 1 Apr 2024 18:39:41 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id EX-EGdwdT2wa; Mon, 1 Apr 2024 18:39:40 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 27C6D4068E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 27C6D4068E; Mon, 1 Apr 2024 18:39:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1123E1BF28E for ; Mon, 1 Apr 2024 18:39:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0B50781379 for ; Mon, 1 Apr 2024 18:39:38 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id jvOIszyjuKzS for ; Mon, 1 Apr 2024 18:39:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.167.44; helo=mail-lf1-f44.google.com; envelope-from=thomas.devoogdt@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 9D1C28135B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9D1C28135B Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9D1C28135B for ; Mon, 1 Apr 2024 18:39:36 +0000 (UTC) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-516b0c5a7faso408622e87.3 for ; Mon, 01 Apr 2024 11:39:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711996774; x=1712601574; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hurho33op0zmtzgczZeWmnq4eDd8Pv5SJkQXJRo3zSY=; b=WXe38M/zO4Y7G0NNCWwKqK7ac7pqiryWb9wr0MNz2nWdsQVWrBz5XltowQvAfMqydZ MBakmIaSGpBxj8/+5s5MJ5ORaPrZ2JR5obDF7CXBpf+KwHBsJeYiAhzjJp2/YqHZqSnm TRkYsOzZ8sy2Dy/dVglow3oKYy/3dxkoWiZNlqmenIHsbgiLnDugZubiVYwpjYl+2HOT WaGHYI272zrrQvI4hvBo6Vwy+xJC8JH5evNK7VDNePbaGehcGoLIpfZJYpUpeCyFMqMF SShSuKgxMZLT1VE/VybbXEcZ/Mn6muq/bJvgkyVVdIVJ1Z8S9n1iwoY4CLjrRtuMUtTd CQjA== X-Gm-Message-State: AOJu0Yyn0gP1C1NCX6eQ30PDAiEbBb27DVssM5SZOGG2DxR9d/CE0JgK TqcZtPUKa2DsefHEMT2DURtsnzHw162BabkKw3efBXLFVCo1IbF+NRer8y6h X-Google-Smtp-Source: AGHT+IED3Wv0TmR2VhbYVRGlEFsgdIS4IFcLkBmjEMtqgiUFQ2c7v07mUAFjVMu3mrnuxExAYGSWZA== X-Received: by 2002:a05:6512:1588:b0:515:d1f9:983b with SMTP id bp8-20020a056512158800b00515d1f9983bmr10568167lfb.1.1711996773396; Mon, 01 Apr 2024 11:39:33 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:eb68:2f00:a80e:b8d9:a912:61ce]) by smtp.gmail.com with ESMTPSA id q12-20020a056402040c00b0056be85c253fsm5731781edv.95.2024.04.01.11.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 11:39:32 -0700 (PDT) From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 1 Apr 2024 20:39:29 +0200 Message-Id: <20240401183930.2557159-1-thomas@devoogdt.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=devoogdt.com Subject: [Buildroot] [PATCH v1 1/2] package/ruby: add host psych (yaml) support X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro , Thomas Devoogdt Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Needed to compile webkitgtk 2.44.0. Signed-off-by: Thomas Devoogdt --- Question to the reviewer, should I use this: ``` ifeq ($(BR2_PACKAGE_HOST_LIBYAML),y) HOST_RUBY_DEPENDENCIES += host-libyaml endif ``` --- package/ruby/ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 4b9ce80e67..ac7de38de4 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -20,7 +20,7 @@ RUBY_LICENSE_FILES = LEGAL COPYING BSDL RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby -HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl +HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl host-libyaml RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) RUBY_CONF_OPTS = \ --disable-install-doc \ From patchwork Mon Apr 1 18:39:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1918543 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V7fv937q4z1yWv for ; Tue, 2 Apr 2024 05:39:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B9B88406E1; Mon, 1 Apr 2024 18:39:46 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id YfWBpT9ov9bv; Mon, 1 Apr 2024 18:39:43 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3BECD406F9 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 3BECD406F9; Mon, 1 Apr 2024 18:39:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5A0021BF28E for ; Mon, 1 Apr 2024 18:39:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 474F381425 for ; Mon, 1 Apr 2024 18:39:41 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id RDGfH6plfSjU for ; Mon, 1 Apr 2024 18:39:39 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.208.43; helo=mail-ed1-f43.google.com; envelope-from=thomas.devoogdt@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org B56878135B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B56878135B Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by smtp1.osuosl.org (Postfix) with ESMTPS id B56878135B for ; Mon, 1 Apr 2024 18:39:38 +0000 (UTC) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-56899d9bf52so5506776a12.2 for ; Mon, 01 Apr 2024 11:39:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711996775; x=1712601575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uiHFYCgDv7Pprekf1StX6O9muFJBcPFn2IsUNDPDJi4=; b=Tcifs5orblTU3ADGqq8ZtHQWnUv6XwFawFurkMGHj0bV6ULgnDJwH27d1+YF9FYfxF qm+iSMeU5bp4fMFMLqRo+p0sf2Vg7PQ+nniHf04Rr7SkIDCWKFbIneXi0zDoCoSL0y46 DhPhyIq66d1mrOlQPER7AQ/2lzqHNvXljXfcJXDwzfGq+Px84h9/qb6ldwaT+dAn/1fI iwEI8SGFmBVdg9LVQEtowgPzvz+fprHACMDO1ugwRewkoAwKZDsghGAsrvwrvGesZpVD 9cZcoSTNfok9di+m//PBnHQVvJefAgSbVXqS8sd3JT0LP79RVkSfj8ntPnxHWrZMyRPj kGSg== X-Gm-Message-State: AOJu0YygLvuwwDMEuwSnz96INpYdcqCC/dIJDCof4psji0bYColjn8Xq oXJyhc7dv7B+Q+grldubSjJiay75xHY8oM+dcWFY2i4Ym/wjXsGj8BlRp1NF X-Google-Smtp-Source: AGHT+IE7T0orAfAeP4eTNa1lLdhEf9JQGglSX/1NkAapC5G4+uXZwRxXaxJqH6cBhi0BZEviXBoIlg== X-Received: by 2002:a05:6402:3511:b0:56d:b5d5:3cbd with SMTP id b17-20020a056402351100b0056db5d53cbdmr7877563edd.36.1711996775105; Mon, 01 Apr 2024 11:39:35 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:eb68:2f00:a80e:b8d9:a912:61ce]) by smtp.gmail.com with ESMTPSA id q12-20020a056402040c00b0056be85c253fsm5731781edv.95.2024.04.01.11.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 11:39:34 -0700 (PDT) From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 1 Apr 2024 20:39:30 +0200 Message-Id: <20240401183930.2557159-2-thomas@devoogdt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240401183930.2557159-1-thomas@devoogdt.com> References: <20240401183930.2557159-1-thomas@devoogdt.com> MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=devoogdt.com Subject: [Buildroot] [PATCH v1 2/2] package/webkitgtk: bump to 2.44.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro , Thomas Devoogdt Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" A lot has been changed, please consult the announcement [1], what's new [2], and the security advisory [3] for more details. Specific to this bump: - Libegl is now mandatory [4] and the USE_OPENGL_OR_ES flag has been dropped. While at it, also explicitly add the libepoxy dependency which is now selected by libgtk3. - The WPE renderer has been dropped [2], so drop the wpebackend-fdo dependency. - JPEG2000 has been dropped [2], so drop the OpenJPEG dependency. - GTK4 is now the default, so turn it off, since buildroot has no GTK4 support yet [2]. - USE_LIBBACKTRACE has been added [5], so select it properly. - Support for ENABLE_WEB_CODECS has been added, which will now be enabled together with audio and video support. - ENABLE_WEBASSEMBLY is forbidden when ENABLE_C_LOOP [6], so disable it when compiling for MIPS r6, ARMv5, and ARMv6. At last, a bunch of patches are needed to fix compilation if video is not enabled. [1]: https://webkitgtk.org/2024/03/16/webkitgtk2.44.0-released.html [2]: https://webkitgtk.org/2024/03/27/webkigit-2.44.html [3]: https://webkitgtk.org/security/WSA-2024-0002.html [4]: https://commits.webkit.org/271345@main [5]: https://commits.webkit.org/268579@main [6]: https://commits.webkit.org/271347@main Signed-off-by: Thomas Devoogdt --- Used config to test: ``` BR2_PACKAGE_XORG7=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_LIBGTK3=y BR2_PACKAGE_WEBKITGTK=y ``` Build fails: bootlin-riscv32-glibc [17/42]: FAILED bootlin-riscv64-glibc [18/42]: FAILED bootlin-riscv64-musl [19/42]: FAILED Reason: >>> xlib_libxshmfence 1.3.2 Building xshmfence_futex.h:58:24: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'? 58 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); | ^~~~~~~~~ | sys_futex --- ...ays_lock_free-assertion-on-32-bit-ar.patch | 55 +++++++++ ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 ------- ...ullscreenManager-add-missing-include.patch | 33 ++++++ ...enManager-fix-undefined-reference-to.patch | 37 ++++++ ...fix-undefined-reference-to-HTMLMedia.patch | 105 ++++++++++++++++++ ...rDOMAgent-fix-fix-undefined-referenc.patch | 44 ++++++++ ...e-fix-undefined-reference-to-HTMLMed.patch | 69 ++++++++++++ ...reenManagerProxy-add-missing-include.patch | 33 ++++++ ...ullScreenManager-add-missing-include.patch | 33 ++++++ ...undlePageFullScreenClient-add-missin.patch | 34 ++++++ ...gumentCoders.serialization.in-fix-un.patch | 56 ++++++++++ package/webkitgtk/Config.in | 4 +- package/webkitgtk/webkitgtk.hash | 6 +- package/webkitgtk/webkitgtk.mk | 50 ++++----- 14 files changed, 525 insertions(+), 73 deletions(-) create mode 100644 package/webkitgtk/0001-ANGLE-fix-is_always_lock_free-assertion-on-32-bit-ar.patch delete mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch create mode 100644 package/webkitgtk/0002-WebCore-FullscreenManager-add-missing-include.patch create mode 100644 package/webkitgtk/0003-WebCore-FullscreenManager-fix-undefined-reference-to.patch create mode 100644 package/webkitgtk/0004-WebCore-css-fix-fix-undefined-reference-to-HTMLMedia.patch create mode 100644 package/webkitgtk/0005-WebCore-InspectorDOMAgent-fix-fix-undefined-referenc.patch create mode 100644 package/webkitgtk/0006-WebCore-GPUDevice-fix-undefined-reference-to-HTMLMed.patch create mode 100644 package/webkitgtk/0007-WebKit-WebFullScreenManagerProxy-add-missing-include.patch create mode 100644 package/webkitgtk/0008-WebKit-WebFullScreenManager-add-missing-include.patch create mode 100644 package/webkitgtk/0009-WebKit-InjectedBundlePageFullScreenClient-add-missin.patch create mode 100644 package/webkitgtk/0010-WebKit-WebCoreArgumentCoders.serialization.in-fix-un.patch diff --git a/package/webkitgtk/0001-ANGLE-fix-is_always_lock_free-assertion-on-32-bit-ar.patch b/package/webkitgtk/0001-ANGLE-fix-is_always_lock_free-assertion-on-32-bit-ar.patch new file mode 100644 index 0000000000..c574dba08e --- /dev/null +++ b/package/webkitgtk/0001-ANGLE-fix-is_always_lock_free-assertion-on-32-bit-ar.patch @@ -0,0 +1,55 @@ +From 4399714e71df34ac53e830ae1f7b2eab93716fa7 Mon Sep 17 00:00:00 2001 +From: Charlie Lao +Date: Fri, 29 Mar 2024 10:30:59 -0700 +Subject: [PATCH] [ANGLE]: fix is_always_lock_free assertion on 32 bit arch + +https://bugs.webkit.org/show_bug.cgi?id=252670 + +Reviewed by NOBODY (OOPS!). + +Remove is_always_lock_free assertion from AtomicQueueSerial + +Build will fail when compiled on 32 bit architecture. The code will +still function on 32 bit architecture but with performance penalty due +to lock. But we are not really expecting it actually run on 32 bit +platform with vulkan backend (the atomic queue serial is only used by +vulkan backend). We could move AtomicQueueSerial into vulkan backend, +but that will be a much larger change that I try to avoid. This CL +removes the static_assertion and make it 8 bytes aligned as well. + +Bug: angleproject:7989 +Change-Id: I3c0bd9877c4171485ca1aa9af0cf4621c1c23f56 +Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5407870 +Reviewed-by: Shahbaz Youssefi +Commit-Queue: Charlie Lao + +Upstream: https://chromium.googlesource.com/angle/angle/+/321c6b63bebce3f31414d8a53fb2f94b5561b818 +Signed-off-by: Thomas Devoogdt +--- + Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h +index 812927743a64..7146690c95ab 100644 +--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h ++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h +@@ -116,7 +116,7 @@ class Serial final + }; + + // Defines class to track the queue serial that can be load/store from multiple threads atomically. +-class AtomicQueueSerial final ++class alignas(8) AtomicQueueSerial final + { + public: + AtomicQueueSerial &operator=(const Serial &other) +@@ -129,7 +129,6 @@ class AtomicQueueSerial final + private: + static constexpr uint64_t kInvalid = 0; + std::atomic mValue = kInvalid; +- static_assert(decltype(mValue)::is_always_lock_free, "Must always be lock free"); + }; + + // Used as default/initial serial +-- +2.34.1 + diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch deleted file mode 100644 index c9667fedbd..0000000000 --- a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Feb 2024 11:00:49 -0600 -Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= - =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= - =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= - =?UTF-8?q?=3D268739?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unreviewed build fix. Seems a backport went badly, and we didn't notice -because the code is architecture-specific. - -* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: -(JSC::CLoop::execute): - -Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff -Signed-off-by: Peter Korsgaard ---- - Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 5064ead6cd2e..9a2e2653b121 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) --- -2.39.2 - diff --git a/package/webkitgtk/0002-WebCore-FullscreenManager-add-missing-include.patch b/package/webkitgtk/0002-WebCore-FullscreenManager-add-missing-include.patch new file mode 100644 index 0000000000..8fd29185f1 --- /dev/null +++ b/package/webkitgtk/0002-WebCore-FullscreenManager-add-missing-include.patch @@ -0,0 +1,33 @@ +From 4c6d00231a70e94b4d4cd20a84e9f8b55e49fad3 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 16:22:20 +0100 +Subject: [PATCH] [WebCore]: FullscreenManager: add missing include + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement normally includes HTMLMediaElementEnums, +but only if VIDEO is enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/dom/FullscreenManager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/dom/FullscreenManager.h b/Source/WebCore/dom/FullscreenManager.h +index 3b1f74177cba..8f2287f8a756 100644 +--- a/Source/WebCore/dom/FullscreenManager.h ++++ b/Source/WebCore/dom/FullscreenManager.h +@@ -31,6 +31,7 @@ + #include "FrameDestructionObserverInlines.h" + #include "GCReachableRef.h" + #include "HTMLMediaElement.h" ++#include "HTMLMediaElementEnums.h" + #include "LayoutRect.h" + #include "Page.h" + #include +-- +2.34.1 + diff --git a/package/webkitgtk/0003-WebCore-FullscreenManager-fix-undefined-reference-to.patch b/package/webkitgtk/0003-WebCore-FullscreenManager-fix-undefined-reference-to.patch new file mode 100644 index 0000000000..c9b67b0a1e --- /dev/null +++ b/package/webkitgtk/0003-WebCore-FullscreenManager-fix-undefined-reference-to.patch @@ -0,0 +1,37 @@ +From f1a651dfb3911d3564c7c133df021a9c1e57a75f Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 16:23:36 +0100 +Subject: [PATCH] [WebCore]: FullscreenManager: fix undefined reference to + HTMLMediaElement + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement is not compiled if VIDEO is not enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/dom/FullscreenManager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebCore/dom/FullscreenManager.cpp b/Source/WebCore/dom/FullscreenManager.cpp +index 248694557dc3..58bf96045277 100644 +--- a/Source/WebCore/dom/FullscreenManager.cpp ++++ b/Source/WebCore/dom/FullscreenManager.cpp +@@ -529,9 +529,11 @@ bool FullscreenManager::willEnterFullscreen(Element& element, HTMLMediaElementEn + INFO_LOG(LOGIDENTIFIER); + ASSERT(page()->settings().fullScreenEnabled()); + ++#if ENABLE(VIDEO) + if (RefPtr mediaElement = dynamicDowncast(element)) + mediaElement->willBecomeFullscreenElement(mode); + else ++#endif + element.willBecomeFullscreenElement(); + + ASSERT(&element == m_pendingFullscreenElement); +-- +2.34.1 + diff --git a/package/webkitgtk/0004-WebCore-css-fix-fix-undefined-reference-to-HTMLMedia.patch b/package/webkitgtk/0004-WebCore-css-fix-fix-undefined-reference-to-HTMLMedia.patch new file mode 100644 index 0000000000..2ef791aafe --- /dev/null +++ b/package/webkitgtk/0004-WebCore-css-fix-fix-undefined-reference-to-HTMLMedia.patch @@ -0,0 +1,105 @@ +From 102a4ccc0a35e9bcb016007adbc08a66db6f9160 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 16:24:30 +0100 +Subject: [PATCH] [WebCore]: css: fix fix undefined reference to + HTMLMediaElement + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement is not compiled if VIDEO is not enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/css/SelectorChecker.cpp | 2 ++ + Source/WebCore/css/SelectorCheckerTestFunctions.h | 2 ++ + Source/WebCore/cssjit/SelectorCompiler.cpp | 8 ++++++++ + 3 files changed, 12 insertions(+) + +diff --git a/Source/WebCore/css/SelectorChecker.cpp b/Source/WebCore/css/SelectorChecker.cpp +index 60db400f695a..1a4c72c4dbc5 100644 +--- a/Source/WebCore/css/SelectorChecker.cpp ++++ b/Source/WebCore/css/SelectorChecker.cpp +@@ -1055,9 +1055,11 @@ bool SelectorChecker::checkOne(CheckingContext& checkingContext, const LocalCont + return matchesAnimatingFullscreenTransitionPseudoClass(element); + case CSSSelector::PseudoClass::InternalFullscreenDocument: + return matchesFullscreenDocumentPseudoClass(element); ++#if ENABLE(VIDEO) + case CSSSelector::PseudoClass::InternalInWindowFullScreen: + return matchesInWindowFullScreenPseudoClass(element); + #endif ++#endif + #if ENABLE(PICTURE_IN_PICTURE_API) + case CSSSelector::PseudoClass::PictureInPicture: + return matchesPictureInPicturePseudoClass(element); +diff --git a/Source/WebCore/css/SelectorCheckerTestFunctions.h b/Source/WebCore/css/SelectorCheckerTestFunctions.h +index 0be916897226..b14b4b87ec5e 100644 +--- a/Source/WebCore/css/SelectorCheckerTestFunctions.h ++++ b/Source/WebCore/css/SelectorCheckerTestFunctions.h +@@ -432,6 +432,7 @@ ALWAYS_INLINE bool matchesFullscreenDocumentPseudoClass(const Element& element) + return fullscreenManager && fullscreenManager->fullscreenElement(); + } + ++#if ENABLE(VIDEO) + ALWAYS_INLINE bool matchesInWindowFullScreenPseudoClass(const Element& element) + { + if (&element != element.document().fullscreenManager().currentFullscreenElement()) +@@ -440,6 +441,7 @@ ALWAYS_INLINE bool matchesInWindowFullScreenPseudoClass(const Element& element) + auto* mediaElement = dynamicDowncast(element); + return mediaElement && mediaElement->fullscreenMode() == HTMLMediaElementEnums::VideoFullscreenModeInWindow; + } ++#endif + + #endif + +diff --git a/Source/WebCore/cssjit/SelectorCompiler.cpp b/Source/WebCore/cssjit/SelectorCompiler.cpp +index 94972294daf9..6bf6658a1dbd 100644 +--- a/Source/WebCore/cssjit/SelectorCompiler.cpp ++++ b/Source/WebCore/cssjit/SelectorCompiler.cpp +@@ -258,8 +258,10 @@ static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(operationMatchesLangPseudo + static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(operationMatchesFullscreenPseudoClass, bool, (const Element&)); + static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(operationMatchesFullscreenDocumentPseudoClass, bool, (const Element&)); + static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(operationMatchesAnimatingFullscreenTransitionPseudoClass, bool, (const Element&)); ++#if ENABLE(VIDEO) + static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(operationMatchesInWindowFullScreenPseudoClass, bool, (const Element&)); + #endif ++#endif + #if ENABLE(PICTURE_IN_PICTURE_API) + static JSC_DECLARE_JIT_OPERATION_WITHOUT_WTF_INTERNAL(operationMatchesPictureInPicturePseudoClass, bool, (const Element&)); + #endif +@@ -910,6 +912,8 @@ JSC_DEFINE_JIT_OPERATION(operationMatchesAnimatingFullscreenTransitionPseudoClas + COUNT_SELECTOR_OPERATION(operationMatchesAnimatingFullscreenTransitionPseudoClass); + return matchesAnimatingFullscreenTransitionPseudoClass(element); + } ++ ++#if ENABLE(VIDEO) + JSC_DEFINE_JIT_OPERATION(operationMatchesInWindowFullScreenPseudoClass, bool, (const Element& element)) + { + COUNT_SELECTOR_OPERATION(operationMatchesInWindowFullScreenPseudoClass); +@@ -917,6 +921,8 @@ JSC_DEFINE_JIT_OPERATION(operationMatchesInWindowFullScreenPseudoClass, bool, (c + } + #endif + ++#endif ++ + #if ENABLE(PICTURE_IN_PICTURE_API) + JSC_DEFINE_JIT_OPERATION(operationMatchesPictureInPicturePseudoClass, bool, (const Element& element)) + { +@@ -1113,10 +1119,12 @@ static inline FunctionType addPseudoClassType(const CSSSelector& selector, Selec + case CSSSelector::PseudoClass::InternalAnimatingFullscreenTransition: + fragment.unoptimizedPseudoClasses.append(CodePtr(operationMatchesAnimatingFullscreenTransitionPseudoClass)); + return FunctionType::SimpleSelectorChecker; ++#if ENABLE(VIDEO) + case CSSSelector::PseudoClass::InternalInWindowFullScreen: + fragment.unoptimizedPseudoClasses.append(CodePtr(operationMatchesInWindowFullScreenPseudoClass)); + return FunctionType::SimpleSelectorChecker; + #endif ++#endif + + #if ENABLE(PICTURE_IN_PICTURE_API) + case CSSSelector::PseudoClass::PictureInPicture: +-- +2.34.1 + diff --git a/package/webkitgtk/0005-WebCore-InspectorDOMAgent-fix-fix-undefined-referenc.patch b/package/webkitgtk/0005-WebCore-InspectorDOMAgent-fix-fix-undefined-referenc.patch new file mode 100644 index 0000000000..0edaca92be --- /dev/null +++ b/package/webkitgtk/0005-WebCore-InspectorDOMAgent-fix-fix-undefined-referenc.patch @@ -0,0 +1,44 @@ +From bb361d8cd4f1445cc516e0f85f00d481a14ccf03 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 16:25:09 +0100 +Subject: [PATCH] [WebCore]: InspectorDOMAgent: fix fix undefined reference to + HTMLMediaElement + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement is not compiled if VIDEO is not enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/inspector/agents/InspectorDOMAgent.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +index 6e348089ef30..87f891547563 100644 +--- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp ++++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +@@ -3098,6 +3098,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT + + Protocol::ErrorStringOr> InspectorDOMAgent::getMediaStats(Protocol::DOM::NodeId nodeId) + { ++#if ENABLE(VIDEO) + Protocol::ErrorString errorString; + + auto* element = assertElement(errorString, nodeId); +@@ -3174,6 +3175,10 @@ Protocol::ErrorStringOr> InspectorDOMAgent::getMe + } + + return stats; ++#else ++ UNUSED_PARAM(nodeId); ++ return makeUnexpected("no media support"_s); ++#endif + } + + } // namespace WebCore +-- +2.34.1 + diff --git a/package/webkitgtk/0006-WebCore-GPUDevice-fix-undefined-reference-to-HTMLMed.patch b/package/webkitgtk/0006-WebCore-GPUDevice-fix-undefined-reference-to-HTMLMed.patch new file mode 100644 index 0000000000..5dfd878153 --- /dev/null +++ b/package/webkitgtk/0006-WebCore-GPUDevice-fix-undefined-reference-to-HTMLMed.patch @@ -0,0 +1,69 @@ +From 443fb53ec15a09c14b3858175b1ce1099809a33a Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 16:29:46 +0100 +Subject: [PATCH] [WebCore]: GPUDevice: fix undefined reference to + HTMLMediaElement + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement is not compiled if VIDEO is not enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/Modules/WebGPU/GPUDevice.cpp | 4 ++++ + Source/WebCore/Modules/WebGPU/GPUDevice.h | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/Source/WebCore/Modules/WebGPU/GPUDevice.cpp b/Source/WebCore/Modules/WebGPU/GPUDevice.cpp +index 6f36a58b7839..2d9dd3b350aa 100644 +--- a/Source/WebCore/Modules/WebGPU/GPUDevice.cpp ++++ b/Source/WebCore/Modules/WebGPU/GPUDevice.cpp +@@ -270,6 +270,7 @@ Ref GPUDevice::createSampler(const std::optionalcreateSampler(convertToBacking(samplerDescriptor))); + } + ++#if ENABLE(VIDEO) + GPUExternalTexture* GPUDevice::externalTextureForDescriptor(const GPUExternalTextureDescriptor& descriptor) + { + m_videoElementToExternalTextureMap.removeNullReferences(); +@@ -318,9 +319,11 @@ private: + HTMLVideoElement& m_videoElement; + WeakHashMap, WeakPtrImplWithEventTargetData> &m_weakMap; + }; ++#endif + + Ref GPUDevice::importExternalTexture(const GPUExternalTextureDescriptor& externalTextureDescriptor) + { ++#if ENABLE(VIDEO) + if (auto* externalTexture = externalTextureForDescriptor(externalTextureDescriptor)) { + externalTexture->undestroy(); + #if ENABLE(WEB_CODECS) +@@ -331,6 +334,7 @@ Ref GPUDevice::importExternalTexture(const GPUExternalTextur + m_videoElementToExternalTextureMap.remove(*videoElement.get()); + return *externalTexture; + } ++#endif + auto externalTexture = GPUExternalTexture::create(m_backing->importExternalTexture(externalTextureDescriptor.convertToBacking())); + #if ENABLE(VIDEO) + #if ENABLE(WEB_CODECS) +diff --git a/Source/WebCore/Modules/WebGPU/GPUDevice.h b/Source/WebCore/Modules/WebGPU/GPUDevice.h +index 09f9dd6d61ec..925bb8c57fb1 100644 +--- a/Source/WebCore/Modules/WebGPU/GPUDevice.h ++++ b/Source/WebCore/Modules/WebGPU/GPUDevice.h +@@ -157,7 +157,10 @@ private: + Ref m_queue; + Ref m_autoPipelineLayout; + HashSet m_buffersToUnmap; ++ ++#if ENABLE(VIDEO) + GPUExternalTexture* externalTextureForDescriptor(const GPUExternalTextureDescriptor&); ++#endif + + WeakHashMap, WeakPtrImplWithEventTargetData> m_videoElementToExternalTextureMap; + bool m_waitingForDeviceLostPromise { false }; +-- +2.34.1 + diff --git a/package/webkitgtk/0007-WebKit-WebFullScreenManagerProxy-add-missing-include.patch b/package/webkitgtk/0007-WebKit-WebFullScreenManagerProxy-add-missing-include.patch new file mode 100644 index 0000000000..11a0af3ffe --- /dev/null +++ b/package/webkitgtk/0007-WebKit-WebFullScreenManagerProxy-add-missing-include.patch @@ -0,0 +1,33 @@ +From 5715d28eb23ffcb12d25e58a791367fcc9b896f5 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 22:00:53 +0100 +Subject: [PATCH] [WebKit]: WebFullScreenManagerProxy: add missing include + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement normally includes HTMLMediaElementEnums, +but only if VIDEO is enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebKit/UIProcess/WebFullScreenManagerProxy.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebKit/UIProcess/WebFullScreenManagerProxy.h b/Source/WebKit/UIProcess/WebFullScreenManagerProxy.h +index e0834267bc71..dde36eae7f83 100644 +--- a/Source/WebKit/UIProcess/WebFullScreenManagerProxy.h ++++ b/Source/WebKit/UIProcess/WebFullScreenManagerProxy.h +@@ -29,6 +29,7 @@ + + #include "MessageReceiver.h" + #include ++#include + #include + #include + #include +-- +2.34.1 + diff --git a/package/webkitgtk/0008-WebKit-WebFullScreenManager-add-missing-include.patch b/package/webkitgtk/0008-WebKit-WebFullScreenManager-add-missing-include.patch new file mode 100644 index 0000000000..ebfff9ee1c --- /dev/null +++ b/package/webkitgtk/0008-WebKit-WebFullScreenManager-add-missing-include.patch @@ -0,0 +1,33 @@ +From ed97666b15cd803f76c58eafa7334db781dfc272 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 22:02:04 +0100 +Subject: [PATCH] [WebKit]: WebFullScreenManager: add missing include + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement normally includes HTMLMediaElementEnums, +but only if VIDEO is enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h b/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h +index 4c3e0f50ee35..5313dc181b8f 100644 +--- a/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h ++++ b/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.h +@@ -30,6 +30,7 @@ + #include "WebCoreArgumentCoders.h" + #include + #include ++#include + #include + #include + #include +-- +2.34.1 + diff --git a/package/webkitgtk/0009-WebKit-InjectedBundlePageFullScreenClient-add-missin.patch b/package/webkitgtk/0009-WebKit-InjectedBundlePageFullScreenClient-add-missin.patch new file mode 100644 index 0000000000..7af3073ab6 --- /dev/null +++ b/package/webkitgtk/0009-WebKit-InjectedBundlePageFullScreenClient-add-missin.patch @@ -0,0 +1,34 @@ +From 4fcf084b6fb279a7c3b95a662a5999480a08e757 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 22:02:53 +0100 +Subject: [PATCH] [WebKit]: InjectedBundlePageFullScreenClient: add missing + include + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +HTMLMediaElement normally includes HTMLMediaElementEnums, +but only if VIDEO is enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + .../InjectedBundle/InjectedBundlePageFullScreenClient.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h +index c6d1113e1706..4b9490ac3c89 100644 +--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h ++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h +@@ -32,6 +32,7 @@ + #include "WKBundlePageFullScreenClient.h" + #include + #include ++#include + #include + #include + +-- +2.34.1 + diff --git a/package/webkitgtk/0010-WebKit-WebCoreArgumentCoders.serialization.in-fix-un.patch b/package/webkitgtk/0010-WebKit-WebCoreArgumentCoders.serialization.in-fix-un.patch new file mode 100644 index 0000000000..2f797540c5 --- /dev/null +++ b/package/webkitgtk/0010-WebKit-WebCoreArgumentCoders.serialization.in-fix-un.patch @@ -0,0 +1,56 @@ +From c1ccf7d3f3e68c63a44c48c2251ed77e1f8bc09c Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sat, 30 Mar 2024 22:05:20 +0100 +Subject: [PATCH] [WebKit]: WebCoreArgumentCoders.serialization.in: fix + undefined reference + +https://bugs.webkit.org/show_bug.cgi?id=271881 + +Reviewed by NOBODY (OOPS!). + +CaptionUserPreferencesDisplayMode and SerializedPlatformDataCueValue +are only compiled if VIDEO is enabled. + +Upstream: https://github.com/WebKit/WebKit/pull/26651 +Signed-off-by: Thomas Devoogdt +--- + Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in +index 0ed841ce1a2a..419fcda6ce7f 100644 +--- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in ++++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in +@@ -7120,6 +7120,7 @@ header: + [Nested] enum class WebCore::FontVisibility : bool; + [Nested] enum class WebCore::FontIsOrientationFallback : bool; + ++#if ENABLE(VIDEO) + header: + enum class WebCore::CaptionUserPreferencesDisplayMode : uint8_t { + Automatic, +@@ -7127,6 +7128,7 @@ enum class WebCore::CaptionUserPreferencesDisplayMode : uint8_t { + AlwaysOn, + Manual, + }; ++#endif + + header: + enum class WebCore::InspectorClientDeveloperPreference : uint8_t { +@@ -7741,6 +7743,7 @@ header: + SourceGraphic + }; + ++#if ENABLE(VIDEO) + class WebCore::SerializedPlatformDataCueValue { + std::optional data() + } +@@ -7753,4 +7756,5 @@ class WebCore::SerializedPlatformDataCueValue { + RetainPtr locale; + std::variant, RetainPtr, RetainPtr, RetainPtr> value; + #endif ++#endif + }; +-- +2.34.1 + diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index ace1b8739f..8ee90dda1c 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -29,6 +29,7 @@ config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 @@ -42,18 +43,17 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_ICU select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 - select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index ac4799d4cf..dd1ec855ae 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums -sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz -sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.44.0.tar.xz.sums +sha1 f3cf333015ab53aea66a5f4ad2343644e82d1c58 webkitgtk-2.44.0.tar.xz +sha256 c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87 webkitgtk-2.44.0.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 075a36654f..e7fd567021 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.5 +WEBKITGTK_VERSION = 2.44.0 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -14,8 +14,8 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ - enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup3 \ - libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 + enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk3 libsecret \ + libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2 WEBKITGTK_CMAKE_BACKEND = ninja @@ -28,8 +28,8 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ -DUSE_AVIF=OFF \ + -DUSE_GTK4=OFF \ -DUSE_LIBHYPHEN=OFF \ - -DUSE_OPENJPEG=ON \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) @@ -45,12 +45,14 @@ endif ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \ - -DENABLE_WEB_AUDIO=ON + -DENABLE_WEB_AUDIO=ON \ + -DENABLE_WEB_CODECS=ON WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base else WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ - -DENABLE_WEB_AUDIO=OFF + -DENABLE_WEB_AUDIO=OFF \ + -DENABLE_WEB_CODECS=OFF endif ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y) @@ -73,6 +75,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBBACKTRACE),y) +WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=ON +WEBKITGTK_DEPENDENCIES += libbacktrace +else +WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF +endif + ifeq ($(BR2_PACKAGE_LIBJXL),y) WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON WEBKITGTK_DEPENDENCIES += libjxl @@ -87,13 +96,6 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON -WEBKITGTK_DEPENDENCIES += libgles -else -WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF -endif - ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON WEBKITGTK_DEPENDENCIES += libgbm @@ -111,23 +113,10 @@ endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON -WEBKITGTK_DEPENDENCIES += libegl else WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif -# If only the GTK Broadway backend is enabled, EGL is still needed. -ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) -WEBKITGTK_DEPENDENCIES += libegl -endif - -ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) -WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON -WEBKITGTK_DEPENDENCIES += wpebackend-fdo -else -WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=OFF -endif - ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y) WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else @@ -145,14 +134,17 @@ endif # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. # -# Also, we have to disable the sampling profiler, which does NOT work -# with ENABLE_C_LOOP. +# Also, we have to disable the sampling profiler and webassembly, +# which does NOT work with ENABLE_C_LOOP. # # Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 # https://bugs.webkit.org/show_bug.cgi?id=172765 +# https://bugs.webkit.org/show_bug.cgi?id=265218 # ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON \ + -DENABLE_SAMPLING_PROFILER=OFF \ + -DENABLE_WEBASSEMBLY=OFF endif $(eval $(cmake-package))