[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: glad: update to 2.0.4
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Fri May 5 09:38:09 UTC 2023
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
79848fa1 by Steve Lhomme at 2023-05-05T08:58:19+00:00
contrib: glad: update to 2.0.4
- - - - -
f9b7d8aa by Steve Lhomme at 2023-05-05T08:58:19+00:00
contrib: libplacebo: update to 5.264.1
We need to force the path to find SPIRV otherwise find_library() doesn't
find it even though it's in the contrib (from glslang). find_library()
doesn't use the `libdir` we pass when configuring the code. It seems more
designed to find system libraries. But it's possible to add custom pathes
to find more libraries. This is what the added patch does.
- - - - -
6 changed files:
- contrib/src/glad/SHA512SUMS
- contrib/src/glad/rules.mak
- + contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch
- − contrib/src/libplacebo/0001-vulkan-add-missing-array-termination.patch
- contrib/src/libplacebo/SHA512SUMS
- contrib/src/libplacebo/rules.mak
Changes:
=====================================
contrib/src/glad/SHA512SUMS
=====================================
@@ -1 +1 @@
-c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262 glad-2.0.1.tar.gz
+328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7 glad-2.0.4.tar.gz
=====================================
contrib/src/glad/rules.mak
=====================================
@@ -1,4 +1,4 @@
-GLAD_VERSION := 2.0.1
+GLAD_VERSION := 2.0.4
GLAD_URL := $(GITHUB)/Dav1dde/glad/archive/refs/tags/v$(GLAD_VERSION).tar.gz
DEPS_glad = jinja $(DEPS_jinja)
=====================================
contrib/src/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch
=====================================
@@ -0,0 +1,60 @@
+From 934dafd8f16e8c4b2b8421ceace74c5ea364f781 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Wed, 26 Apr 2023 11:55:59 +0200
+Subject: [PATCH] meson: allow forcing the path to look for libraries
+
+compiler.find_library() doesn't use c/cpp_lib_args when looking for libraries.
+
+The way to pass customized path to look for libraries not found in the system
+is to give the path(es) manually to compiler.find_library().
+---
+ meson_options.txt | 2 ++
+ src/glsl/meson.build | 14 +++++++-------
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 5b8113ae..6c38ceea 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -52,3 +52,5 @@ option('debug-abort', type: 'boolean', value: false,
+ description: 'abort() on most runtime errors (only for debugging purposes)')
+
+ option('python-path', type: 'string', description: 'Path to python3 executable')
++
++option('find_lib_path', type: 'string', description: 'Path to libraries')
+diff --git a/src/glsl/meson.build b/src/glsl/meson.build
+index 5cebfb89..5e3ef2d5 100644
+--- a/src/glsl/meson.build
++++ b/src/glsl/meson.build
+@@ -31,7 +31,7 @@ elif not glslang_req.disabled()
+ static = arg[0]
+ required = arg[1]
+
+- spirv = cxx.find_library('SPIRV', required: required, static: static)
++ spirv = cxx.find_library('SPIRV', required: required, static: static, dirs: [get_option('find_lib_path')])
+
+ if not spirv.found()
+ continue
+@@ -42,13 +42,13 @@ elif not glslang_req.disabled()
+ if static
+ glslang_deps += [
+ # Always required for static linking
+- cxx.find_library('MachineIndependent', required: true, static: true),
+- cxx.find_library('OSDependent', required: true, static: true),
+- cxx.find_library('OGLCompiler', required: true, static: true),
+- cxx.find_library('GenericCodeGen', required: true, static: true),
++ cxx.find_library('MachineIndependent', required: true, static: true, dirs: [get_option('find_lib_path')]),
++ cxx.find_library('OSDependent', required: true, static: true, dirs: [get_option('find_lib_path')]),
++ cxx.find_library('OGLCompiler', required: true, static: true, dirs: [get_option('find_lib_path')]),
++ cxx.find_library('GenericCodeGen', required: true, static: true, dirs: [get_option('find_lib_path')]),
+ # SPIRV-Tools are required only if optimizer is enabled in glslang build
+- cxx.find_library('SPIRV-Tools', required: false, static: true),
+- cxx.find_library('SPIRV-Tools-opt', required: false, static: true),
++ cxx.find_library('SPIRV-Tools', required: false, static: true, dirs: [get_option('find_lib_path')]),
++ cxx.find_library('SPIRV-Tools-opt', required: false, static: true, dirs: [get_option('find_lib_path')]),
+ ]
+ endif
+
+--
+2.37.3.windows.1
+
=====================================
contrib/src/libplacebo/0001-vulkan-add-missing-array-termination.patch deleted
=====================================
@@ -1,24 +0,0 @@
-From d551a3c42bb3799e88e778ea7f3d0402a46efbff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93 at gmail.com>
-Date: Thu, 19 Jan 2023 21:15:16 +0100
-Subject: [PATCH] vulkan: add missing array termination
-
----
- src/vulkan/context.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/vulkan/context.c b/src/vulkan/context.c
-index 9fa80c2f..d93283e0 100644
---- a/src/vulkan/context.c
-+++ b/src/vulkan/context.c
-@@ -195,6 +195,7 @@ static const struct vk_ext vk_device_extensions[] = {
- .name = VK_EXT_FULL_SCREEN_EXCLUSIVE_EXTENSION_NAME,
- .funs = (struct vk_fun[]) {
- PL_VK_DEV_FUN(AcquireFullScreenExclusiveModeEXT),
-+ {0}
- },
- #endif
- },
---
-2.37.3.windows.1
-
=====================================
contrib/src/libplacebo/SHA512SUMS
=====================================
@@ -1 +1 @@
-45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334 libplacebo-v5.229.1.tar.gz
+305f43b71f078f4113def43c444df667dfbdd2a6a34d3b457b15da0b3499ca97ec9a8acbd151d58c8e1a593ace3d8aa61067b32556c6bae451efbb217d60a731 libplacebo-v5.264.1.tar.gz
\ No newline at end of file
=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -1,6 +1,6 @@
# libplacebo
-PLACEBO_VERSION := 5.229.1
+PLACEBO_VERSION := 5.264.1
PLACEBO_ARCHIVE = libplacebo-v$(PLACEBO_VERSION).tar.gz
PLACEBO_URL := https://code.videolan.org/videolan/libplacebo/-/archive/v$(PLACEBO_VERSION)/$(PLACEBO_ARCHIVE)
@@ -9,7 +9,8 @@ PLACEBOCONF := -Dpython-path=$(PYTHON_VENV)/bin/python3 \
-Dglslang=enabled \
-Dshaderc=disabled \
-Ddemos=false \
- -Dtests=false
+ -Dtests=false \
+ -Dfind_lib_path=$(PREFIX)/lib
DEPS_libplacebo = glad $(DEPS_glad) jinja $(DEPS_jinja) glslang $(DEPS_glslang) vulkan-headers $(DEPS_vulkan-headers)
ifndef HAVE_WINSTORE
@@ -39,7 +40,7 @@ libplacebo: $(PLACEBO_ARCHIVE) .sum-libplacebo
$(UNPACK)
$(APPLY) $(SRC)/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch
$(APPLY) $(SRC)/libplacebo/0001-meson-allow-overriding-python3-path.patch
- $(APPLY) $(SRC)/libplacebo/0001-vulkan-add-missing-array-termination.patch
+ $(APPLY) $(SRC)/libplacebo/0001-meson-allow-forcing-the-path-to-look-for-libraries.patch
$(MOVE)
.libplacebo: libplacebo crossfile.meson .python-venv
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3b4307c1432bd8c2a58015f9e80fb187fe1bee5b...f9b7d8aa886d726d82f43a6760344762d0dbdb02
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3b4307c1432bd8c2a58015f9e80fb187fe1bee5b...f9b7d8aa886d726d82f43a6760344762d0dbdb02
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list