[vlc-commits] [Git][videolan/vlc][3.0.x] 30 commits: CI: update Windows update to get CMake 3.18
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Apr 14 14:40:11 UTC 2026
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
8b253360 by Steve Lhomme at 2026-04-14T13:28:55+00:00
CI: update Windows update to get CMake 3.18
- - - - -
9eb5a29e by Steve Lhomme at 2026-04-14T13:28:55+00:00
tools: raise the minimum CMake version to 3.18
It's needed by newer libxml2.
Debian bullseye already has 3.18.
(cherry picked from commit 2462969117fe8c16db93b5c29aaac032e63096e2) (edited)
edited:
- VLC 3 already has the defines for minimum versions
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
1660a724 by Steve Lhomme at 2026-04-14T13:28:55+00:00
tools: remove unused protobuf patches
Unused since 9a2ad05794ee94fec2bbb71cfe931b0c6412d237
- - - - -
8e8dfd9c by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libarchive: don't use VirtualAlloc in older UWP
- - - - -
63c64ae6 by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: zlib: remove stray code
This should have been removed with the backport of 0c0ab8186a6ff5a6b1cff7c528fe01f822abd6ce.
- - - - -
7937390e by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: zlib: update to 1.3.2
Version 1.3.2 has these key changes:
- Address the findings of the just-completed 7ASecurity audit
- Completely rewrite the cmake support (thanks to @Vollstrecker)
- Support non-blocking devices with the gz* functions
- Many other enhancements, fixes, and portability improvements
https://github.com/madler/zlib/releases/tag/v1.3.2
(cherry picked from commit 4d18efb4306f0947537516bb2a54ad048cc16742)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
c7122b4a by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: amf: fix installation location
The source folder is amf/AMF and should be installed in prefix/include not prefix/include/AMF.
Otherwise it's not detected properly by the toolchain.
(cherry picked from commit 3d6ecc0ce9cd4176152225a65318152474b12137)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
950993cf by Tristan Matthews at 2026-04-14T13:28:55+00:00
contrib: amf: update to 1.4.36
N.B. The tarball structure as changed, the top-level directory is now
amf-headers-v1.4.36 (rather than AMF).
Since all of robux's patches have been upstreamed we can now drop them.
(cherry picked from commit 7261d04e5cc82ebdb3b38f6cf86eb0b7f3568962)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
52ad0d6e by Tristan Matthews at 2026-04-14T13:28:55+00:00
contrib: amf: update checksum
It seems like a new release tarball was pushed with the same version.
(cherry picked from commit 311302fec64e29a48952df6b8ef0c0dab00a5fb5)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
60147f12 by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: amf: update to 1.5.0
(cherry picked from commit 5aa9a31b69db206186495c9cd1837b563cbeef0b)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
d17da0eb by Tristan Matthews at 2026-04-14T13:28:55+00:00
contrib: opus: update to 1.5.1
See:
https://opus-codec.org/demo/opus-1.5/
(cherry picked from commit d060882171620c4cd80a6029aefcc8bcc0e6e3d0)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
d04e3bf6 by Martin Storsjö at 2026-04-14T13:28:55+00:00
contrib: opus: Simplify a condition for Windows on aarch64
While the CI configuration where this is encountered is LLVM specific
(because there is no upstream GCC that targets Windows on aarch64),
the issue that Opus lacks a RTCD implementation for Windows on
AArch64; this is not toolchain specific. Thus remove the unnecessary
HAVE_CLANG condition.
Also simplify the naming of the OS/arch combination (even if the
old naming presumably was chosen to match the CI configuration).
(cherry picked from commit c7c463525c9d4f91c4ab48471a3d8d0710ec6096)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
e8237d20 by Martin Storsjö at 2026-04-14T13:28:55+00:00
contrib: opus: Disable RTCD for Windows armv7
Similarly to aarch64 Windows, Opus lacks an implementation of the
runtime cpu detection for armv7 Windows as well.
(cherry picked from commit f2fca0cba80d187130b408d6b65928671fb1046e)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
b7cde961 by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: opus: switch back to autotools
meson lacks the proper SSE2 detection _mm256_set_m128i() can fail.
It's only checked properly in autotools [^1].
[^1]: https://gitlab.xiph.org/xiph/opus/-/blob/788cc89ce4f2c42025d8c70ec1b4457dc89cd50f/configure.ac#L720
- - - - -
9266cefc by Tristan Matthews at 2026-04-14T13:28:55+00:00
contrib: opus: update to 1.5.2
Opus 1.5.2 fixes several build issues that were discovered since the 1.5 release.
It also fixes a misalignment issue in the AVX2 code that could cause crashes under Windows.
(cherry picked from commit 4e67f8341b169ccdfbcfd682067590af24fb0079)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
d88829e5 by Tristan Matthews at 2026-04-14T13:28:55+00:00
contrib: update to opus 1.6
> Opus 1.6 builds on the new ML-based features introduced in Opus 1.5. You can read all the details in this release demo page. In summary, major changes since 1.5 include:
>
> - A new wideband-to-fullband bandwidth extension (BWE) module
> - Support for 96 kHz audio with Opus HD
> - Significant improvement to Deep Redundancy (DRED)
> - A new 24-bit encoder/decoder API
> - Fixed-point improvements
>
> In addition to the improvements above, this release includes many minor bug fixes.
(cherry picked from commit 449f37a5007281b8953660b4bf862c18fc4b3901)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
762e118d by Tristan Matthews at 2026-04-14T13:28:55+00:00
contrib: update to opus 1.6.1
"Opus 1.6.1 fixes several minor issues that were discovered since the 1.6 release."
(cherry picked from commit 16acbfc3b155e18143f87aca33f203759f939f9f)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
e68e9275 by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libxml2: no need for UWP patching anymore
It builds and links fine without this.
(cherry picked from commit ed8fc87a677f205d30a513965f3e3967b9672d81)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
a4289e62 by Johannes Kauffmann at 2026-04-14T13:28:55+00:00
contrib: libxml2: update to 2.11.4
(cherry picked from commit 6c0b2d57f0bb688f0bacf350ed8f0fe24c88b444)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
3fec8586 by Johannes Kauffmann at 2026-04-14T13:28:55+00:00
contrib: libxml2: remove DOCB option
Since libxml2 2.10.0, this option has been removed.
(cherry picked from commit 1ff1f35f384e0e990fd9c9378aac454f6723e965)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
abc4c7a9 by Johannes Kauffmann at 2026-04-14T13:28:55+00:00
contrib: libxml2: remove patch for .pc file
The uninitialized variable is ${pcfiledir}, which is actually a special
variable supported by pkg-config, and is meant to make the .pc files
relocatable (1). While this variable is (mostly) meant for Windows,
where no true system-wide installation exists (2), it also works fine
under Linux. So don't patch it away.
1. https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/d97db4fae4c1cd099b506970b285dc2afd818ea2/pkg-config.1#L400
2. https://bugs.freedesktop.org/show_bug.cgi?id=62018
(cherry picked from commit 579a6ce3596f1c3458e25280546e55ffaa9847ba)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
0f9af30b by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libxml2: update to 2.15.1
Some options are gone. Some options are off by default.
And we don't need the debug API.
(cherry picked from commit b74efdfbd04aca7bbac0983f5b4a78c7e5f1be92)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
d875231b by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libxml2: fix UWP build
- bcrypt was not used due to improper use of WIN32_LEAN_AND_MEAN and _WIN32_WINNT
- some new desctructor API cannot be used, but we don't need the cleanup on exit
(cherry picked from commit 31afa4e2082be62e13e6fe596c7e9608edd72ca0)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
6cb9ddc1 by Marvin Scholz at 2026-04-14T13:28:55+00:00
contrib: png: update to 1.6.53
This fixes several CVEs in libpng:
- CVE-2025-66293
- CVE-2025-64505
- CVE-2025-64506
- CVE-2025-64720
- CVE-2025-65018
However most of these are for the simple API which we do not seem to
use in VLC.
(cherry picked from commit 2bd165ef04713a5828d384530b7c976ecd69ef7b)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
4a107e9d by Marvin Scholz at 2026-04-14T13:28:55+00:00
contrib: png: disable building Framework on Darwin
(cherry picked from commit 5ed7ed2078266ad856b1b365e59b6a31bf336a50)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
7251d028 by Marvin Scholz at 2026-04-14T13:28:55+00:00
contrib: png: remove ASM flags
The ASM language was removed in the CMake file in
https://github.com/pnggroup/libpng/commit/ff615fdcaf393ec2402bfafebadaa30b32fe5f3a
so setting this does nothing.
(cherry picked from commit e9ea9fd496f0cf77a6943304c2c4f35cb3840b10)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
ba879c11 by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libarchive: update to 3.8.2
Fixes some security issues and bugs [^1].
[^1]: https://github.com/libarchive/libarchive/releases/tag/v3.8.2
(cherry picked from commit 43da4df125d484066576ffcfecd9ba1a8b15c3ff) (edited)
edited:
- VLC 4 didn't have the d3872a83841dd3b452c03b03a151030a7816ddc5 cherry-pick
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
8158a857 by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libarchive: update to 3.8.3
Fixes some security issues and bugs [^1].
[^1]: https://github.com/libarchive/libarchive/releases/tag/v3.8.3
(cherry picked from commit 95d89e739a4d514f455cef4d77d644361007bd81)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
65f30a6e by Steve Lhomme at 2026-04-14T13:28:55+00:00
contrib: libarchive: update to 3.8.5
Fixes some regressions and bugs [^1][^2].
[^1]: https://github.com/libarchive/libarchive/releases/tag/v3.8.5
[^2]: https://github.com/libarchive/libarchive/releases/tag/v3.8.4
(cherry picked from commit 47e7822c0aa451f2b2d3959b76db802b7549150b) (rebased)
rebased:
- VLC 3 has some extra options for macOS 10.7
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
2ea29014 by Steve Lhomme at 2026-04-14T13:28:55+00:00
NEWS: update with updated contribs
- - - - -
28 changed files:
- NEWS
- − contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch
- − contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch
- − contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch
- contrib/src/amf/SHA512SUMS
- contrib/src/amf/rules.mak
- − contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch
- + contrib/src/libarchive/0003-Use-VirtualAllocFromApp-for-old-UWP-targets.patch
- − contrib/src/libarchive/38ac49553d430f1b28c7624e5e9788125fdad187.patch
- contrib/src/libarchive/SHA512SUMS
- contrib/src/libarchive/rules.mak
- + contrib/src/libxml2/0001-threads-don-t-force-_WIN32_WINNT-to-Vista-if-it-s-se.patch
- + contrib/src/libxml2/0002-globals-don-t-use-destructor-in-UWP-builds.patch
- contrib/src/libxml2/SHA512SUMS
- − contrib/src/libxml2/nogetcwd.patch
- contrib/src/libxml2/rules.mak
- − contrib/src/opus/0001-meson-arm64.patch
- contrib/src/opus/SHA512SUMS
- contrib/src/opus/rules.mak
- contrib/src/png/SHA512SUMS
- contrib/src/png/rules.mak
- contrib/src/zlib/0001-CMakeList.txt-force-static-library-name-to-z.patch
- contrib/src/zlib/SHA512SUMS
- contrib/src/zlib/rules.mak
- extras/ci/gitlab-ci.yml
- extras/tools/bootstrap
- − extras/tools/protobuf-fix-build.patch
- − extras/tools/protobuf-include-algorithm.patch
Changes:
=====================================
NEWS
=====================================
@@ -5,6 +5,14 @@ Codecs:
* Use FFmpeg 8.1 (upgraded from 4.4)
* Support OpenAPV decoder (FFmpeg 8 and OpenAPV)
+Contrib:
+ * Update libarchive to 3.8.5
+ * Update amf to 1.5.0
+ * Update dav1d to 1.5.3
+ * Update FFmpeg to 8.1
+ * Update libxml2 to 2.15.1
+ * Update opus to 1.6.1
+ * Update zlib to 1.3.2
Changes between 3.0.22 and 3.0.23:
----------------------------------
=====================================
contrib/src/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch deleted
=====================================
@@ -1,38 +0,0 @@
-From 56828b95fc427e8475d0a03ac016fa7edcc0dfc8 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 07:43:32 +0100
-Subject: [PATCH 1/3] Move AMF_UNICODE into Platform.h
-
-It's a common macro that can be used in other places.
----
- core/Platform.h | 14 ++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 35cbc9a..2ced091 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -66,6 +66,20 @@
-
- #define AMF_TODO(_todo) (__FILE__ "(" AMF_MACRO_STRING(__LINE__) "): TODO: "_todo)
-
-+/**
-+*******************************************************************************
-+* AMF_UNICODE
-+*
-+* @brief
-+* Macro to convert string constant into wide char string constant
-+*
-+* Auxilary AMF_UNICODE_ macro is needed as otherwise it is not possible to use AMF_UNICODE(__FILE__)
-+* Microsoft macro _T also uses 2 passes to accomplish that
-+*******************************************************************************
-+*/
-+#define AMF_UNICODE(s) AMF_UNICODE_(s)
-+#define AMF_UNICODE_(s) L ## s
-+
-
- #if defined(__GNUC__) || defined(__clang__)
- #define AMF_ALIGN(n) __attribute__((aligned(n)))
---
-2.45.0.windows.1
-
=====================================
contrib/src/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch deleted
=====================================
@@ -1,63 +0,0 @@
-From a2c7dbd97a22febdb19b8a82cfea4fda7af0d4b6 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 07:45:25 +0100
-Subject: [PATCH 2/3] Define LPRI(d|ud|x)64 as Unicode (wide) versions of
- AMFPRI(d|ud|x)64
-
-It's always true for all platforms.
----
- core/Platform.h | 27 ++++-----------------------
- 1 file changed, 4 insertions(+), 23 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 2ced091..12541f3 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -124,13 +110,10 @@ typedef signed int HRESULT;
- #endif
-
- #define AMFPRId64 "I64d"
-- #define LPRId64 L"I64d"
-
- #define AMFPRIud64 "Iu64d"
-- #define LPRIud64 L"Iu64d"
-
- #define AMFPRIx64 "I64x"
-- #define LPRIx64 L"I64x"
-
- #else // !WIN32 - Linux and Mac
-
-@@ -147,26 +130,24 @@ typedef signed int HRESULT;
-
- #if defined(__x86_64__) || defined(__aarch64__)
- #define AMFPRId64 "ld"
-- #define LPRId64 L"ld"
-
- #define AMFPRIud64 "uld"
-- #define LPRIud64 L"uld"
-
- #define AMFPRIx64 "lx"
-- #define LPRIx64 L"lx"
- #else
- #define AMFPRId64 "lld"
-- #define LPRId64 L"lld"
-
- #define AMFPRIud64 "ulld"
-- #define LPRIud64 L"ulld"
-
- #define AMFPRIx64 "llx"
-- #define LPRIx64 L"llx"
- #endif
-
- #endif // WIN32
-
-+#define LPRId64 AMF_UNICODE(AMFPRId64)
-+#define LPRIud64 AMF_UNICODE(AMFPRIud64)
-+#define LPRIx64 AMF_UNICODE(AMFPRIx64)
-+
-
- #if defined(_WIN32)
- #define AMF_WEAK __declspec( selectany )
---
-2.45.0.windows.1
-
=====================================
contrib/src/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch deleted
=====================================
@@ -1,73 +0,0 @@
-From 3ecced3ba3ad710b6f86104a648f2c1b6dbb86fa Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolabs.io>
-Date: Fri, 16 Feb 2024 07:50:03 +0100
-Subject: [PATCH 3/3] Define AMFPRI(d|ud|x)64 using the standard C++ format for
- C+11 and up
-
-See https://en.cppreference.com/w/cpp/types/integer
-
-When compiled in C, it depends whether it's the Microsoft flavor or the standard C format. Not
-whether it's Win32 or not. Clang or GCC use the proper string formats on windows.
----
- core/Platform.h | 33 +++++++++++++++---------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/core/Platform.h b/core/Platform.h
-index 12541f3..a1fa96c 100644
---- a/core/Platform.h
-+++ b/core/Platform.h
-@@ -109,12 +109,6 @@ typedef signed int HRESULT;
- #define AMF_FORCEINLINE __forceinline
- #endif
-
-- #define AMFPRId64 "I64d"
--
-- #define AMFPRIud64 "Iu64d"
--
-- #define AMFPRIx64 "I64x"
--
- #else // !WIN32 - Linux and Mac
-
- #define AMF_STD_CALL
-@@ -128,21 +122,28 @@ typedef signed int HRESULT;
- #define AMF_FORCEINLINE __inline__
- #endif
-
-- #if defined(__x86_64__) || defined(__aarch64__)
-- #define AMFPRId64 "ld"
-+#endif // WIN32
-
-- #define AMFPRIud64 "uld"
-+#if defined(__cplusplus) && (__cplusplus >= 201103L)
-+ #include <cinttypes>
-+ #define AMFPRId64 PRId64
-
-- #define AMFPRIx64 "lx"
-- #else
-- #define AMFPRId64 "lld"
-+ #define AMFPRIud64 PRIu64
-
-- #define AMFPRIud64 "ulld"
-+ #define AMFPRIx64 PRIx64
-+#elif defined(_MSC_VER)
-+ #define AMFPRId64 "I64d"
-
-- #define AMFPRIx64 "llx"
-- #endif
-+ #define AMFPRIud64 "Iu64d"
-
--#endif // WIN32
-+ #define AMFPRIx64 "I64x"
-+#elif !defined(AMFPRId64)
-+ #define AMFPRId64 "lld"
-+
-+ #define AMFPRIud64 "ulld"
-+
-+ #define AMFPRIx64 "llx"
-+#endif
-
- #define LPRId64 AMF_UNICODE(AMFPRId64)
- #define LPRIud64 AMF_UNICODE(AMFPRIud64)
---
-2.45.0.windows.1
-
=====================================
contrib/src/amf/SHA512SUMS
=====================================
@@ -1 +1 @@
-2f6e43908260d9f7cb8b28ab8dd34f8f2a1f61c6f2b24d847f277deb264de74d37e60b71e35f6eb079af5c1a16967d0fb780271aee751c18f2013023dcb96f6c AMF-1.4.34.tar.gz
+37d618c846bd2ba77ee282ac152fc5f807631007fca8156fca7e541ad1d1cb23786794aaad1ee3d3eb30b2011c4336bec9011031202c3238d91fe48d1e92f97b AMF-1.5.0.tar.gz
=====================================
contrib/src/amf/rules.mak
=====================================
@@ -1,10 +1,10 @@
# AMF
-AMF_VERSION := 1.4.34
-AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers.tar.gz
+AMF_VERSION := 1.5.0
+AMF_URL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v$(AMF_VERSION)/AMF-headers-v$(AMF_VERSION).tar.gz
AMF_GITURL := $(GITHUB)/GPUOpen-LibrariesAndSDKs/AMF.git
AMF_BRANCH := v$(AMF_VERSION)
-AMF_GITVERSION := 6d7bec0469961e2891c6e1aaa5122b76ed82e1db
+AMF_GITVERSION := 8f5a645e89380549368eec68935b151b238aa17b
ifeq ($(ARCH),x86_64)
ifdef HAVE_WIN32
@@ -39,20 +39,15 @@ $(TARBALLS)/AMF-$(AMF_GITVERSION).tar.xz:
# $(call check_githash,$(AMF_GITVERSION))
# touch "$@"
+amf: UNPACK_DIR=amf-headers-v$(AMF_VERSION)
amf: AMF-$(AMF_VERSION).tar.gz .sum-amf
# amf: AMF-$(AMF_GITVERSION).tar.xz .sum-amf
$(RM) -Rf AMF
$(UNPACK)
- # the tarball is extracted to AMF but it the filesystem is case insenstive
- # we can't move AMF to amf
- mv -f -- AMF AMF-$(AMF_VERSION)
- $(APPLY) $(SRC)/amf/0001-Move-AMF_UNICODE-into-Platform.h.patch
- $(APPLY) $(SRC)/amf/0002-Define-LPRI-d-ud-x-64-as-Unicode-wide-versions-of-AM.patch
- $(APPLY) $(SRC)/amf/0003-Define-AMFPRI-d-ud-x-64-using-the-standard-C-format-.patch
$(MOVE)
.amf: amf
$(RM) -Rf $(PREFIX)/include/AMF
mkdir -p $(PREFIX)/include/AMF
- cp -R $</* $(PREFIX)/include/AMF
+ cp -R $</* $(PREFIX)/include
touch $@
=====================================
contrib/src/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch deleted
=====================================
@@ -1,39 +0,0 @@
-From ac96967e36808cf4fb7a523e37bec66a4888b106 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon, 26 May 2025 10:44:49 +0200
-Subject: [PATCH] [cmake] add uuid library when using xmllite
-
-Consecutive to 16fd043f51d911b106f2a7834ad8f08f65051977
-IID_ISequentialStream is required by the code.
-This GUID is defined in uuid.lib or libuuid.a in mingw-w64. It is required
-to link with that library to get the definition of the GUID. Some toolchains
-add it by default but not all.
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7096b7c0..e938df72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1257,7 +1257,7 @@ ELSE(LIBXML2_FOUND)
- # Check linkage as well; versions of mingw-w64 before v11.0.0
- # do not contain an import library for xmllite.
- cmake_push_check_state()
-- SET(CMAKE_REQUIRED_LIBRARIES "xmllite")
-+ SET(CMAKE_REQUIRED_LIBRARIES "xmllite" "uuid")
- check_c_source_compiles("
- #include <initguid.h>
- #include <xmllite.h>
-@@ -1268,7 +1268,7 @@ ELSE(LIBXML2_FOUND)
- cmake_pop_check_state()
- IF(HAVE_XMLLITE_H)
- SET(XMLLITE_FOUND TRUE)
-- LIST(APPEND ADDITIONAL_LIBS "xmllite")
-+ LIST(APPEND ADDITIONAL_LIBS "xmllite" "uuid")
- ENDIF()
- ENDIF()
- ENDIF(EXPAT_FOUND)
---
-2.45.1.windows.1
-
=====================================
contrib/src/libarchive/0003-Use-VirtualAllocFromApp-for-old-UWP-targets.patch
=====================================
@@ -0,0 +1,28 @@
+From d00fede91911ed2a302ff707ce1259c837d036d7 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Mon, 13 Apr 2026 13:23:32 +0200
+Subject: [PATCH 3/3] Use VirtualAllocFromApp for old UWP targets
+
+---
+ libarchive/archive_read_disk_windows.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
+index 117ca505..f2f5d402 100644
+--- a/libarchive/archive_read_disk_windows.c
++++ b/libarchive/archive_read_disk_windows.c
+@@ -725,7 +725,11 @@ start_next_async_read(struct archive_read_disk *a, struct tree *t)
+ if (olp->buff == NULL) {
+ void *p;
+ size_t s = (size_t)align_num_per_sector(t, READ_BUFFER_SIZE);
++#if defined(WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && NTDDI_VERSION < NTDDI_WIN10_19H1
++ p = VirtualAllocFromApp(NULL, s, MEM_COMMIT, PAGE_READWRITE);
++#else
+ p = VirtualAlloc(NULL, s, MEM_COMMIT, PAGE_READWRITE);
++#endif
+ if (p == NULL) {
+ archive_set_error(&a->archive, ENOMEM,
+ "Couldn't allocate memory");
+--
+2.52.0.windows.1
+
=====================================
contrib/src/libarchive/38ac49553d430f1b28c7624e5e9788125fdad187.patch deleted
=====================================
@@ -1,38 +0,0 @@
-From 38ac49553d430f1b28c7624e5e9788125fdad187 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias at stoeckmann.org>
-Date: Fri, 23 May 2025 18:59:05 +0200
-Subject: [PATCH] Fix archive_wincrypt_version compilation
-
-Cast address of "version" to BYTE pointer for CryptGetProvParam.
-Fix "major" variable assignment for picky compilers like MSVC.
-
-The "length" variable is an in/out variable. It must be set to the size
-of available memory within "version". Right now it is undefined behavior
-and 0 would crash during runtime.
-
-Fixes https://github.com/libarchive/libarchive/issues/2628
-
-Signed-off-by: Tobias Stoeckmann <tobias at stoeckmann.org>
----
- libarchive/archive_version_details.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_version_details.c b/libarchive/archive_version_details.c
-index 186e53e50..0bd566473 100644
---- a/libarchive/archive_version_details.c
-+++ b/libarchive/archive_version_details.c
-@@ -439,11 +439,11 @@ archive_wincrypt_version(void)
- if (!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET))
- return NULL;
- }
-- DWORD length, version;
-- if (!CryptGetProvParam(prov, PP_VERSION, &version, &length, 0)) {
-+ DWORD version, length = sizeof(version);
-+ if (!CryptGetProvParam(prov, PP_VERSION, (BYTE *)&version, &length, 0)) {
- return NULL;
- } else {
-- char major = version >> 8;
-+ char major = (version >> 8) & 0xFF;
- char minor = version & 0xFF;
- static char wincrypt_version[6];
- snprintf(wincrypt_version, 6, "%hhd.%hhd", major, minor);
=====================================
contrib/src/libarchive/SHA512SUMS
=====================================
@@ -1 +1 @@
-e563cd10cd447daf7c5d11c657cbc3d8971add4440264fb4754ea7670a249e8b7b1c31f62f78259867960392623dba73c2d20efc57dc02564c8f55841dc8f2cc libarchive-3.8.0.tar.gz
+b050ca8488143503bdec38ffcab7a5010af61f1b93c1207a3fa006d72d643b84aa8c1ab267e890eb39966ccaedd6e18db8fe5b02f2789bbd1b318a3c4cf138f3 libarchive-3.8.5.tar.xz
=====================================
contrib/src/libarchive/rules.mak
=====================================
@@ -1,6 +1,6 @@
# LIBARCHIVE
-LIBARCHIVE_VERSION := 3.8.0
-LIBARCHIVE_URL := $(GITHUB)/libarchive/libarchive/releases/download/v$(LIBARCHIVE_VERSION)/libarchive-$(LIBARCHIVE_VERSION).tar.gz
+LIBARCHIVE_VERSION := 3.8.5
+LIBARCHIVE_URL := $(GITHUB)/libarchive/libarchive/releases/download/v$(LIBARCHIVE_VERSION)/libarchive-$(LIBARCHIVE_VERSION).tar.xz
PKGS += libarchive
ifeq ($(call need_pkg,"libarchive >= 3.2.0"),)
@@ -32,18 +32,17 @@ ifdef HAVE_MACOSX
LIBARCHIVE_CONF += -DHAVE_FDOPENDIR:INTERNAL= -DHAVE_OPENAT:INTERNAL= -DHAVE_FSTATAT:INTERNAL= -DHAVE_LINKAT:INTERNAL=
endif
-$(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
+$(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.xz:
$(call download_pkg,$(LIBARCHIVE_URL),libarchive)
-.sum-libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz
+.sum-libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz
-libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
+libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive
$(UNPACK)
$(APPLY) $(SRC)/libarchive/0001-zstd-use-GetNativeSystemInfo-to-get-the-number-of-th.patch
- $(APPLY) $(SRC)/libarchive/0001-cmake-add-uuid-library-when-using-xmllite.patch
- $(APPLY) $(SRC)/libarchive/38ac49553d430f1b28c7624e5e9788125fdad187.patch
# don't use CreateHardLinkW on old UWP
$(APPLY) $(SRC)/libarchive/0001-Disable-CreateHardLinkW-usage-on-old-UWP-targets.patch
+ $(APPLY) $(SRC)/libarchive/0003-Use-VirtualAllocFromApp-for-old-UWP-targets.patch
$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
$(MOVE)
=====================================
contrib/src/libxml2/0001-threads-don-t-force-_WIN32_WINNT-to-Vista-if-it-s-se.patch
=====================================
@@ -0,0 +1,43 @@
+From be2080f7a3166ad2ad4a56a5bcd155d3d93fcb56 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Fri, 16 Jan 2026 09:19:01 +0100
+Subject: [PATCH] threads: don't force _WIN32_WINNT to Vista if it's set to a
+ higher value
+
+This will prevent Universal Windows Platform (UWP) targeting Windows 10+ to fail.
+Some UWP API's that are XP/Vista/7 API's are not available in Windows 8 but available in Windows 10.
+So if Windows 10 is targetting we should not pretend to build for Windows Vista (0x0600).
+
+If the user didn't set a _WIN32_WINNT value, the Windows SDK/mingw-w64 have a
+default value that will be used. We can use sdkddkver.h to get that value.
+If the default value is Windows 10 we should not lower it either.
+---
+ include/private/threads.h | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/include/private/threads.h b/include/private/threads.h
+index bb187869..823e325e 100644
+--- a/include/private/threads.h
++++ b/include/private/threads.h
+@@ -7,9 +7,16 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #ifdef _WIN32_WINNT
+- #undef _WIN32_WINNT
++ #if _WIN32_WINNT < 0x0600
++ #undef _WIN32_WINNT
++ #endif
++ #else
++ /* get the default version of the SDK */
++ #include <sdkddkver.h>
++ #endif
++ #ifndef _WIN32_WINNT
++ #define _WIN32_WINNT 0x0600
+ #endif
+- #define _WIN32_WINNT 0x0600
+ #include <windows.h>
+ #define HAVE_WIN32_THREADS
+ #else
+--
+2.52.0.windows.1
+
=====================================
contrib/src/libxml2/0002-globals-don-t-use-destructor-in-UWP-builds.patch
=====================================
@@ -0,0 +1,27 @@
+From 96a8448b7916707ab85279ee5b3529237569d4be Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Thu, 15 Jan 2026 13:36:39 +0100
+Subject: [PATCH 2/2] globals: don't use destructor in UWP builds
+
+RegisterWaitForSingleObject() and UnregisterWait() are not available in UWP builds.
+---
+ globals.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/globals.c b/globals.c
+index 8306f94e..d2467760 100644
+--- a/globals.c
++++ b/globals.c
+@@ -80,7 +80,9 @@ static int lineNumbersDefaultValue = 1;
+
+ #ifdef HAVE_WIN32_THREADS
+ #if defined(LIBXML_STATIC) && !defined(LIBXML_STATIC_FOR_DLL)
++ #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+ #define USE_WAIT_DTOR
++ #endif
+ #else
+ #define USE_DLL_MAIN
+ #endif
+--
+2.52.0.windows.1
+
=====================================
contrib/src/libxml2/SHA512SUMS
=====================================
@@ -1 +1 @@
-d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606 libxml2-2.9.14.tar.xz
+429c7d0dc3cbcb8de1bf6eb588fb8025fee009c9b25e87c96ecc5de57cc12b558b0ab8141f333d73ca687109335f297c9f9776abbb9da9afc9d8e79041c86b7f libxml2-2.15.1.tar.xz
=====================================
contrib/src/libxml2/nogetcwd.patch deleted
=====================================
@@ -1,47 +0,0 @@
---- libxml2/xmlIO.c.orig 2018-03-07 15:31:01.821589739 +0100
-+++ libxml2/xmlIO.c 2018-03-07 15:31:21.717589238 +0100
-@@ -3709,44 +3709,7 @@
- */
- char *
- xmlParserGetDirectory(const char *filename) {
-- char *ret = NULL;
-- char dir[1024];
-- char *cur;
--
--#ifdef _WIN32_WCE /* easy way by now ... wince does not have dirs! */
- return NULL;
--#endif
--
-- if (xmlInputCallbackInitialized == 0)
-- xmlRegisterDefaultInputCallbacks();
--
-- if (filename == NULL) return(NULL);
--
--#if defined(_WIN32) && !defined(__CYGWIN__)
--# define IS_XMLPGD_SEP(ch) ((ch=='/')||(ch=='\\'))
--#else
--# define IS_XMLPGD_SEP(ch) (ch=='/')
--#endif
--
-- strncpy(dir, filename, 1023);
-- dir[1023] = 0;
-- cur = &dir[strlen(dir)];
-- while (cur > dir) {
-- if (IS_XMLPGD_SEP(*cur)) break;
-- cur --;
-- }
-- if (IS_XMLPGD_SEP(*cur)) {
-- if (cur == dir) dir[1] = 0;
-- else *cur = 0;
-- ret = xmlMemStrdup(dir);
-- } else {
-- if (getcwd(dir, 1024) != NULL) {
-- dir[1023] = 0;
-- ret = xmlMemStrdup(dir);
-- }
-- }
-- return(ret);
--#undef IS_XMLPGD_SEP
- }
-
- /****************************************************************
=====================================
contrib/src/libxml2/rules.mak
=====================================
@@ -1,7 +1,7 @@
# libxml2
-LIBXML2_VERSION := 2.9.14
-LIBXML2_URL := https://download.gnome.org/sources/libxml2/2.9/libxml2-$(LIBXML2_VERSION).tar.xz
+LIBXML2_VERSION := 2.15.1
+LIBXML2_URL := https://download.gnome.org/sources/libxml2/2.15/libxml2-$(LIBXML2_VERSION).tar.xz
PKGS += libxml2
ifeq ($(call need_pkg,"libxml-2.0"),)
@@ -24,15 +24,9 @@ LIBXML2_CONF = \
-DLIBXML2_WITH_XPATH=OFF \
-DLIBXML2_WITH_XPTR=OFF \
-DLIBXML2_WITH_MODULES=OFF \
- -DLIBXML2_WITH_LEGACY=OFF \
-DLIBXML2_WITH_ZLIB=OFF \
-DLIBXML2_WITH_ICONV=OFF \
- -DLIBXML2_WITH_HTTP=OFF \
- -DLIBXML2_WITH_FTP=OFF \
- -DLIBXML2_WITH_DOCB=OFF \
-DLIBXML2_WITH_REGEXPS=OFF \
- -DLIBXML2_WITH_PYTHON=OFF \
- -DLIBXML2_WITH_LZMA=OFF \
-DLIBXML2_WITH_TESTS=OFF \
-DLIBXML2_WITH_PROGRAMS=OFF
@@ -42,11 +36,8 @@ endif
libxml2: libxml2-$(LIBXML2_VERSION).tar.xz .sum-libxml2
$(UNPACK)
- # fix pkg-config file using an unset variable
- sed -e 's,"\\\$${pcfiledir}/$${PACKAGE_RELATIVE_PATH}","$${CMAKE_INSTALL_PREFIX}",' -i.orig "$(UNPACK_DIR)/CMakeLists.txt"
-ifdef HAVE_WINSTORE
- $(APPLY) $(SRC)/libxml2/nogetcwd.patch
-endif
+ $(APPLY) $(SRC)/libxml2/0001-threads-don-t-force-_WIN32_WINNT-to-Vista-if-it-s-se.patch
+ $(APPLY) $(SRC)/libxml2/0002-globals-don-t-use-destructor-in-UWP-builds.patch
$(call pkg_static,"libxml-2.0.pc.in")
$(MOVE)
=====================================
contrib/src/opus/0001-meson-arm64.patch deleted
=====================================
@@ -1,36 +0,0 @@
-From 07d1fa08b618585c7c019b7a24a221c8161cbbb5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim at centricular.com>
-Date: Thu, 20 Apr 2023 19:06:13 +0100
-Subject: [PATCH] meson: fix build on arm64
-
-Would fail like:
-
-Checking if "compiler supports ARMv7/AArch64 NEON intrinsics" : links: NO
-Checking if "compiler supports ARMv7/AArch64 NEON intrinsics with -mfpu=neon" : links: YES
-Checking if "compiler supports AArch64 NEON intrinsics" : links: NO
-Checking if "compiler supports AArch64 NEON intrinsics with -mfpu=neon" : links: NO
-Message: Compiler does not support AArch64 NEON intrinsics
-../silk/meson.build:28:45: ERROR: Unknown variable "have_arm_intrinsics_or_asm".
-
-since commit 08088411259056f63774befb2d00951fdd5c46ba.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index ed66d380..9f28de33 100644
---- a/meson.build
-+++ b/meson.build
-@@ -574,8 +574,8 @@ foreach l : lines
- endforeach
-
- subdir('include')
--subdir('silk')
- subdir('celt')
-+subdir('silk')
- subdir('src')
-
- configure_file(output: 'config.h', configuration: opus_conf)
---
-GitLab
-
=====================================
contrib/src/opus/SHA512SUMS
=====================================
@@ -1 +1 @@
-1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631 opus-1.4.tar.gz
+93742e86b2eb222808a5055e62627d142e6e7347b3d5aebb4d39b45df78ed7d437746c51eb24d724a7c865d064e9d16f4541a4ce6a82fcf7dcc23427d2252e16 opus-1.6.1.tar.gz
=====================================
contrib/src/opus/rules.mak
=====================================
@@ -1,6 +1,6 @@
# opus
-OPUS_VERSION := 1.4
+OPUS_VERSION := 1.6.1
OPUS_URL := $(XIPH)/opus/opus-$(OPUS_VERSION).tar.gz
@@ -16,16 +16,25 @@ $(TARBALLS)/opus-$(OPUS_VERSION).tar.gz:
opus: opus-$(OPUS_VERSION).tar.gz .sum-opus
$(UNPACK)
- $(APPLY) $(SRC)/opus/0001-meson-arm64.patch
$(MOVE)
-OPUS_CONF= -D extra-programs=disabled -D tests=disabled -D docs=disabled
+OPUS_CONF= --disable-extra-programs --disable-doc
ifndef HAVE_FPU
-OPUS_CONF += -D fixed-point=true
+OPUS_CONF += --enable-fixed-point
endif
-.opus: opus crossfile.meson
- $(MESONCLEAN)
- $(HOSTVARS_MESON) $(MESON) $(OPUS_CONF)
- +$(MESONBUILD)
+# disable rtcd on aarch64-windows
+ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
+OPUS_CONF += --disable-rtcd
+endif
+# disable rtcd on armv7-windows
+ifeq ($(ARCH)-$(HAVE_WIN32),arm-1)
+OPUS_CONF += --disable-rtcd
+endif
+
+.opus: opus
+ $(MAKEBUILDDIR)
+ $(MAKECONFIGURE) $(OPUS_CONF)
+ +$(MAKEBUILD)
+ +$(MAKEBUILD) install
touch $@
=====================================
contrib/src/png/SHA512SUMS
=====================================
@@ -1 +1 @@
-05adc94ef532bbddaae46e087088a23236e6528fd3fc705c8edfb5ff293983b790d4361d6b20c20df73632a9fbe55d2f394296385cd8efd646f58393ff21257d libpng-1.6.50.tar.xz
+569f81d57dcce7bb874a45fa9f8db2044585245d2eb0c0485a1b03c2e338ecaec6bfda3cb94ad2a34951997414c69fc0373c8c5852d6c313c03e8a946ff345c6 libpng-1.6.53.tar.xz
=====================================
contrib/src/png/rules.mak
=====================================
@@ -1,5 +1,5 @@
# PNG
-PNG_VERSION := 1.6.50
+PNG_VERSION := 1.6.53
PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
PKGS += png
@@ -20,14 +20,7 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
DEPS_png = zlib $(DEPS_zlib)
-PNG_CONF := -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_EXECUTABLES=OFF
-
-ifdef HAVE_CLANG
-ifneq ($(filter arm aarch64, $(ARCH)),)
-# TODO this might be set globally and for all targets where intrinsincs are used
-PNG_CONF += -DCMAKE_ASM_FLAGS="$(CFLAGS)"
-endif
-endif
+PNG_CONF := -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DPNG_FRAMEWORK=OFF
PNG_CONF += -DPNG_DEBUG_POSTFIX:STRING=
=====================================
contrib/src/zlib/0001-CMakeList.txt-force-static-library-name-to-z.patch
=====================================
@@ -1,34 +1,32 @@
-From 32e97d1efafa48d81c3d019d7d5fe7083a812768 Mon Sep 17 00:00:00 2001
+From 2a425593750d2056fb45ee452835cbebb0c060a9 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4 at ycbcr.xyz>
Date: Mon, 12 Feb 2024 20:39:05 +0100
Subject: [PATCH] CMakeList.txt: force static library name to `z`
-They build code in a UNIX like environment but CMake doesn't set UNIX
-for it.
-
-In contribs, we can always enforce this value.
-
-Co-authored-by: Alexandre Janniaux <ajanni at videolabs.io>
+Otherwise it doesn't match the name in the pkg-config file.
---
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15ceebe..c952cde 100644
+index e103c40..438ec64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -167,9 +167,9 @@ if(NOT CYGWIN)
- set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
- endif()
+@@ -149,10 +149,10 @@ set(ZLIB_SRCS
+ uncompr.c
+ zutil.c)
+
+-if(WIN32)
+- set(zlib_static_suffix "s")
+- set(CMAKE_DEBUG_POSTFIX "d")
+-endif(WIN32)
++# if(WIN32)
++# set(zlib_static_suffix "s")
++# set(CMAKE_DEBUG_POSTFIX "d")
++# endif(WIN32)
-+# On unix-like platforms the library is almost always called libz
-+set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
- if(UNIX)
-- # On unix-like platforms the library is almost always called libz
-- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
- if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
- set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
- endif()
+ if(ZLIB_BUILD_SHARED)
+ add_library(
--
-2.43.0
+2.52.0.windows.1
=====================================
contrib/src/zlib/SHA512SUMS
=====================================
@@ -1 +1 @@
-1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d zlib-1.3.1.tar.xz
+cf3d49fbabddc57cca99858feeca8f910e9de42a16014cddd406814d2d24ee33fee2af3805d7efbb1b04b05f55818092b000daf82502b675df65f2512c353f73 zlib-1.3.2.tar.xz
=====================================
contrib/src/zlib/rules.mak
=====================================
@@ -1,5 +1,5 @@
# ZLIB
-ZLIB_VERSION := 1.3.1
+ZLIB_VERSION := 1.3.2
ZLIB_URL := $(GITHUB)/madler/zlib/releases/download/v$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.xz
PKGS += zlib
@@ -15,23 +15,9 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.xz:
zlib: zlib-$(ZLIB_VERSION).tar.xz .sum-zlib
$(UNPACK)
$(APPLY) $(SRC)/zlib/0001-CMakeList.txt-force-static-library-name-to-z.patch
- # disable the installation of the dynamic library since there's no option
- sed -e 's,install(TARGETS zlib zlibstatic,install(TARGETS zlibstatic,' -i.orig $(UNPACK_DIR)/CMakeLists.txt
- # only use the proper libz name for the static library
- sed -e 's,set_target_properties(zlib zlibstatic ,set_target_properties(zlibstatic ,' -i.orig $(UNPACK_DIR)/CMakeLists.txt
- # don't use --version-script on static libraries
- sed -e 's,if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)),if(BUILD_SHARED_LIBS AND (NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))),' -i.orig $(UNPACK_DIR)/CMakeLists.txt
$(MOVE)
-ZLIB_CONF = -DINSTALL_PKGCONFIG_DIR:STRING=$(PREFIX)/lib/pkgconfig -DZLIB_BUILD_EXAMPLES=OFF
-
-# ASM is disabled as the necessary source files are not in the tarball nor the git
-# ifeq ($(ARCH),i386)
-# ZLIB_CONF += -DASM686=ON
-# endif
-# ifeq ($(ARCH),x86_64)
-# ZLIB_CONF += -DAMD64=ON
-# endif
+ZLIB_CONF = -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_EXAMPLES=OFF -DZLIB_BUILD_TESTING=OFF
.zlib: zlib toolchain.cmake
$(CMAKECLEAN)
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -14,8 +14,8 @@ default:
variables:
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: "true"
- VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20251208092116
- VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20251208092116
+ VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20260413122439
+ VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20260413122439
VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20251223015425
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
=====================================
extras/tools/bootstrap
=====================================
@@ -18,7 +18,7 @@
MIN_AUTOCONF=2.69
MIN_AUTOMAKE=1.15
MIN_BISON=3.0.0
-MIN_CMAKE=3.17.0
+MIN_CMAKE=3.18.0
MIN_LIBTOOL=2.4
MIN_M4=1.4.16
MIN_MESON=0.60.0
=====================================
extras/tools/protobuf-fix-build.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- protobuf/src/google/protobuf/compiler/java/java_file.cc.old 2021-12-13 14:57:55.210153925 +0100
-+++ protobuf/src/google/protobuf/compiler/java/java_file.cc 2021-12-13 14:58:03.734181392 +0100
-@@ -65,7 +65,7 @@
- namespace {
-
- struct FieldDescriptorCompare {
-- bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) {
-+ bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) const {
- if(f1 == NULL) {
- return false;
- }
=====================================
extras/tools/protobuf-include-algorithm.patch deleted
=====================================
@@ -1,14 +0,0 @@
---- protobuf/src/google/protobuf/repeated_field.h.orig 2022-02-17 12:44:54.526527423 +0200
-+++ protobuf/src/google/protobuf/repeated_field.h 2022-02-17 12:44:58.190446363 +0200
-@@ -46,11 +46,7 @@
- #ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__
- #define GOOGLE_PROTOBUF_REPEATED_FIELD_H__
-
--#ifdef _MSC_VER
--// This is required for min/max on VS2013 only.
- #include <algorithm>
--#endif
--
- #include <string>
- #include <iterator>
- #include <google/protobuf/stubs/casts.h>
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f60a14fc0920467a8a3efff52a590fb548dfd2bc...2ea290149a37c2a05039e36988ad53b39ad981e5
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f60a14fc0920467a8a3efff52a590fb548dfd2bc...2ea290149a37c2a05039e36988ad53b39ad981e5
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list