[vlc-commits] [Git][videolan/vlc][master] 7 commits: contrib: vulkan-loader: remove bogus pkg_static call
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Apr 8 14:05:51 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
5d491cdb by Steve Lhomme at 2025-04-08T13:27:43+00:00
contrib: vulkan-loader: remove bogus pkg_static call
The build folder is no longer build but vlc_build.
The proper pkg_static call is done during unpaking.
- - - - -
98211b48 by Steve Lhomme at 2025-04-08T13:27:43+00:00
contrib: vulkan-headers/loader: update to 1.3.275
To match the Android NDK27.
- - - - -
9ff424aa by Steve Lhomme at 2025-04-08T13:27:43+00:00
contrib: vulkan-headers: assume the NDK doesn't provide vk.xml on Android
With NDK27 vk.xml is not found anymore.
We can install our own headers instead.
NDK27c comes with Vulkan 1.3.275 headers.
- - - - -
5bdace5f by Steve Lhomme at 2025-04-08T13:27:43+00:00
contrib: libplacebo: remove unneeded Android patch
We assume the Vulkan headers are not found so they are found in contribs.
This reverts b0d6f9ad54792fef90ae14d72ad2f95dd8cb9a25
- - - - -
a43d051a by Steve Lhomme at 2025-04-08T13:27:43+00:00
CI: update the Android docker image with NDK 27c
It can supports 16KB aligned page sizes with a flag in the NDK build package. [^1]
It is not on by default so we can test things without being stuck with this image.
The relevant change will need to be done on the libvlcjni side, including switching to this image as well. This is done in [^2].
[^1]: https://developer.android.com/guide/practices/page-sizes#compile-r27
[^2]: https://code.videolan.org/videolan/libvlcjni/-/merge_requests/112
- - - - -
2b557902 by Steve Lhomme at 2025-04-08T13:27:43+00:00
contrib: vulkan-loader: use the default DLL name
MINGW is properly handled now, but not the 32-bit version.
According to [^1] 32-bit may not work at all.
[^1]: https://github.com/msys2/MINGW-packages/issues/17029
- - - - -
113e5a86 by Steve Lhomme at 2025-04-08T13:27:43+00:00
contrib: vulkan-loader: pass VULKAN_HEADERS_INSTALL_DIR as a CMake variable
- - - - -
11 changed files:
- − contrib/src/libplacebo/0004-vulkan-utils_gen-try-to-locate-the-vulkan-registry-i.patch
- contrib/src/libplacebo/rules.mak
- contrib/src/vulkan-headers/SHA512SUMS
- contrib/src/vulkan-headers/rules.mak
- contrib/src/vulkan-loader/0003-fix-libunwind-usage-when-static-linking.patch
- − contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch
- − contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch
- contrib/src/vulkan-loader/SHA512SUMS
- contrib/src/vulkan-loader/libvulkan-32.def
- contrib/src/vulkan-loader/rules.mak
- extras/ci/gitlab-ci.yml
Changes:
=====================================
contrib/src/libplacebo/0004-vulkan-utils_gen-try-to-locate-the-vulkan-registry-i.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From 5acce05c63c7b0f4a952d1258153da283b95bf8a Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 12 Apr 2024 08:12:45 +0200
-Subject: [PATCH 4/4] vulkan/utils_gen: try to locate the vulkan registry in
- the Android NDK
-
----
- src/vulkan/utils_gen.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
-index 4bbe185b..4fe4a2d6 100644
---- a/src/vulkan/utils_gen.py
-+++ b/src/vulkan/utils_gen.py
-@@ -215,6 +215,7 @@ def find_registry_xml(datadir):
- '$MINGW_PREFIX/share/vulkan/registry/vk.xml',
- '%VULKAN_SDK%/share/vulkan/registry/vk.xml',
- '$VULKAN_SDK/share/vulkan/registry/vk.xml',
-+ '$ANDROID_NDK/sources/third_party/vulkan/src/registry/vk.xml',
- '/usr/share/vulkan/registry/vk.xml',
- ]
-
---
-2.37.3.windows.1
-
=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -40,7 +40,6 @@ libplacebo: $(PLACEBO_ARCHIVE) .sum-libplacebo
$(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-meson-allow-forcing-the-path-to-look-for-libraries.patch
- $(APPLY) $(SRC)/libplacebo/0004-vulkan-utils_gen-try-to-locate-the-vulkan-registry-i.patch
$(MOVE)
.libplacebo: libplacebo crossfile.meson .python-venv
=====================================
contrib/src/vulkan-headers/SHA512SUMS
=====================================
@@ -1 +1 @@
-b6f4459a55a7a0f83a17f9155cf201f4e832bde45a127efbfb0e1e5805fb813249e8ccb00b81285ff26fffed1fe0f33b14cdf41515c2b649204de54284e7bc60 Vulkan-Headers-1.3.219.tar.gz
+adebfc61501e67367d366a8b17833d064f925ada6480641ef3c128bbda3852087e02d67a09e90b2c188a47494b7e47a87db0d039465858e765e89dc6c2b370d7 Vulkan-Headers-1.3.275.tar.gz
=====================================
contrib/src/vulkan-headers/rules.mak
=====================================
@@ -1,4 +1,4 @@
-VULKAN_HEADERS_VERSION := 1.3.219
+VULKAN_HEADERS_VERSION := 1.3.275
VULKAN_HEADERS_URL := $(GITHUB)/KhronosGroup/Vulkan-Headers/archive/v$(VULKAN_HEADERS_VERSION).tar.gz
DEPS_vulkan-headers =
@@ -22,9 +22,11 @@ define VULKAN_HEADERS_CHECK :=
endef
PKGS += vulkan-headers
+ifndef HAVE_ANDROID # in NDK27 vk.xml is not available anymore, we need to install our own
ifneq ($(call cppcheck, VULKAN_HEADERS_OK, $(VULKAN_HEADERS_CHECK)),)
PKGS_FOUND += vulkan-headers
endif
+endif
$(TARBALLS)/Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz:
$(call download_pkg,$(VULKAN_HEADERS_URL),vulkan-headers)
=====================================
contrib/src/vulkan-loader/0003-fix-libunwind-usage-when-static-linking.patch
=====================================
@@ -1,24 +1,25 @@
-From c2b51b82c5dc3e62dc6bc9778261555a2ebdd67d Mon Sep 17 00:00:00 2001
+From ab6edca6a93be813f52108489a4a690e44bb8dab Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4 at ycbcr.xyz>
Date: Thu, 17 Oct 2024 11:56:18 +0200
-Subject: [PATCH 3/3] fix libunwind usage when static linking
+Subject: [PATCH 2/2] fix libunwind usage when static linking
It ends up with
- set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "atomic;m;-l:libunwind.a;dl;c;-l:libunwind.a;dl")
- set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "windowsapp;windowsapp;ucrt;windowsapp;ucrtapp;c++;mingw32;-l:libunwind.a;moldname;mingwex;mingw32;-l:libunwind.a;moldname;mingwex")
---
- loader/CMakeLists.txt | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
+ loader/CMakeLists.txt | 14 ++++++++++++++
+ loader/vulkan.pc.in | 1 +
+ 2 files changed, 15 insertions(+)
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index b29c81a8d..cd5a6a441 100644
+index 3d8aa6c62..14ddcf326 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
-@@ -335,7 +335,18 @@ include(FindPkgConfig QUIET)
- if(PKG_CONFIG_FOUND)
- set(VK_API_VERSION "${LOADER_GENERATED_HEADER_VERSION}")
- foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
-- set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
+@@ -498,6 +498,20 @@ install(FILES "${version_config}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Vulk
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/22621
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
++ foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
+ if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
+ set(PRIVATE_LIBS "${PRIVATE_LIBS} ${LIB}")
+ elseif(${LIB} MATCHES "-l:lib.*.a")
@@ -31,9 +32,20 @@ index b29c81a8d..cd5a6a441 100644
+ else()
+ set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
+ endif()
- endforeach()
- if(MSVC)
- set(VULKAN_LIB_SUFFIX "-1")
++ endforeach()
+ if(WIN32)
+ if(MINGW)
+ set(VULKAN_LIB_SUFFIX "-1.dll")
+diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
+index 6a285f267..ab35414ba 100644
+--- a/loader/vulkan.pc.in
++++ b/loader/vulkan.pc.in
+@@ -7,4 +7,5 @@ Name: Vulkan-Loader
+ Description: Vulkan Loader
+ Version: @VULKAN_LOADER_VERSION@
+ Libs: -L${libdir} -lvulkan at VULKAN_LIB_SUFFIX@
++Libs.private: @PRIVATE_LIBS@
+ Cflags: -I${includedir}
--
2.45.0.windows.1
=====================================
contrib/src/vulkan-loader/002-proper-def-files-for-32bit.patch deleted
=====================================
@@ -1,109 +0,0 @@
-From 56ce783d2cad375cb29f19be43b5dda7061ded3c Mon Sep 17 00:00:00 2001
-From: Alexey Pavlov <alexpux at gmail.com>
-Date: Fri, 8 Nov 2019 07:40:41 +0100
-Subject: [PATCH 1/3] proper def files for 32bit
-
----
- loader/CMakeLists.txt | 15 +++++++++++++--
- loader/vk_loader_platform.h | 8 +++++++-
- loader/vulkan-1.def | 2 +-
- 3 files changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index d1606f549..0552c5bdd 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -127,7 +127,7 @@ set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG}Note that this may be unsafe, as the C co
- set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} the stack frame for certain calls. If the compiler does not do this, then unknown device")
- set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} extensions will suffer from a corrupted stack.")
- if(WIN32)
-- if(MINGW)
-+ if(NOT MINGW)
- find_program(JWASM_FOUND jwasm)
- if (JWASM_FOUND)
- set(CMAKE_ASM_MASM_COMPILER ${JWASM_FOUND})
-@@ -145,7 +145,7 @@ if(WIN32)
- if (USE_MASM)
- enable_language(ASM_MASM)
- endif ()
-- if(CMAKE_ASM_MASM_COMPILER_WORKS OR JWASM_FOUND)
-+ if(MSVC AND CMAKE_ASM_MASM_COMPILER_WORKS OR JWASM_FOUND)
- if(MINGW)
- set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS})
- elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND)
-@@ -161,12 +161,14 @@ if(WIN32)
- target_link_libraries(loader-unknown-chain Vulkan::Headers)
- target_include_directories(loader-unknown-chain PUBLIC $<TARGET_PROPERTY:loader_asm_gen_files,BINARY_DIR>)
- add_dependencies(loader-unknown-chain loader_asm_gen_files)
-+ set_target_properties(loader-unknown-chain PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL")
- else()
- message(WARNING "Could not find working MASM assebler\n${ASM_FAILURE_MSG}")
- add_custom_target(loader_asm_gen_files)
- add_library(loader-unknown-chain OBJECT unknown_ext_chain.c)
- target_link_libraries(loader-unknown-chain loader_specific_options)
- set_target_properties(loader-unknown-chain PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}")
-+ set_target_properties(loader-unknown-chain PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL")
- endif()
- elseif(APPLE)
- # For MacOS, use the C code and force the compiler's tail-call optimization instead of using assembly code.
-@@ -217,6 +219,7 @@ endif()
-
- if(WIN32)
- add_library(loader-opt STATIC ${OPT_LOADER_SRCS})
-+ set_target_properties(loader-opt PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL")
- target_link_libraries(loader-opt PUBLIC loader_specific_options)
- add_dependencies(loader-opt loader_asm_gen_files)
- set_target_properties(loader-opt PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}")
-@@ -237,9 +240,17 @@ if(WIN32)
- # when adding the suffix the import and runtime library names must be consistent
- # mingw: libvulkan-1.dll.a / libvulkan-1.dll
- # msvc: vulkan-1.lib / vulkan-1.dll
-+ if(MSVC)
- set_target_properties(vulkan
- PROPERTIES
- OUTPUT_NAME vulkan-1)
-+ else()
-+ set_target_properties(vulkan
-+ PROPERTIES
-+ LIBRARY_OUTPUT_NAME vulkan
-+ RUNTIME_OUTPUT_NAME vulkan-1
-+ ARCHIVE_OUTPUT_NAME vulkan)
-+ endif()
-
- if(MSVC AND ENABLE_WIN10_ONECORE)
- target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB)
-diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
-index 594a24986..6bbe6798b 100644
---- a/loader/vk_loader_platform.h
-+++ b/loader/vk_loader_platform.h
-@@ -77,7 +77,13 @@
- #include "vk_layer_dispatch_table.h"
- #include "vk_loader_extensions.h"
-
--#if defined(__GNUC__) && __GNUC__ >= 4
-+#if defined(_WIN32)
-+# if defined (VK_BUILDING_DLL)
-+# define LOADER_EXPORT __declspec(dllexport)
-+# else
-+# define LOADER_EXPORT
-+# endif
-+#elif defined(__GNUC__) && __GNUC__ >= 4
- #define LOADER_EXPORT __attribute__((visibility("default")))
- #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
- #define LOADER_EXPORT __attribute__((visibility("default")))
-diff --git a/loader/vulkan-1.def b/loader/vulkan-1.def
-index f1aab7880..0b8a68ff8 100644
---- a/loader/vulkan-1.def
-+++ b/loader/vulkan-1.def
-@@ -22,7 +22,7 @@
- ;
- ;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
--LIBRARY vulkan-1.dll
-+LIBRARY libvulkan-1.dll
- EXPORTS
- vkCreateInstance
- vkDestroyInstance
---
-2.45.0.windows.1
-
=====================================
contrib/src/vulkan-loader/004-disable-suffix-in-static-lib.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From e9e54996189115fd4868cc7be55e2390419e0c57 Mon Sep 17 00:00:00 2001
-From: Biswapriyo Nath <nathbappai at gmail.com>
-Date: Sat, 22 Jan 2022 09:51:26 +0100
-Subject: [PATCH 2/3] disable suffix in static lib
-
----
- loader/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 0552c5bdd..98da79ab8 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -337,7 +337,7 @@ if(PKG_CONFIG_FOUND)
- foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
- set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
- endforeach()
-- if(WIN32)
-+ if(MSVC)
- set(VULKAN_LIB_SUFFIX "-1")
- # Set libdir path as in cmake's FindVulkan.cmake
- # https://github.com/KhronosGroup/Vulkan-Loader/issues/668
---
-2.45.0.windows.1
-
=====================================
contrib/src/vulkan-loader/SHA512SUMS
=====================================
@@ -1 +1 @@
-b4c9716a0cb3d6748f69b91735e43a5fe51599f44c21f9c4d90e69daa05bddcfd354978e53e95d64cb6a6bcca640c48974d61893590ab443b230294d4668f245 Vulkan-Loader-1.3.211.tar.gz
+6345b57c37b9fcb2c1dd10c8184bf4121fbee660adc7b7c58d3f4bf5c07ba08ed006ac4eaecc7ce6e87ed27804b7970b04ee3ec8c841e9f0de81d0bd7fc53327 Vulkan-Loader-1.3.275.tar.gz
=====================================
contrib/src/vulkan-loader/libvulkan-32.def
=====================================
@@ -3,7 +3,7 @@
; Automatic generated by gendef
; written by Kai Tietz 2008
;
-LIBRARY "libvulkan-1.dll"
+LIBRARY "vulkan-1.dll"
EXPORTS
vkAcquireNextImage2KHR at 12
vkAcquireNextImageKHR at 40
@@ -18,17 +18,24 @@ vkBindImageMemory at 28
vkCmdBeginQuery at 20
vkCmdBeginRenderPass2 at 12
vkCmdBeginRenderPass at 12
+vkCmdBeginRendering at 8
vkCmdBindDescriptorSets at 36
vkCmdBindIndexBuffer at 24
vkCmdBindPipeline at 16
+vkCmdBindVertexBuffers2 at 28
vkCmdBindVertexBuffers at 20
+vkCmdBlitImage2 at 8
vkCmdBlitImage at 40
vkCmdClearAttachments at 20
vkCmdClearColorImage at 28
vkCmdClearDepthStencilImage at 28
+vkCmdCopyBuffer2 at 8
vkCmdCopyBuffer at 28
+vkCmdCopyBufferToImage2 at 8
vkCmdCopyBufferToImage at 32
+vkCmdCopyImage2 at 8
vkCmdCopyImage at 36
+vkCmdCopyImageToBuffer2 at 8
vkCmdCopyImageToBuffer at 32
vkCmdCopyQueryPoolResults at 48
vkCmdDispatch at 16
@@ -43,28 +50,49 @@ vkCmdDrawIndirectCount at 44
vkCmdEndQuery at 16
vkCmdEndRenderPass2 at 8
vkCmdEndRenderPass at 4
+vkCmdEndRendering at 4
vkCmdExecuteCommands at 12
vkCmdFillBuffer at 32
vkCmdNextSubpass2 at 12
vkCmdNextSubpass at 8
+vkCmdPipelineBarrier2 at 8
vkCmdPipelineBarrier at 40
vkCmdPushConstants at 28
+vkCmdResetEvent2 at 20
vkCmdResetEvent at 16
vkCmdResetQueryPool at 20
+vkCmdResolveImage2 at 8
vkCmdResolveImage at 36
vkCmdSetBlendConstants at 8
+vkCmdSetCullMode at 8
vkCmdSetDepthBias at 16
+vkCmdSetDepthBiasEnable at 8
vkCmdSetDepthBounds at 12
+vkCmdSetDepthBoundsTestEnable at 8
+vkCmdSetDepthCompareOp at 8
+vkCmdSetDepthTestEnable at 8
+vkCmdSetDepthWriteEnable at 8
vkCmdSetDeviceMask at 8
+vkCmdSetEvent2 at 16
vkCmdSetEvent at 16
+vkCmdSetFrontFace at 8
vkCmdSetLineWidth at 8
+vkCmdSetPrimitiveRestartEnable at 8
+vkCmdSetPrimitiveTopology at 8
+vkCmdSetRasterizerDiscardEnable at 8
vkCmdSetScissor at 16
+vkCmdSetScissorWithCount at 12
vkCmdSetStencilCompareMask at 12
+vkCmdSetStencilOp at 24
vkCmdSetStencilReference at 12
+vkCmdSetStencilTestEnable at 8
vkCmdSetStencilWriteMask at 12
vkCmdSetViewport at 16
+vkCmdSetViewportWithCount at 12
vkCmdUpdateBuffer at 32
+vkCmdWaitEvents2 at 16
vkCmdWaitEvents at 44
+vkCmdWriteTimestamp2 at 24
vkCmdWriteTimestamp at 20
vkCreateBuffer at 16
vkCreateBufferView at 16
@@ -86,6 +114,7 @@ vkCreateImageView at 16
vkCreateInstance at 12
vkCreatePipelineCache at 16
vkCreatePipelineLayout at 16
+vkCreatePrivateDataSlot at 16
vkCreateQueryPool at 16
vkCreateRenderPass2 at 16
vkCreateRenderPass at 16
@@ -112,6 +141,7 @@ vkDestroyInstance at 8
vkDestroyPipeline at 16
vkDestroyPipelineCache at 16
vkDestroyPipelineLayout at 16
+vkDestroyPrivateDataSlot at 16
vkDestroyQueryPool at 16
vkDestroyRenderPass at 16
vkDestroySampler at 16
@@ -138,9 +168,12 @@ vkGetBufferMemoryRequirements2 at 12
vkGetBufferMemoryRequirements at 16
vkGetBufferOpaqueCaptureAddress at 8
vkGetDescriptorSetLayoutSupport at 12
+vkGetDeviceBufferMemoryRequirements at 12
vkGetDeviceGroupPeerMemoryFeatures at 20
vkGetDeviceGroupPresentCapabilitiesKHR at 8
vkGetDeviceGroupSurfacePresentModesKHR at 16
+vkGetDeviceImageMemoryRequirements at 12
+vkGetDeviceImageSparseMemoryRequirements at 16
vkGetDeviceMemoryCommitment at 16
vkGetDeviceMemoryOpaqueCaptureAddress at 8
vkGetDeviceProcAddr at 8
@@ -187,8 +220,10 @@ vkGetPhysicalDeviceSurfaceFormats2KHR at 16
vkGetPhysicalDeviceSurfaceFormatsKHR at 20
vkGetPhysicalDeviceSurfacePresentModesKHR at 20
vkGetPhysicalDeviceSurfaceSupportKHR at 20
+vkGetPhysicalDeviceToolProperties at 12
vkGetPhysicalDeviceWin32PresentationSupportKHR at 8
vkGetPipelineCacheData at 20
+vkGetPrivateData at 28
vkGetQueryPoolResults at 40
vkGetRenderAreaGranularity at 16
vkGetSemaphoreCounterValue at 16
@@ -198,6 +233,7 @@ vkMapMemory at 36
vkMergePipelineCaches at 20
vkQueueBindSparse at 20
vkQueuePresentKHR at 8
+vkQueueSubmit2 at 20
vkQueueSubmit at 20
vkQueueWaitIdle at 4
vkResetCommandBuffer at 8
@@ -207,6 +243,7 @@ vkResetEvent at 12
vkResetFences at 12
vkResetQueryPool at 20
vkSetEvent at 12
+vkSetPrivateData at 32
vkSignalSemaphore at 8
vkTrimCommandPool at 16
vkUnmapMemory at 12
=====================================
contrib/src/vulkan-loader/rules.mak
=====================================
@@ -1,4 +1,4 @@
-VULKAN_LOADER_VERSION := 1.3.211
+VULKAN_LOADER_VERSION := 1.3.275
VULKAN_LOADER_URL := $(GITHUB)/KhronosGroup/Vulkan-Loader/archive/v$(VULKAN_LOADER_VERSION).tar.gz
DEPS_vulkan-loader = vulkan-headers $(DEPS_vulkan-headers)
@@ -43,8 +43,6 @@ vulkan-loader: Vulkan-Loader-$(VULKAN_LOADER_VERSION).tar.gz .sum-vulkan-loader
$(UNPACK)
# Patches are from msys2 package system
# https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-loader
- $(APPLY) $(SRC)/vulkan-loader/002-proper-def-files-for-32bit.patch
- $(APPLY) $(SRC)/vulkan-loader/004-disable-suffix-in-static-lib.patch
$(APPLY) $(SRC)/vulkan-loader/0003-fix-libunwind-usage-when-static-linking.patch
ifeq ($(HOST),i686-w64-mingw32)
cp -v $(SRC)/vulkan-loader/libvulkan-32.def $(UNPACK_DIR)/loader/vulkan-1.def
@@ -53,22 +51,12 @@ endif
$(MOVE)
# Needed for the loader's cmake script to find the registry files
-VULKAN_LOADER_ENV_CONF = \
- VULKAN_HEADERS_INSTALL_DIR="$(PREFIX)"
+VULKAN_LOADER_CONF += \
+ -DVULKAN_HEADERS_INSTALL_DIR:STRING=$(PREFIX)
.vulkan-loader: vulkan-loader toolchain.cmake
$(CMAKECLEAN)
- $(VULKAN_LOADER_ENV_CONF) $(HOSTVARS_CMAKE) $(CMAKE) $(VULKAN_LOADER_CONF)
- +$(CMAKEBUILD)
-
-ifdef HAVE_WIN32
-# CMake will generate a .pc file with -lvulkan even if the static library
-# generated is libvulkan.dll.a. It also forget to link with libcfgmgr32.
- sed -i.orig -e "s,-lvulkan,-lvulkan.dll -lcfgmgr32," $(BUILD_DIR)/loader/vulkan.pc
-else
- $(call pkg_static,"build/loader/vulkan.pc")
-endif
-
+ $(HOSTVARS_CMAKE) $(CMAKE) $(VULKAN_LOADER_CONF)
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -24,7 +24,7 @@ variables:
VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20241118101328
VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20241118101328
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20241112155431
- VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20241118101328
+ VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20250403202200
VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20231013031754
VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20240806085528
VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20250207201514
@@ -617,7 +617,7 @@ xros-arm64:
name: $VLC_ANDROID_IMAGE
script: |
git clone https://code.videolan.org/videolan/libvlcjni.git
- (cd libvlcjni && git checkout 11413ec511ef618e26b0934e71eed7da110685fe)
+ (cd libvlcjni && git checkout 5e2b2af821d14738bc470414a8d0c72d9955d168)
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
CONTRIB_FLAGS="--with-prebuilt-contribs"
elif [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" -a "${CI_PROJECT_PATH}" = "videolan/vlc" ]; then
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ce05385ec3d1e573a647a08e3a5703d5158f2f2d...113e5a86b8801cb5cde1616d4f4da2eb14cbc1a8
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ce05385ec3d1e573a647a08e3a5703d5158f2f2d...113e5a86b8801cb5cde1616d4f4da2eb14cbc1a8
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