Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
2dab04db by Steve Lhomme at 2026-01-19T13:11:43+00:00
contrib: x265: verify the SVE/NEON flags can be used
It may be runtime detection but the toolchain also needs to support the calls.
- - - - -
93943387 by Steve Lhomme at 2026-01-19T13:11:43+00:00
contrib: x265: don't force _WIN32_WINNT values
Let the toolchain/environment decide.
- - - - -
3 changed files:
- +
contrib/src/x265/0001-CMake-verify-the-Neon-SVE-compiler-flags-can-be-used.patch
- + contrib/src/x265/0002-CMake-don-t-force-_WIN32_WINNT-values.patch
- contrib/src/x265/rules.mak
Changes:
=====================================
contrib/src/x265/0001-CMake-verify-the-Neon-SVE-compiler-flags-can-be-used.patch
=====================================
@@ -0,0 +1,42 @@
+From 5001bc0a608277eba834541e1fef872bce5ef1f2 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <[email protected]>
+Date: Thu, 15 Jan 2026 16:12:02 +0100
+Subject: [PATCH 1/2] CMake: verify the Neon/SVE compiler flags can be used
+
+Otherwise we can't compile the matching files.
+---
+ source/CMakeLists.txt | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index b83955e9c..a14a7277d 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -289,12 +289,20 @@ if(GCC)
+ message(STATUS "Configuring build for run-time CPU feature
detection")
+ endif()
+
++ include(CheckCCompilerFlag)
++ include(CMakePushCheckState)
+ if(AARCH64_RUNTIME_CPU_DETECT OR CROSS_COMPILE_ARM64)
++ cmake_push_check_state(RESET)
++
+ # Add all extensions when compiling for run-time CPU feature
detection or cross compiling.
+- set(CPU_HAS_NEON_DOTPROD 1)
+- set(CPU_HAS_NEON_I8MM 1)
+- set(CPU_HAS_SVE 1)
+- set(CPU_HAS_SVE2 1)
++ check_c_compiler_flag(${AARCH64_NEON_DOTPROD_FLAG}
CPU_HAS_NEON_DOTPROD)
++ cmake_pop_check_state()
++ check_c_compiler_flag(${AARCH64_NEON_I8MM_FLAG} CPU_HAS_NEON_I8MM)
++ cmake_pop_check_state()
++ check_c_compiler_flag(${AARCH64_SVE_FLAG} CPU_HAS_SVE)
++ cmake_pop_check_state()
++ check_c_compiler_flag(${AARCH64_SVE2_FLAG} CPU_HAS_SVE2)
++ cmake_pop_check_state()
+ else()
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
+ find_package(NEON_DOTPROD)
+--
+2.52.0.windows.1
+
=====================================
contrib/src/x265/0002-CMake-don-t-force-_WIN32_WINNT-values.patch
=====================================
@@ -0,0 +1,42 @@
+From bd0dd2ba4a6494e27e00633494cea50defffcca0 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <[email protected]>
+Date: Fri, 16 Jan 2026 13:19:05 +0100
+Subject: [PATCH 2/2] CMake: don't force _WIN32_WINNT values
+
+Let the toolchain/environment decide.
+---
+ source/CMakeLists.txt | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index a14a7277d..c42abece8 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -639,15 +639,15 @@ if(WIN32)
+ list(APPEND PLATFORM_LIBS ${VLD_LIBRARIES})
+ link_directories(${VLD_LIBRARY_DIRS})
+ endif()
+- option(WINXP_SUPPORT "Make binaries compatible with Windows XP and Vista"
OFF)
+- if(WINXP_SUPPORT)
+- # force use of workarounds for CONDITION_VARIABLE and atomic
+- # intrinsics introduced after XP
+- add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WINXP
-D_WIN32_WINNT_WIN7=0x0601)
+- else(WINXP_SUPPORT)
+- # default to targeting Windows 7 for the NUMA APIs
+- add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WIN7)
+- endif(WINXP_SUPPORT)
++ # option(WINXP_SUPPORT "Make binaries compatible with Windows XP and
Vista" OFF)
++ # if(WINXP_SUPPORT)
++ # # force use of workarounds for CONDITION_VARIABLE and atomic
++ # # intrinsics introduced after XP
++ # add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WINXP
-D_WIN32_WINNT_WIN7=0x0601)
++ # else(WINXP_SUPPORT)
++ # # default to targeting Windows 7 for the NUMA APIs
++ # add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WIN7)
++ # endif(WINXP_SUPPORT)
+ endif()
+
+ if(POWER)
+--
+2.52.0.windows.1
+
=====================================
contrib/src/x265/rules.mak
=====================================
@@ -37,6 +37,8 @@ x265: x265_$(X265_VERSION).tar.gz .sum-x265
$(APPLY)
$(SRC)/x265/0001-use-OpenFileMappingW-instead-of-OpenFileMappingA.patch
$(APPLY)
$(SRC)/x265/0001-threadpool-disable-group-affinity-in-UWP-builds.patch
$(APPLY)
$(SRC)/x265/0001-Fix-libunwind-static-linking-on-Android-toolchains.patch
+ $(APPLY)
$(SRC)/x265/0001-CMake-verify-the-Neon-SVE-compiler-flags-can-be-used.patch
+ $(APPLY) $(SRC)/x265/0002-CMake-don-t-force-_WIN32_WINNT-values.patch
$(call pkg_static,"source/x265.pc.in")
$(MOVE)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/387d77174d4f8964631490bb5c78e37608d813e2...93943387be6181032636f606ae570646a9a0ad96
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/387d77174d4f8964631490bb5c78e37608d813e2...93943387be6181032636f606ae570646a9a0ad96
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
