[vlc-commits] [Git][videolan/vlc][master] 7 commits: ci: update images to pull in python3-venv
Steve Lhomme (@robUx4)
gitlab at videolan.org
Thu Nov 3 13:22:52 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
2f401d0e by Niklas Haas at 2022-11-03T12:16:49+00:00
ci: update images to pull in python3-venv
- - - - -
59bcb1e2 by Niklas Haas at 2022-11-03T12:16:49+00:00
contrib: add python virtual env support
Some packages depend on python packages being available at compile time.
This requires the use of a python virtual environment, to make these
dependencies available to the corresponding commands.
This commit adds support for creating a venv via the new .python-venv
target that can be added as a dependency of bundled python packages.
- - - - -
f5fb63d5 by Niklas Haas at 2022-11-03T12:16:49+00:00
contrib: add package markupsafe v2.1.1
Needed for jinja
- - - - -
2d1a106a by Niklas Haas at 2022-11-03T12:16:49+00:00
contrib: add package jinja v3.1.2
Needed for both glad and libplacebo v5
- - - - -
7bdefefc by Niklas Haas at 2022-11-03T12:16:49+00:00
contrib: add package glad v2.0.1
Needed for libplacebo v5.
- - - - -
67dd0e79 by Niklas Haas at 2022-11-03T12:16:49+00:00
contrib: require meson 0.59
Needed to package libplacebo v5.
- - - - -
ba3a7d21 by Niklas Haas at 2022-11-03T12:16:49+00:00
contrib: libplacebo: update to v5.229.1
This unfortunately requires patching libplacebo's meson.build to allow
us to point the internal python3 interpreter towards our virtualenv.
It also requires depending on `vulkan-headers` unconditionally.
- - - - -
17 changed files:
- + contrib/src/glad/SHA512SUMS
- + contrib/src/glad/rules.mak
- + contrib/src/jinja/SHA512SUMS
- + contrib/src/jinja/rules.mak
- − contrib/src/libplacebo/0001-Fix-incompatible-pointer-integer-conversion-errors-o.patch
- + contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch
- − contrib/src/libplacebo/0001-vulkan-blacklist-metal-structs-from-utils_gen.py.patch
- contrib/src/libplacebo/0001-meson-add-the-CLANG-gcc-C-runtime-when-linking-with-.patch → contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch
- − contrib/src/libplacebo/0002-pl_thread-use-gettimeofday-for-back-compat.patch
- contrib/src/libplacebo/SHA512SUMS
- − contrib/src/libplacebo/fix-android-build.patch
- contrib/src/libplacebo/rules.mak
- contrib/src/main.mak
- + contrib/src/markupsafe/SHA512SUMS
- + contrib/src/markupsafe/rules.mak
- extras/ci/gitlab-ci.yml
- extras/tools/bootstrap
Changes:
=====================================
contrib/src/glad/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262 glad-2.0.1.tar.gz
=====================================
contrib/src/glad/rules.mak
=====================================
@@ -0,0 +1,17 @@
+GLAD_VERSION := 2.0.1
+GLAD_URL := $(GITHUB)/Dav1dde/glad/archive/refs/tags/v$(GLAD_VERSION).tar.gz
+
+DEPS_glad = jinja $(DEPS_jinja)
+
+$(TARBALLS)/glad-$(GLAD_VERSION).tar.gz:
+ $(call download_pkg,$(GLAD_URL),glad)
+
+.sum-glad: glad-$(GLAD_VERSION).tar.gz
+
+glad: glad-$(GLAD_VERSION).tar.gz .sum-glad
+ $(UNPACK)
+ $(MOVE)
+
+.glad: glad .python-venv
+ $(PYTHON_INSTALL)
+ touch $@
=====================================
contrib/src/jinja/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+50feebc7eed4c8b5bb0c2951784c1c115e3ee1c0e0c91bbf1884551b1312ef8fce24804a2ca1dfd8c543406529afe4817567c39e7cfd15028b54049853623144 jinja-3.1.2.tar.gz
=====================================
contrib/src/jinja/rules.mak
=====================================
@@ -0,0 +1,17 @@
+JINJA_VERSION := 3.1.2
+JINJA_URL := $(GITHUB)/pallets/jinja/archive/refs/tags/$(JINJA_VERSION).tar.gz
+
+DEPS_jinja = markupsafe $(DEPS_markupsafe)
+
+$(TARBALLS)/jinja-$(JINJA_VERSION).tar.gz:
+ $(call download_pkg,$(JINJA_URL),jinja)
+
+.sum-jinja: jinja-$(JINJA_VERSION).tar.gz
+
+jinja: jinja-$(JINJA_VERSION).tar.gz .sum-jinja
+ $(UNPACK)
+ $(MOVE)
+
+.jinja: jinja .python-venv
+ $(PYTHON_INSTALL)
+ touch $@
=====================================
contrib/src/libplacebo/0001-Fix-incompatible-pointer-integer-conversion-errors-o.patch deleted
=====================================
@@ -1,76 +0,0 @@
-From 1d3ff4d4091a8c91cecdf3f1892ed0d1e1bf01cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Sat, 23 Jul 2022 23:49:37 +0300
-Subject: [PATCH] Fix incompatible pointer/integer conversion errors on 32 bit
-
-Clang 15 made "incompatible pointer to integer conversion" an error
-instead of a plain warning. This fixes errors like these:
-
-../src/vulkan/gpu_pass.c:208:59: error: incompatible integer to pointer conversion passing 'VkPipeline' (aka 'unsigned long long') to parameter of type 'const void *' [-Wint-conversion]
- vk_dev_callback(vk, (vk_cb) destroy_pipeline, vk, *out_pipe);
- ^~~~~~~~~
-../src/vulkan/command.h:36:52: note: passing argument to parameter 'arg' here
- const void *priv, const void *arg);
- ^
-../src/vulkan/gpu_pass.c:209:19: error: incompatible pointer to integer conversion assigning to 'VkPipeline' (aka 'unsigned long long') from 'void *' [-Wint-conversion]
- *out_pipe = NULL;
- ^ ~~~~
----
- src/vulkan/gpu_pass.c | 6 +++---
- src/vulkan/malloc.c | 2 +-
- src/vulkan/swapchain.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/vulkan/gpu_pass.c b/src/vulkan/gpu_pass.c
-index 2fd7819..4b80f94 100644
---- a/src/vulkan/gpu_pass.c
-+++ b/src/vulkan/gpu_pass.c
-@@ -191,8 +191,8 @@ static VkResult vk_recreate_pipelines(struct vk_ctx *vk, pl_pass pass,
- // The old pipeline might still be in use, so we have to destroy it
- // asynchronously with a device idle callback
- if (*out_pipe) {
-- vk_dev_callback(vk, (vk_cb) destroy_pipeline, vk, *out_pipe);
-- *out_pipe = NULL;
-+ vk_dev_callback(vk, (vk_cb) destroy_pipeline, vk, (void*)(uintptr_t)*out_pipe);
-+ *out_pipe = VK_NULL_HANDLE;
- }
-
- VkPipelineCreateFlags flags = 0;
-@@ -612,7 +612,7 @@ no_descriptors: ;
-
- // Create the graphics/compute pipeline
- VkPipeline *pipe = has_spec ? &pass_vk->base : &pass_vk->pipe;
-- VK(vk_recreate_pipelines(vk, pass, has_spec, NULL, pipe));
-+ VK(vk_recreate_pipelines(vk, pass, has_spec, VK_NULL_HANDLE, pipe));
- pl_log_cpu_time(gpu->log, after_compilation, clock(), "creating pipeline");
-
- if (!has_spec) {
-diff --git a/src/vulkan/malloc.c b/src/vulkan/malloc.c
-index 3f5fea8..6981f11 100644
---- a/src/vulkan/malloc.c
-+++ b/src/vulkan/malloc.c
-@@ -864,7 +864,7 @@ static bool vk_malloc_import(struct vk_malloc *ma, struct vk_memslice *out,
- goto error;
- }
-
-- VkDeviceMemory vkmem = NULL;
-+ VkDeviceMemory vkmem = VK_NULL_HANDLE;
- VK(vk->AllocateMemory(vk->dev, &ainfo, PL_VK_ALLOC, &vkmem));
-
- slab = pl_alloc_ptr(NULL, slab);
-diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c
-index 6bdd73b..f294378 100644
---- a/src/vulkan/swapchain.c
-+++ b/src/vulkan/swapchain.c
-@@ -597,7 +597,7 @@ static bool vk_sw_recreate(pl_swapchain sw, int w, int h)
-
- // If needed, allocate some more semaphores
- while (num_images > p->sems.num) {
-- VkSemaphore sem_in = NULL, sem_out = NULL;
-+ VkSemaphore sem_in = VK_NULL_HANDLE, sem_out = VK_NULL_HANDLE;
- static const VkSemaphoreCreateInfo seminfo = {
- .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
- };
---
-2.25.1
-
=====================================
contrib/src/libplacebo/0001-meson-allow-overriding-python3-path.patch
=====================================
@@ -0,0 +1,37 @@
+From 62dc67bd043a9982dafd7e1a4c708ce427489712 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git at haasn.dev>
+Date: Sat, 22 Oct 2022 13:59:37 +0200
+Subject: [PATCH] meson: allow overriding python3 path
+
+We need this to support building inside a virtualenv.
+---
+ meson.build | 2 +-
+ meson_options.txt | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 2ea819b2..c1404ee9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -320,7 +320,7 @@ add_project_link_arguments(link_args, language: 'c')
+ fs = import('fs')
+ libm = cc.find_library('m', required: false)
+ thirdparty = meson.project_source_root()/'3rdparty'
+-python = import('python').find_installation()
++python = import('python').find_installation(get_option('python-path'))
+ python_env = environment()
+ python_env.append('PYTHONPATH', thirdparty/'jinja'/'src')
+ python_env.append('PYTHONPATH', thirdparty/'markupsafe'/'src')
+diff --git a/meson_options.txt b/meson_options.txt
+index ce88b3bf..853d1347 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -44,3 +44,5 @@ option('unwind', type: 'feature', value: 'auto',
+
+ 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')
+--
+2.38.0
+
=====================================
contrib/src/libplacebo/0001-vulkan-blacklist-metal-structs-from-utils_gen.py.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From db794a2fcc8214624c950752b04f6c23f8fc567d Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git at haasn.dev>
-Date: Thu, 9 Jun 2022 21:32:36 +0200
-Subject: [PATCH] vulkan: blacklist metal structs from utils_gen.py
-
-Fixes https://code.videolan.org/videolan/libplacebo/-/issues/201
----
- src/vulkan/utils_gen.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
-index da565d45..7c0dad37 100644
---- a/src/vulkan/utils_gen.py
-+++ b/src/vulkan/utils_gen.py
-@@ -158,7 +158,7 @@ def get_vkstructs(registry):
- # Strings for platform-specific crap we want to blacklist as they will
- # most likely cause build failures
- blacklist_strs = [
-- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
-+ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', 'Metal',
- ]
-
- if any([ str in e.attrib['name'] for str in blacklist_strs ]):
---
-2.36.1
-
=====================================
contrib/src/libplacebo/0001-meson-add-the-CLANG-gcc-C-runtime-when-linking-with-.patch → contrib/src/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch
=====================================
@@ -1,8 +1,7 @@
-From 45b4b27748dd8aa9e2bd63dc5060f92d45fc71a2 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Wed, 7 Sep 2022 14:30:55 +0200
-Subject: [PATCH] meson: add the CLANG/gcc C++ runtime when linking with vulkan
- loader
+From f338dcf654a615839925de33939e538cc92880a9 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git at haasn.dev>
+Date: Sat, 22 Oct 2022 11:36:51 +0200
+Subject: [PATCH] vulkan/meson: add the clang/gcc C++ runtime
The Vulkan loader present on some Linux distro or Android don't export which
C++ they are using. When using libplacebo from C code it's missing in the link
@@ -13,30 +12,31 @@ generate the vulkan loader.
We can't detect the link flags exposed by vulkan with Meson so we assume it's
never set.
+
+Authored-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
- src/meson.build | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ src/vulkan/meson.build | 8 ++++++++
+ 1 file changed, 8 insertions(+)
-diff --git a/src/meson.build b/src/meson.build
-index dd2f1fe..0f238bd 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -48,6 +48,15 @@ if not vulkan_headers.found() and not get_option('vulkan').disabled()
- endif
- endif
+diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
+index fe77f699..915df90b 100644
+--- a/src/vulkan/meson.build
++++ b/src/vulkan/meson.build
+@@ -6,6 +6,14 @@ registry_xml = get_option('vulkan-registry')
+ if vulkan_loader.found()
+ vulkan_headers = vulkan_loader.partial_dependency(includes: true, compile_args: true)
++
+# add the C++ runtime that vulkan needs but may not expose in its pkg-config
-+if vulkan_headers.found()
+ if cxx.get_id() == 'clang'
+ build_deps += cxx.find_library('c++', required: true)
+ elif cxx.get_id() == 'gcc'
+ build_deps += cxx.find_library('stdc++', required: true)
+ endif
-+endif
+
- d3d11 = disabler()
- d3d11_inc = ['d3d11_4.h', 'dxgi1_6.h']
- d3d11_deps = [
+ # Probe for <vulkan/vulkan.h> as a fallback for the vulkan headers
+ elif cc.has_header_symbol('vulkan/vulkan_core.h', 'VK_VERSION_1_2')
+ vulkan_headers = declare_dependency()
--
-2.37.3.windows.1
+2.38.0
=====================================
contrib/src/libplacebo/0002-pl_thread-use-gettimeofday-for-back-compat.patch deleted
=====================================
@@ -1,53 +0,0 @@
-From cce28e17f931c948c37467d9189ed96364691a83 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git at haasn.dev>
-Date: Mon, 4 Jul 2022 16:46:08 +0200
-Subject: [PATCH] pl_thread: use gettimeofday() for back-compat
-
-Some older platforms (particularly macOS) do not support
-clock_gettime(). Fortunately, this is identical to gettimeofday in the
-case of CLOCK_REALTIME.
-
-These systems also do not have pthread_condattr_setclock, so we can
-re-use this check.
-
-Also add proper error handling to this function.
----
- src/pl_thread_pthread.h | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/pl_thread_pthread.h b/src/pl_thread_pthread.h
-index e48f50fd..075a8305 100644
---- a/src/pl_thread_pthread.h
-+++ b/src/pl_thread_pthread.h
-@@ -17,7 +17,9 @@
-
- #pragma once
-
-+#include <errno.h>
- #include <pthread.h>
-+#include <sys/time.h>
- #include <time.h>
-
- typedef pthread_mutex_t pl_mutex;
-@@ -92,10 +94,16 @@ static inline int pl_cond_timedwait(pl_cond *cond, pl_mutex *mutex, uint64_t tim
-
- struct timespec ts;
- #ifdef PTHREAD_HAS_SETCLOCK
-- clock_gettime(CLOCK_MONOTONIC, &ts);
-+ if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
-+ return errno;
- #else
-- clock_gettime(CLOCK_REALTIME, &ts);
-+ struct timeval tv;
-+ if (gettimeofday(&tv, NULL) < 0) // equivalent to CLOCK_REALTIME
-+ return errno;
-+ ts.tv_sec = tv.tv_sec;
-+ ts.tv_nsec = tv.tv_usec * 1000;
- #endif
-+
- ts.tv_sec += timeout / 1000000000LLU;
- ts.tv_nsec += timeout % 1000000000LLU;
-
---
-2.36.1
-
=====================================
contrib/src/libplacebo/SHA512SUMS
=====================================
@@ -1 +1 @@
-780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525 libplacebo-v4.192.1.tar.gz
+45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334 libplacebo-v5.229.1.tar.gz
=====================================
contrib/src/libplacebo/fix-android-build.patch deleted
=====================================
@@ -1,12 +0,0 @@
-diff -Naur libplacebo/src/meson.build libplacebo.new/src/meson.build
---- libplacebo/src/meson.build 2022-02-03 16:30:55.000000000 +0100
-+++ libplacebo.new/src/meson.build 2022-07-22 08:22:49.573761162 +0200
-@@ -69,7 +69,7 @@
- endif
-
- unwind = dependency('libunwind', required: get_option('unwind'))
--has_execinfo = cc.has_header('execinfo.h')
-+has_execinfo = false
- conf_internal.set('PL_HAVE_UNWIND', unwind.found())
- conf_internal.set('PL_HAVE_EXECINFO', has_execinfo)
- if unwind.found()
=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -1,16 +1,17 @@
# libplacebo
-PLACEBO_VERSION := 4.192.1
+PLACEBO_VERSION := 5.229.1
PLACEBO_ARCHIVE = libplacebo-v$(PLACEBO_VERSION).tar.gz
PLACEBO_URL := https://code.videolan.org/videolan/libplacebo/-/archive/v$(PLACEBO_VERSION)/$(PLACEBO_ARCHIVE)
-PLACEBOCONF := -Dglslang=enabled \
+PLACEBOCONF := -Dpython-path=$(PYTHON_VENV)/bin/python3 \
+ -Dvulkan-registry=${PREFIX}/share/vulkan/registry/vk.xml \
+ -Dglslang=enabled \
-Dshaderc=disabled \
-Ddemos=false \
-Dtests=false
-DEPS_libplacebo = glslang $(DEPS_glslang)
-
+DEPS_libplacebo = glad $(DEPS_glad) jinja $(DEPS_jinja) glslang $(DEPS_glslang) vulkan-headers $(DEPS_vulkan-headers)
ifndef HAVE_WINSTORE
PKGS += libplacebo
endif
@@ -25,8 +26,7 @@ endif
# We don't want vulkan on darwin for now
ifndef HAVE_DARWIN_OS
ifndef HAVE_EMSCRIPTEN
-DEPS_libplacebo += vulkan-loader $(DEPS_vulkan-loader) vulkan-headers $(DEPS_vulkan-headers)
-PLACEBOCONF += -Dvulkan-registry=${PREFIX}/share/vulkan/registry/vk.xml
+DEPS_libplacebo += vulkan-loader $(DEPS_vulkan-loader)
endif
endif
@@ -37,16 +37,11 @@ $(TARBALLS)/$(PLACEBO_ARCHIVE):
libplacebo: $(PLACEBO_ARCHIVE) .sum-libplacebo
$(UNPACK)
- $(APPLY) $(SRC)/libplacebo/0001-vulkan-blacklist-metal-structs-from-utils_gen.py.patch
- $(APPLY) $(SRC)/libplacebo/0002-pl_thread-use-gettimeofday-for-back-compat.patch
-ifdef HAVE_ANDROID
- $(APPLY) $(SRC)/libplacebo/fix-android-build.patch
-endif
- $(APPLY) $(SRC)/libplacebo/0001-Fix-incompatible-pointer-integer-conversion-errors-o.patch
- $(APPLY) $(SRC)/libplacebo/0001-meson-add-the-CLANG-gcc-C-runtime-when-linking-with-.patch
+ $(APPLY) $(SRC)/libplacebo/0001-vulkan-meson-add-the-clang-gcc-C-runtime.patch
+ $(APPLY) $(SRC)/libplacebo/0001-meson-allow-overriding-python3-path.patch
$(MOVE)
-.libplacebo: libplacebo crossfile.meson
+.libplacebo: libplacebo crossfile.meson .python-venv
$(MESONCLEAN)
$(HOSTVARS_MESON) $(MESON) $(PLACEBOCONF)
$(MESONBUILD)
=====================================
contrib/src/main.mak
=====================================
@@ -523,6 +523,14 @@ REQUIRE_GNUV3 = \
exit 1
endif
+PYTHON_VENV = $(BUILDPREFIX)/python-venv
+PYTHON_ACTIVATE = . $(PYTHON_VENV)/bin/activate
+PYTHON_INSTALL = $(HOSTVARS) $(PYTHON_VENV)/bin/pip3 install ./$<
+
+.python-venv:
+ python3 -m venv $(PYTHON_VENV)
+ touch $@
+
#
# Rust specific rules
#
@@ -558,6 +566,8 @@ tools: $(PKGS_TOOLS:%=.dep-%)
mostlyclean:
-$(RM) $(foreach p,$(PKGS_ALL),.$(p) .sum-$(p) .dep-$(p))
+ -$(RM) -R "$(PYTHON_VENV)"
+ -$(RM) .python-venv
-$(RM) toolchain.cmake
-$(RM) crossfile.meson
-$(RM) -R "$(PREFIX)"
=====================================
contrib/src/markupsafe/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+6b06a5f470858409eb186d20edd129be90f31030be91fcc73e989b0a4ee51c3755cce0938edd9a7c73471d307385260f868101b5e11cc4d97c309420b5a573da markupsafe-2.1.1.tar.gz
=====================================
contrib/src/markupsafe/rules.mak
=====================================
@@ -0,0 +1,15 @@
+MARKUPSAFE_VERSION := 2.1.1
+MARKUPSAFE_URL := $(GITHUB)/pallets/markupsafe/archive/refs/tags/$(MARKUPSAFE_VERSION).tar.gz
+
+$(TARBALLS)/markupsafe-$(MARKUPSAFE_VERSION).tar.gz:
+ $(call download_pkg,$(MARKUPSAFE_URL),markupsafe)
+
+.sum-markupsafe: markupsafe-$(MARKUPSAFE_VERSION).tar.gz
+
+markupsafe: markupsafe-$(MARKUPSAFE_VERSION).tar.gz .sum-markupsafe
+ $(UNPACK)
+ $(MOVE)
+
+.markupsafe: markupsafe .python-venv
+ $(PYTHON_INSTALL)
+ touch $@
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -19,15 +19,15 @@ default:
- amd64
variables:
- VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20221011221351
- VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20221011230137
- VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20221011232542
- VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20221012005047
- VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20221011215101
- VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20221011220505
- VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20221011214346
- VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20221011212837
- VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20221012104757
+ VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20221023191128
+ VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20221023193231
+ VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20221023173315
+ VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20221023181650
+ VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20221023190059
+ VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20221023172629
+ VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20221023195550
+ VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20221023200157
+ VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20221023190736
.variables-debian: &variables-debian
HOST_ARCH: x86_64
=====================================
extras/tools/bootstrap
=====================================
@@ -128,7 +128,7 @@ check flex
check_nasm 2.14
check gettext
check help2man
-check meson 0.56.0
+check meson 0.59.0
check ninja
DEPS_ONLY="help2man"
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9ebaa186f9de00933ff899dd0f1b0f10f3fd81ec...ba3a7d21168301ac61ce7dd24a536153c25351dc
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9ebaa186f9de00933ff899dd0f1b0f10f3fd81ec...ba3a7d21168301ac61ce7dd24a536153c25351dc
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