Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
f002cf4a by Steve Lhomme at 2026-01-31T06:17:53+00:00
contrib: x265: keep -lpthread in the pkg-config file
- - - - -
2 changed files:
- + contrib/src/x265/0010-CMake-allow-lpthread-in-the-pkg-config-file.patch
- contrib/src/x265/rules.mak
Changes:
=====================================
contrib/src/x265/0010-CMake-allow-lpthread-in-the-pkg-config-file.patch
=====================================
@@ -0,0 +1,31 @@
+From f046444cb59518400902ef0bf89e386623f92f30 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <[email protected]>
+Date: Tue, 27 Jan 2026 15:36:18 +0100
+Subject: [PATCH 10/10] CMake: allow -lpthread in the pkg-config file
+
+If it was used with -lpthread (instead of a -pthread flag for example) it
should be
+in the pkg-config file.
+
+The cleaner way to use threading library should be with CMake's FindThread
[^1] anyway.
+
+[^1]: https://cmake.org/cmake/help/latest/module/FindThreads.html
+---
+ source/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index a6ffcc6fd..7a47a7bef 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -957,7 +957,7 @@ if(X265_LATEST_TAG OR NOT GIT_FOUND)
+ endforeach()
+ if(PLIBLIST)
+ # blacklist of libraries that should not be in Libs.private
+- list(REMOVE_ITEM PLIBLIST "-lc" "-lpthread" "-lmingwex" "-lmingwthrd"
++ list(REMOVE_ITEM PLIBLIST "-lc" "-lmingwex" "-lmingwthrd"
+ "-lmingw32" "-lmoldname" "-lmsvcrt" "-ladvapi32" "-lshell32"
+ "-luser32" "-lkernel32")
+ string(REPLACE ";" " " PRIVATE_LIBS "${PLIBLIST}")
+--
+2.52.0.windows.1
+
=====================================
contrib/src/x265/rules.mak
=====================================
@@ -39,6 +39,7 @@ x265: x265_$(X265_VERSION).tar.gz .sum-x265
$(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
+ $(APPLY)
$(SRC)/x265/0010-CMake-allow-lpthread-in-the-pkg-config-file.patch
$(call pkg_static,"source/x265.pc.in")
$(MOVE)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/f002cf4ac967e13a7804fe041c166be5419362f3
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/f002cf4ac967e13a7804fe041c166be5419362f3
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
