Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nodejs-electron for openSUSE:Factory
checked in at 2023-03-21 17:41:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-electron (Old)
and /work/SRC/openSUSE:Factory/.nodejs-electron.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-electron"
Tue Mar 21 17:41:05 2023 rev:59 rq:1073032 version:22.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-electron/nodejs-electron.changes
2023-03-17 17:05:02.609927274 +0100
+++
/work/SRC/openSUSE:Factory/.nodejs-electron.new.31432/nodejs-electron.changes
2023-03-21 17:41:07.145712907 +0100
@@ -1,0 +2,5 @@
+Sat Mar 18 18:48:36 UTC 2023 - Bruno Pitrus <[email protected]>
+- ANGLE: Link libvulkan.so and libGL.so instead of dlopening it
+ * angle_link_glx.patch
+
+-------------------------------------------------------------------
New:
----
angle_link_glx.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-electron.spec ++++++
--- /var/tmp/diff_new_pack.Sf0sI3/_old 2023-03-21 17:41:11.409733301 +0100
+++ /var/tmp/diff_new_pack.Sf0sI3/_new 2023-03-21 17:41:11.413733320 +0100
@@ -136,6 +136,12 @@
%bcond_with system_nvctrl
%endif
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150600 ||
0%{?fedora_version}
+%bcond_without link_vulkan
+%else
+%bcond_with link_vulkan
+%endif
+
@@ -242,7 +248,6 @@
Patch39: support-i386.patch
# from
https://sources.debian.org/patches/chromium/103.0.5060.53-1/disable/catapult.patch/
Patch67: disable-catapult.patch
-Patch68: do-not-build-libvulkan.so.patch
Patch69: nasm-generate-debuginfo.patch
Patch70: disable-fuses.patch
Patch71: enable-jxl.patch
@@ -253,8 +258,10 @@
Patch75: gcc-asmflags.patch
#
https://sources.debian.org/patches/chromium/108.0.5359.124-1/disable/tests.patch/
Patch76: disable-devtools-tests.patch
+Patch77: angle_link_glx.patch
# PATCHES to use system libs
+Patch1000: do-not-build-libvulkan.so.patch
Patch1002: chromium-system-libusb.patch
Patch1017: system-libdrm.patch
#
http://svnweb.mageia.org/packages/updates/7/chromium-browser-stable/current/SOURCES/chromium-74-pdfium-system-libopenjpeg2.patch?view=markup
@@ -596,6 +603,9 @@
%endif
BuildRequires: pkgconfig(SPIRV-Tools) >= 2022.2
%endif
+%if %{with link_vulkan}
+BuildRequires: pkgconfig(vulkan) >= 1.3
+%endif
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(zlib)
@@ -626,11 +636,13 @@
Recommends: noto-coloremoji-fonts
# This required library is dlopened
+%if %{without link_vulkan}
%ifarch %ix86 %arm
Requires: libvulkan.so.1
%else
Requires: libvulkan.so.1()(64bit)
%endif
+%endif
Provides: electron
Provides: electron%{_isa}(abi) = %{abi_version}
@@ -998,7 +1010,9 @@
build/linux/unbundle/replace_gn_files.py --system-libraries
${gn_system_libraries[@]}
-
+%if %{with link_vulkan}
+find third_party/angle/src/third_party/volk -type f ! -name "*.gn" -a ! -name
"*.gni" -delete
+%endif
%if %{with system_nghttp2}
find third_party/electron_node/deps/nghttp2 -type f ! -name "*.gn" -a ! -name
"*.gni" -a ! -name "*.gyp" -a ! -name "*.gypi" -delete
@@ -1070,8 +1084,13 @@
myconf_gn+=" use_cups=true"
myconf_gn+=" use_aura=true"
-# always load system libvulkan.so
+# link libvulkan.so and libGLX.so instead of dlopening
myconf_gn+=" angle_use_custom_libvulkan=false"
+%if %{with link_vulkan}
+myconf_gn+=" angle_shared_libvulkan=false"
+%endif
+myconf_gn+=" angle_link_glx=true"
+
# do not build PDF support
myconf_gn+=" enable_pdf=false"
++++++ angle_link_glx.patch ++++++
Link libGL.so instead of dlopening it per shared library policy
ANGLE supports this setting but it is not properly exposed in the GN build
--- a/third_party/angle/BUILD.gn
+++ b/third_party/angle/BUILD.gn
@@ -138,6 +138,7 @@
}
defines = [ angle_vma_version_define ]
+ defines+= ["ANGLE_LINK_GLX"]
if (is_win) {
defines += [ "ANGLE_IS_WIN" ]
++++++ do-not-build-libvulkan.so.patch ++++++
--- /var/tmp/diff_new_pack.Sf0sI3/_old 2023-03-21 17:41:11.649734449 +0100
+++ /var/tmp/diff_new_pack.Sf0sI3/_new 2023-03-21 17:41:11.653734468 +0100
@@ -15,12 +15,22 @@
if (current_cpu == "x86") {
--- a/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
+++ b/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
-@@ -99,7 +99,8 @@
+@@ -99,7 +99,18 @@
library_type = "static_library"
}
- target(library_type, "libvulkan") {
-+ source_set("libvulkan") {}
++if (!angle_shared_libvulkan) {
++ import("//build/config/linux/pkg_config.gni")
++ pkg_config("system_libvulkan") {
++ packages = [ "vulkan" ]
++ }
++}
++source_set("libvulkan") {
++ if (!angle_shared_libvulkan) {
++ public_configs = [ ":system_libvulkan" ]
++ }
++}
+ target(library_type, "xlibvulkan") {
sources = [
"loader/adapters.h",
