From f35629673653b512062e4b01d7dd5746747ab138 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sun, 19 Jan 2025 23:49:51 +0800 Subject: [PATCH] Update dependencies Signed-off-by: nyanmisaka --- builder/scripts.d/10-mingw.sh | 2 +- builder/scripts.d/20-libiconv.sh | 2 +- builder/scripts.d/25-freetype.sh | 2 +- builder/scripts.d/25-libxml2.sh | 2 +- builder/scripts.d/35-fontconfig.sh | 2 +- builder/scripts.d/45-harfbuzz.sh | 2 +- builder/scripts.d/45-libNE10.sh | 2 +- builder/scripts.d/45-x11/10-xtrans.sh | 2 +- builder/scripts.d/45-x11/30-libxcb.sh | 2 +- builder/scripts.d/45-x11/40-libx11.sh | 2 +- builder/scripts.d/50-amf.sh | 2 +- builder/scripts.d/50-dav1d.sh | 2 +- builder/scripts.d/50-libass.sh | 2 +- builder/scripts.d/50-libvpl.sh | 2 +- builder/scripts.d/50-libvpx.sh | 2 +- builder/scripts.d/50-libwebp.sh | 2 +- builder/scripts.d/50-openmpt.sh | 2 +- builder/scripts.d/50-rkmpp.sh | 2 +- builder/scripts.d/50-srt.sh | 2 +- builder/scripts.d/50-svtav1.sh | 2 +- builder/scripts.d/50-vulkan/45-vulkan.sh | 2 +- builder/scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- builder/scripts.d/50-x264.sh | 2 +- builder/scripts.d/50-x265.sh | 2 +- builder/scripts.d/50-zvbi.sh | 2 +- docker-build-win64.sh | 16 +- docker-build.sh | 18 +- msys2/PKGBUILD/10-mingw-w64-brotli/PKGBUILD | 2 +- msys2/PKGBUILD/10-mingw-w64-bzip2/PKGBUILD | 2 +- ...0004-fix-makefile-devel-assuming-gcc.patch | 12 - msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD | 33 ++- msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD | 2 +- msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD | 2 +- msys2/PKGBUILD/15-mingw-w64-libpng/PKGBUILD | 2 +- msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD | 2 +- msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD | 2 +- msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD | 2 +- msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD | 2 +- msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD | 2 +- .../libxml2-CLANG32.install | 12 - .../30-mingw-w64-chromaprint/PKGBUILD | 2 +- .../0002-fix-mkdir.mingw.patch | 12 - .../0004-fix-mkdtemp.mingw.patch | 216 ------------------ .../0005-fix-setenv.mingw.patch | 27 --- .../0007-pkgconfig.mingw.patch | 22 -- .../0011-conf-copy-instead-of-symlink.patch | 24 ++ .../PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD | 87 +++---- .../fontconfig-CLANG32.install | 30 --- msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD | 6 +- msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD | 2 +- .../PKGBUILD/30-mingw-w64-libbluray/PKGBUILD | 2 +- msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD | 2 +- msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD | 14 +- msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD | 6 +- msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD | 2 +- .../PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD | 2 +- msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD | 2 +- msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD | 2 +- msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD | 2 +- .../PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD | 6 +- .../PKGBUILD/40-mingw-w64-libtheora/PKGBUILD | 2 +- .../40-mingw-w64-opencl-headers/PKGBUILD | 2 +- msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD | 6 +- msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD | 4 +- msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD | 2 +- .../50-mingw-w64-amf-headers/PKGBUILD | 2 +- msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD | 4 +- .../PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD | 2 +- 68 files changed, 155 insertions(+), 498 deletions(-) delete mode 100644 msys2/PKGBUILD/10-mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch delete mode 100644 msys2/PKGBUILD/20-mingw-w64-libxml2/libxml2-CLANG32.install delete mode 100644 msys2/PKGBUILD/30-mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch delete mode 100644 msys2/PKGBUILD/30-mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch delete mode 100644 msys2/PKGBUILD/30-mingw-w64-fontconfig/0005-fix-setenv.mingw.patch delete mode 100644 msys2/PKGBUILD/30-mingw-w64-fontconfig/0007-pkgconfig.mingw.patch create mode 100644 msys2/PKGBUILD/30-mingw-w64-fontconfig/0011-conf-copy-instead-of-symlink.patch delete mode 100644 msys2/PKGBUILD/30-mingw-w64-fontconfig/fontconfig-CLANG32.install diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index cfa373a65f7..1df85e3b08b 100755 --- a/builder/scripts.d/10-mingw.sh +++ b/builder/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="b45bcc136eaa697b5bde3a5949b45f3c91b4a1ff" +SCRIPT_COMMIT="be91da60c4ae62a76099279500810c8ffbef4da1" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/builder/scripts.d/20-libiconv.sh b/builder/scripts.d/20-libiconv.sh index be0c500ce43..20b998bc8fe 100755 --- a/builder/scripts.d/20-libiconv.sh +++ b/builder/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://skia.googlesource.com/third_party/libiconv" -SCRIPT_COMMIT="v1.17" +SCRIPT_COMMIT="v1.18" SCRIPT_TAGFILTER="v?.*" ffbuild_enabled() { diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index 9fb7cf5d549..e63fef1ccd1 100755 --- a/builder/scripts.d/25-freetype.sh +++ b/builder/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="59320b2d3c2584ac01914ed0deff64bcc8fb23b2" +SCRIPT_COMMIT="ad7dce7751298e3d65752c5149f08892ff79bcb0" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-libxml2.sh b/builder/scripts.d/25-libxml2.sh index acb0338daae..558ab0f6ec3 100755 --- a/builder/scripts.d/25-libxml2.sh +++ b/builder/scripts.d/25-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="169857ad264e51d9b34d7119d2e2e006e35e60c2" +SCRIPT_COMMIT="1c82bca6bd23d0f0858d7fc228ec3a91fda3e0e2" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index 9a947665194..238921143d3 100755 --- a/builder/scripts.d/35-fontconfig.sh +++ b/builder/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="f9c546ff3e4040a34a0ac27210d3cbdc64c367b5" +SCRIPT_COMMIT="127bb4dbfca7ba669eb40212ffcf24dd8f30351b" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index 798c8bcd01a..c4b46bb2655 100755 --- a/builder/scripts.d/45-harfbuzz.sh +++ b/builder/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="c8050b3872d012adf0a64b5b39d9c67e7f4dfc94" +SCRIPT_COMMIT="3a7ebc320d0038ebf61c60531979a6f9bca7c26b" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-libNE10.sh b/builder/scripts.d/45-libNE10.sh index 65f610658a8..e02b6cc4d1b 100755 --- a/builder/scripts.d/45-libNE10.sh +++ b/builder/scripts.d/45-libNE10.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/gnattu/Ne10.git" -SCRIPT_COMMIT="545f4f18014cdbf9fb5fb1a9f5d24000200dfa8b" +SCRIPT_COMMIT="502bbc4ab65fe83114d618363510fd4ffb7a8c46" ffbuild_enabled() { [[ $TARGET == win* ]] && return -1 diff --git a/builder/scripts.d/45-x11/10-xtrans.sh b/builder/scripts.d/45-x11/10-xtrans.sh index 7d645297025..9f6f9fea546 100755 --- a/builder/scripts.d/45-x11/10-xtrans.sh +++ b/builder/scripts.d/45-x11/10-xtrans.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git" -SCRIPT_COMMIT="e58ae2d27f7baee28319faa02b77cdc344e2f0ca" +SCRIPT_COMMIT="02415310dd4997b4a7943814381c0b52d91eb8de" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh index 4e6e8dbcf8d..54d8a781664 100755 --- a/builder/scripts.d/45-x11/30-libxcb.sh +++ b/builder/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -SCRIPT_COMMIT="622152ee42a310876f10602601206954b8d0613e" +SCRIPT_COMMIT="daf2c5397607c32c3814f02831b9c1158fd1e52c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/40-libx11.sh b/builder/scripts.d/45-x11/40-libx11.sh index 1724c0d8c89..314a8279162 100755 --- a/builder/scripts.d/45-x11/40-libx11.sh +++ b/builder/scripts.d/45-x11/40-libx11.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git" -SCRIPT_COMMIT="5a7d94e07fc7e4a10d6399f5e44793fa0c896af6" +SCRIPT_COMMIT="4665733565eda7ae32302c3abf1aaf5075b8abde" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-amf.sh b/builder/scripts.d/50-amf.sh index c6b701795b7..33d67daf002 100755 --- a/builder/scripts.d/50-amf.sh +++ b/builder/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="8e271daf1d6991337a87dec9355a2f11994d7292" +SCRIPT_COMMIT="681af0dcfc8b88d8c6634f259e2f9e60a54f5a42" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index aa608f4cf4e..d5c86891d66 100755 --- a/builder/scripts.d/50-dav1d.sh +++ b/builder/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="d242c47b437c950b545e96e7872aa914edc50be5" +SCRIPT_COMMIT="40ff2a12515e60853fb11da67ab04cdb5a08dea5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index fc47905768d..e2b155b3331 100755 --- a/builder/scripts.d/50-libass.sh +++ b/builder/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="7d8e335b094f00c57fb557b01e93b60a17e63434" +SCRIPT_COMMIT="4d6e9ef3077fb279cab051cc00b216c5f08efb34" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpl.sh b/builder/scripts.d/50-libvpl.sh index bc7bc3f367f..823a52d9023 100755 --- a/builder/scripts.d/50-libvpl.sh +++ b/builder/scripts.d/50-libvpl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libvpl.git" -SCRIPT_COMMIT="5f6bd8a1e753c8f63a3fd8b36894d6968b808a6d" +SCRIPT_COMMIT="025d43d086a3e663184cb49febe86152bf05409f" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index a243b98355b..56702d674f2 100755 --- a/builder/scripts.d/50-libvpx.sh +++ b/builder/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="6f0c446c7b88d384a1c09caf33ec132e7ee24aea" +SCRIPT_COMMIT="05fb2057b00d01cda1ac0d979eaf60ba87c8416e" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index 824a729bdf7..f238e42092d 100755 --- a/builder/scripts.d/50-libwebp.sh +++ b/builder/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="e4f7a9f0c7c9fbfae1568bc7fa5c94b989b50872" +SCRIPT_COMMIT="f8f241071001e1a3807f34a26a03a742ea843458" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh index 7890497b096..93168cc9fd8 100755 --- a/builder/scripts.d/50-openmpt.sh +++ b/builder/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="22538" +SCRIPT_REV="22856" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-rkmpp.sh b/builder/scripts.d/50-rkmpp.sh index 16a9b975815..e7e215b6d84 100755 --- a/builder/scripts.d/50-rkmpp.sh +++ b/builder/scripts.d/50-rkmpp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/nyanmisaka/mpp.git" -SCRIPT_COMMIT="d109e6296989600cadd7b18acd0dbf3be73c33d4" +SCRIPT_COMMIT="fda5a02e8f88e79ef110e7912c20326a1fea51fb" SCRIPT_BRANCH="jellyfin-mpp" ffbuild_enabled() { diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index ef913b6a6d9..2e200046a85 100755 --- a/builder/scripts.d/50-srt.sh +++ b/builder/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="f109fb1354d6b31ba7cc6b6e72d75bc761a9cd31" +SCRIPT_COMMIT="8a89a3abbf4d3a2f7869d535349a474607ea0214" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index e936a868846..00f7da09076 100755 --- a/builder/scripts.d/50-svtav1.sh +++ b/builder/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="8f1f1b0dc52b063264838b51bc2299a5e44e31d5" +SCRIPT_COMMIT="6e69def4ec283fe0b71195671245c3b768bebdef" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/builder/scripts.d/50-vulkan/45-vulkan.sh b/builder/scripts.d/50-vulkan/45-vulkan.sh index 51e5eed6d34..e5225c41e95 100755 --- a/builder/scripts.d/50-vulkan/45-vulkan.sh +++ b/builder/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.4.303" +SCRIPT_COMMIT="v1.4.305" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh index c2036a70040..5df3a13595e 100755 --- a/builder/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/builder/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="6173e24b31f09a0c3217103a130e74c4ddec14a6" +SCRIPT_COMMIT="5e7db829a37787e096a7bfbdbdf317cd6cbe5897" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-x264.sh b/builder/scripts.d/50-x264.sh index 46a7f937016..9f8b2097e39 100755 --- a/builder/scripts.d/50-x264.sh +++ b/builder/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/x264.git" -SCRIPT_COMMIT="da14df5535fd46776fb1c9da3130973295c87aca" +SCRIPT_COMMIT="373697b467f7cd0af88f1e9e32d4f10540df4687" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index 25faa104fa5..abaef8999a6 100755 --- a/builder/scripts.d/50-x265.sh +++ b/builder/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="fa2770934b8f3d88aa866c77f27cb63f69a9ed39" +SCRIPT_COMMIT="25f05ac76c6afcae97eae39d54eed005d82b93c9" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/builder/scripts.d/50-zvbi.sh b/builder/scripts.d/50-zvbi.sh index a478ff0a746..79279d933aa 100755 --- a/builder/scripts.d/50-zvbi.sh +++ b/builder/scripts.d/50-zvbi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/zapping-vbi/zvbi.git" -SCRIPT_COMMIT="66a1c9bdf3a7f105a5c02070cc6de0d949513c58" +SCRIPT_COMMIT="af8b9f7bff9c2cf0be844ff993797930c53466f4" ffbuild_enabled() { return 0 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index ca43aee996c..5e454325ed5 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -6,7 +6,7 @@ set -o errexit set -o xtrace # Update mingw-w64 headers -mingw_commit="b45bcc136eaa697b5bde3a5949b45f3c91b4a1ff" +mingw_commit="be91da60c4ae62a76099279500810c8ffbef4da1" git clone https://git.code.sf.net/p/mingw-w64/mingw-w64.git pushd mingw-w64/mingw-w64-headers git checkout ${mingw_commit} @@ -30,7 +30,7 @@ popd # ICONV mkdir iconv pushd iconv -iconv_ver="1.17" +iconv_ver="1.18" iconv_link="https://mirrors.kernel.org/gnu/libiconv/libiconv-${iconv_ver}.tar.gz" wget ${iconv_link} -O iconv.tar.gz tar xaf iconv.tar.gz @@ -173,7 +173,7 @@ popd # FONTCONFIG mkdir fontconfig pushd fontconfig -fc_ver="2.15.0" +fc_ver="2.16.0" fc_link="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${fc_ver}.tar.xz" wget ${fc_link} -O fc.tar.gz tar xaf fc.tar.gz @@ -189,7 +189,7 @@ popd popd # HARFBUZZ -git clone -b 10.1.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git +git clone -b 10.2.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git meson setup harfbuzz harfbuzz_build \ --prefix=${FF_DEPS_PREFIX} \ --cross-file=${FF_MESON_TOOLCHAIN} \ @@ -320,7 +320,7 @@ popd # OPENMPT mkdir mpt pushd mpt -mpt_ver="0.7.12" +mpt_ver="0.7.13" mpt_link="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${mpt_ver}+release.autotools.tar.gz" wget ${mpt_link} -O mpt.tar.gz tar xaf mpt.tar.gz @@ -337,7 +337,7 @@ popd popd # LIBWEBP -git clone -b v1.4.0 --depth=1 https://chromium.googlesource.com/webm/libwebp +git clone -b v1.5.0 --depth=1 https://chromium.googlesource.com/webm/libwebp pushd libwebp ./autogen.sh ./configure \ @@ -390,7 +390,7 @@ make install popd # X265 -x265_commit="fa2770934b8f3d88aa866c77f27cb63f69a9ed39" +x265_commit="25f05ac76c6afcae97eae39d54eed005d82b93c9" git clone https://bitbucket.org/multicoreware/x265_git.git pushd x265_git git checkout ${x265_commit} @@ -557,7 +557,7 @@ popd popd # VPL -git clone -b v2.13.0 --depth=1 https://github.com/intel/libvpl.git +git clone -b v2.14.0 --depth=1 https://github.com/intel/libvpl.git pushd libvpl mkdir build && pushd build cmake \ diff --git a/docker-build.sh b/docker-build.sh index 804c39633c6..4ebc0cc07bb 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -36,7 +36,7 @@ prepare_extra_common() { pushd ${SOURCE_DIR} mkdir iconv pushd iconv - iconv_ver="1.17" + iconv_ver="1.18" iconv_link="https://mirrors.kernel.org/gnu/libiconv/libiconv-${iconv_ver}.tar.gz" wget ${iconv_link} -O iconv.tar.gz tar xaf iconv.tar.gz @@ -120,7 +120,7 @@ prepare_extra_common() { pushd ${SOURCE_DIR} mkdir fontconfig pushd fontconfig - fc_ver="2.15.0" + fc_ver="2.16.0" fc_link="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${fc_ver}.tar.xz" wget ${fc_link} -O fc.tar.gz tar xaf fc.tar.gz @@ -140,7 +140,7 @@ prepare_extra_common() { # HARFBUZZ pushd ${SOURCE_DIR} - git clone -b 10.1.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git + git clone -b 10.2.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git meson setup harfbuzz harfbuzz_build \ ${MESON_CROSS_OPT} \ --prefix=${TARGET_DIR} \ @@ -376,7 +376,7 @@ prepare_extra_amd64() { # GMMLIB pushd ${SOURCE_DIR} - git clone -b intel-gmmlib-22.5.5 --depth=1 https://github.com/intel/gmmlib.git + git clone -b intel-gmmlib-22.6.0 --depth=1 https://github.com/intel/gmmlib.git pushd gmmlib mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -412,7 +412,7 @@ prepare_extra_amd64() { # Provides VPL header and dispatcher (libvpl.so.2) for FFmpeg # Both MSDK and VPL runtime can be loaded by VPL dispatcher pushd ${SOURCE_DIR} - git clone -b v2.13.0 --depth=1 https://github.com/intel/libvpl.git + git clone -b v2.14.0 --depth=1 https://github.com/intel/libvpl.git pushd libvpl sed -i 's|ParseEnvSearchPaths(ONEVPL_PRIORITY_PATH_VAR, searchDirList)|searchDirList.push_back("/usr/lib/jellyfin-ffmpeg/lib")|g' libvpl/src/mfx_dispatcher_vpl_loader.cpp mkdir build && pushd build @@ -433,7 +433,7 @@ prepare_extra_amd64() { # VPL-GPU-RT (RT only) # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer pushd ${SOURCE_DIR} - git clone -b intel-onevpl-24.4.2 --depth=1 https://github.com/intel/vpl-gpu-rt.git + git clone -b intel-onevpl-25.1.0 --depth=1 https://github.com/intel/vpl-gpu-rt.git pushd vpl-gpu-rt mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -453,7 +453,7 @@ prepare_extra_amd64() { # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default) # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF pushd ${SOURCE_DIR} - git clone -b intel-media-24.4.2 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-25.1.0 --depth=1 https://github.com/intel/media-driver.git pushd media-driver # Enable VC1 decode on DG2 (note that MTL+ is not supported) wget -q -O - https://github.com/intel/media-driver/commit/d5dd47b.patch | git apply @@ -476,7 +476,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - git clone -b v1.4.303 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git + git clone -b v1.4.305 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git pushd Vulkan-Headers mkdir build && pushd build cmake \ @@ -489,7 +489,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - git clone -b v1.4.303 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git + git clone -b v1.4.305 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git pushd Vulkan-Loader mkdir build && pushd build cmake \ diff --git a/msys2/PKGBUILD/10-mingw-w64-brotli/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-brotli/PKGBUILD index edff52a02a7..2ce87a982d4 100644 --- a/msys2/PKGBUILD/10-mingw-w64-brotli/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-brotli/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.1.0 pkgrel=1 pkgdesc="Brotli compression library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://github.com/google/brotli' msys2_references=( "pypi: brotli" diff --git a/msys2/PKGBUILD/10-mingw-w64-bzip2/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-bzip2/PKGBUILD index f616f1b9570..47747faf3ca 100644 --- a/msys2/PKGBUILD/10-mingw-w64-bzip2/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-bzip2/PKGBUILD @@ -8,7 +8,7 @@ pkgver=1.0.8 pkgrel=3 pkgdesc="A high-quality data compression program (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://sourceware.org/bzip2/" msys2_references=( "cpe: cpe:/a:bzip:bzip2" diff --git a/msys2/PKGBUILD/10-mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch b/msys2/PKGBUILD/10-mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch deleted file mode 100644 index 80905eeafb8..00000000000 --- a/msys2/PKGBUILD/10-mingw-w64-libiconv/0004-fix-makefile-devel-assuming-gcc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/Makefile.devel b/Makefile.devel ---- a/Makefile.devel 2022-01-24 04:49:47 +0000 -+++ b/Makefile.devel 2023-01-14 18:28:46 +0000 -@@ -9,7 +9,7 @@ - AUTOMAKE = automake-1.16 - ACLOCAL = aclocal-1.16 - GPERF = gperf --CC = gcc -Wall -+CC = cc -Wall - CFLAGS = -O - MAN2HTML = groff -mandoc -Thtml - CP = cp diff --git a/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD index bdcca6480ff..c493c708334 100644 --- a/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD @@ -4,33 +4,29 @@ _realname=libiconv pkgbase=mingw-w64-jellyfin-${_realname} pkgname=(${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname} ${MINGW_PACKAGE_PREFIX}-jellyfin-iconv) -license=('spdx:GPL-3.0-or-later') pkgdesc='Character encoding conversion library and utility (mingw-w64)' -pkgver=1.17 -pkgrel=4 +pkgver=1.18 +pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://www.gnu.org/software/libiconv/' +license=('spdx:GPL-3.0-or-later') +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-autotools" + "${MINGW_PACKAGE_PREFIX}-gettext-tools" + "${MINGW_PACKAGE_PREFIX}-gperf") source=("https://mirrors.kernel.org/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"{,.sig} - 0004-fix-makefile-devel-assuming-gcc.patch 0003-add-cp65001-as-utf8-alias.patch 0002-fix-cr-for-awk-in-configure.all.patch fix-pointer-buf.patch iconv.pc) -sha256sums=('8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313' +sha256sums=('3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8' 'SKIP' - '2f08ca8681e4c85cdb2e6835921a502fd623dee4bf8ca10aa3c66747ede58a47' 'cb2b1cca44c9b9bd11c3bd33997c10d22dff263542275324c88f34b59910ef87' '89d5c0f666e50a0186cfb142ba7b77e8fe1ac4d65bdfd9ae14ae8d2f0045a87c' '6b6e2393840f4dc6067587165777b1a07978f4c05247d7c1010a45ad251bbeeb' 'SKIP') validpgpkeys=('SKIP') # "Bruno Haible (Open Source Development) " -options=('!libtool' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-autotools" - "${MINGW_PACKAGE_PREFIX}-gettext-tools" - "${MINGW_PACKAGE_PREFIX}-gperf") - export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" @@ -44,28 +40,25 @@ apply_patch_with_msg() { regenerate_files() { msg2 "Regenerating autogenerated files" - make -f Makefile.devel all + CC=${CC} make -f Makefile.devel all } prepare() { cd "${srcdir}/${_realname}-${pkgver}" + apply_patch_with_msg \ 0002-fix-cr-for-awk-in-configure.all.patch \ fix-pointer-buf.patch \ - 0003-add-cp65001-as-utf8-alias.patch \ - 0004-fix-makefile-devel-assuming-gcc.patch + 0003-add-cp65001-as-utf8-alias.patch + regenerate_files } build() { - [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ --prefix=${FF_MINGW_PREFIX} \ - --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ --docdir=${FF_MINGW_PREFIX}/share/doc/libiconv \ --enable-static \ --disable-shared \ diff --git a/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD index 66674d08b4e..14d110e44fa 100644 --- a/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD @@ -8,7 +8,7 @@ pkgver=5.6.3 pkgrel=1 pkgdesc="Library and command line tools for XZ and LZMA compressed files (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://tukaani.org/xz" msys2_repository_url="https://github.com/tukaani-project/xz/" msys2_references=( diff --git a/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD index 1f13b138cc4..ff97307292f 100644 --- a/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD @@ -9,7 +9,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") pkgver=1.3.1 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') license=('spdx:Zlib') url="https://www.zlib.net/" msys2_repository_url="https://github.com/madler/zlib" diff --git a/msys2/PKGBUILD/15-mingw-w64-libpng/PKGBUILD b/msys2/PKGBUILD/15-mingw-w64-libpng/PKGBUILD index b22c07465fc..087c638204b 100644 --- a/msys2/PKGBUILD/15-mingw-w64-libpng/PKGBUILD +++ b/msys2/PKGBUILD/15-mingw-w64-libpng/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" pkgver=1.6.44 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') pkgdesc="A collection of routines used to create PNG format graphics (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-jellyfin-zlib") diff --git a/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD index e1f6cd7ba25..2bc3be79396 100644 --- a/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD @@ -8,7 +8,7 @@ pkgver=${_pkgver//-/.} pkgrel=5 pkgdesc="A library for computing the discrete Fourier transform (DFT) (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.fftw.org/" license=("spdx:GPL-2.0-or-later") makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" diff --git a/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD index d5ef470e31d..45c97bb61bc 100644 --- a/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD @@ -10,7 +10,7 @@ pkgver=2.13.3 pkgrel=1 pkgdesc="TrueType font rendering library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') msys2_references=( 'archlinux: freetype2' "cpe: cpe:/a:freetype:freetype" diff --git a/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD index 20bb10430b2..cf60372dd8b 100644 --- a/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.0.15 pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') license=('spdx:LGPL-2.1-or-later') url="https://github.com/fribidi/fribidi/" msys2_references=( diff --git a/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD index 6ed8910b759..c571def727d 100644 --- a/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD @@ -7,7 +7,7 @@ pkgver=6.3.0 pkgrel=2 pkgdesc="A free library for arbitrary precision arithmetic (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://gmplib.org/" msys2_references=( "cpe: cpe:/a:gmplib:gmp" diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD index af5c9c360f1..33b3563ea6e 100644 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD @@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" pkgver=2.12.9 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') pkgdesc="XML parsing library, version 2 (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-jellyfin-libiconv" "${MINGW_PACKAGE_PREFIX}-jellyfin-xz" diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/libxml2-CLANG32.install b/msys2/PKGBUILD/20-mingw-w64-libxml2/libxml2-CLANG32.install deleted file mode 100644 index e1adf542a59..00000000000 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/libxml2-CLANG32.install +++ /dev/null @@ -1,12 +0,0 @@ -MINGW_INSTALL=clang32 - -post_install() { - if test ! -f ${MINGW_INSTALL}/etc/xml/catalog; then - usr/bin/mkdir -p ${MINGW_INSTALL}/etc/xml - ${MINGW_INSTALL}/bin/xmlcatalog.exe --noout --create ${MINGW_INSTALL}/etc/xml/catalog - fi -} - -post_upgrade() { - post_install -} diff --git a/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD index f1bf2d499c3..f431f2a8221 100644 --- a/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.5.1 pkgrel=2 pkgdesc="Library that implements a custom algorithm for extracting fingerprints from any audio source (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://acoustid.org/chromaprint" license=("LGPL") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch b/msys2/PKGBUILD/30-mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch deleted file mode 100644 index 86b2f8dd474..00000000000 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0002-fix-mkdir.mingw.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- fontconfig-2.13.93/test/test-migration.c.orig 2020-12-05 10:40:30.302459200 +0100 -+++ fontconfig-2.13.93/test/test-migration.c 2020-12-05 10:42:21.727935600 +0100 -@@ -30,6 +30,9 @@ - #include - #include - #include -+#ifdef _WIN32 -+#define mkdir(path,mode) _mkdir(path) -+#endif - #ifdef HAVE_UNISTD_H - #include - #endif diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch b/msys2/PKGBUILD/30-mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch deleted file mode 100644 index d3980a61118..00000000000 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0004-fix-mkdtemp.mingw.patch +++ /dev/null @@ -1,216 +0,0 @@ ---- fontconfig-2.11.0/test/test-migration.c.orig 2014-02-06 12:24:45.529605800 +0000 -+++ fontconfig-2.11.0/test/test-migration.c 2014-02-06 14:43:19.691870300 +0000 -@@ -9,6 +9,213 @@ - #endif - #include - -+#if defined(_WIN32) -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static PSECURITY_DESCRIPTOR -+create_sd (int permissions) -+{ -+ PSECURITY_DESCRIPTOR pSD = NULL; -+ int i; -+ int j; -+ EXPLICIT_ACCESS ea[3]; -+ PSID sids[3] = { NULL, NULL, NULL }; -+ WELL_KNOWN_SID_TYPE sidtypes[3] = { WinCreatorOwnerSid, WinCreatorGroupSid, WinWorldSid }; -+ int ea_len = 0; -+ DWORD dwRes, dwDisposition; -+ PACL pACL = NULL; -+ -+ /* Initialize a security descriptor. */ -+ pSD = (PSECURITY_DESCRIPTOR) LocalAlloc (LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH); -+ if (NULL == pSD) -+ { -+ errno = ENOMEM; -+ return NULL; -+ } -+ -+ if (!InitializeSecurityDescriptor (pSD, SECURITY_DESCRIPTOR_REVISION)) -+ { -+ LocalFree (pSD); -+ errno = EIO; -+ return NULL; -+ } -+ -+ for (i = 0; i < 3; i++) -+ { -+ BOOL b; -+ DWORD bytes; -+ int imasked = permissions & (07 << (2 - i)); -+ if (!imasked) -+ continue; -+ -+ bytes = SECURITY_MAX_SID_SIZE; -+ sids[ea_len] = (PSID) LocalAlloc (LMEM_FIXED, bytes); -+ if (NULL == sids[ea_len]) -+ { -+ errno = ENOMEM; -+ LocalFree (pSD); -+ for (j = 0; j < ea_len; j++) -+ { -+ if (sids[j] != NULL) -+ { -+ LocalFree (sids[j]); -+ sids[j] = NULL; -+ } -+ } -+ return NULL; -+ } -+ -+ b = CreateWellKnownSid (sidtypes[i], NULL, sids[ea_len], &bytes); -+ if (!b) -+ { -+ errno = EINVAL; -+ LocalFree (pSD); -+ for (j = 0; j < ea_len; j++) -+ { -+ if (sids[j] != NULL) -+ { -+ LocalFree (sids[j]); -+ sids[j] = NULL; -+ } -+ } -+ return NULL; -+ } -+ -+ /* Initialize an EXPLICIT_ACCESS structure for an ACE. */ -+ ZeroMemory (&ea[ea_len], sizeof(EXPLICIT_ACCESS)); -+ bytes = 0; -+ if (01 & imasked) -+ bytes = bytes | GENERIC_READ; -+ if (02 & imasked) -+ bytes = bytes | GENERIC_WRITE; -+ if (04 & imasked) -+ bytes = bytes | GENERIC_EXECUTE; -+ ea[ea_len].grfAccessPermissions = bytes; -+ ea[ea_len].grfAccessMode = SET_ACCESS; -+ ea[ea_len].grfInheritance= NO_INHERITANCE; -+ ea[ea_len].Trustee.TrusteeForm = TRUSTEE_IS_SID; -+ ea[ea_len].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; -+ ea[ea_len].Trustee.ptstrName = (LPTSTR) sids[ea_len]; -+ ea_len = ea_len + 1; -+ } -+ -+ /* Create a new ACL that contains the new ACEs. */ -+ dwRes = SetEntriesInAcl (ea_len, ea, NULL, &pACL); -+ if (ERROR_SUCCESS != dwRes) -+ { -+ errno = EIO; -+ LocalFree (pSD); -+ for (j = 0; j < ea_len; j++) -+ { -+ if (sids[j] != NULL) -+ { -+ LocalFree (sids[j]); -+ sids[j] = NULL; -+ } -+ } -+ return NULL; -+ } -+ -+ for (j = 0; j < ea_len; j++) -+ { -+ if (sids[j] != NULL) -+ { -+ LocalFree (sids[j]); -+ sids[j] = NULL; -+ } -+ } -+ -+ /* Add the ACL to the security descriptor. */ -+ if (!SetSecurityDescriptorDacl (pSD, -+ TRUE, // bDaclPresent flag -+ pACL, -+ FALSE)) // not a default DACL -+ { -+ errno = EIO; -+ LocalFree (pSD); -+ LocalFree (pACL); -+ return NULL; -+ } -+ -+ return pSD; -+} -+ -+static void -+free_sd (PSECURITY_DESCRIPTOR sd) -+{ -+ BOOL b, present, defaulted; -+ PACL pACL = NULL; -+ present = FALSE; -+ b = GetSecurityDescriptorDacl (sd, &present, &pACL, &defaulted); -+ if (b && present && !defaulted && pACL) -+ LocalFree (pACL); -+ LocalFree (sd); -+} -+ -+static void -+randtemplate (char *template, size_t l) -+{ -+ int i; -+ for (i = l - 6; i < l; i++) -+ { -+ int r = rand (); -+ if ((r / (RAND_MAX + 1)) > ((RAND_MAX + 1) / 2)) -+ template[i] = 'A' + (double) rand () / (RAND_MAX + 1) * ('Z' - 'A'); -+ else -+ template[i] = 'a' + (double) rand () / (RAND_MAX + 1) * ('z' - 'a'); -+ } -+} -+ -+static char * -+mkdtemp (char *template) -+{ -+ int i; -+ size_t l; -+ BOOL b; -+ SECURITY_ATTRIBUTES sa; -+ -+ if (template == NULL) -+ { -+ errno = EINVAL; -+ return NULL; -+ } -+ l = strlen (template); -+ if (l < 6 || strcmp (&template[l - 6], "XXXXXX") != 0) -+ { -+ errno = EINVAL; -+ return NULL; -+ } -+ srand(time (NULL)); -+ sa.nLength = sizeof (sa); -+ sa.lpSecurityDescriptor = create_sd (0700); -+ sa.bInheritHandle = FALSE; -+ do -+ { -+ randtemplate (template, l); -+ SetLastError (0); -+ b = CreateDirectoryA (template, &sa); -+ } while (!b && GetLastError () == ERROR_ALREADY_EXISTS); -+ free_sd (sa.lpSecurityDescriptor); -+ if (!b) -+ { -+ errno = EIO; -+ return NULL; -+ } -+ else -+ { -+ errno = 0; -+ return template; -+ } -+} -+#endif -+ - FcBool - mkdir_p(const char *dir) - { diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0005-fix-setenv.mingw.patch b/msys2/PKGBUILD/30-mingw-w64-fontconfig/0005-fix-setenv.mingw.patch deleted file mode 100644 index 36d31d3b06a..00000000000 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0005-fix-setenv.mingw.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- fontconfig-2.11.0/test/test-migration.c.orig 2014-02-06 14:43:19.691870300 +0000 -+++ fontconfig-2.11.0/test/test-migration.c 2014-02-06 14:48:25.336182200 +0000 -@@ -214,6 +214,24 @@ - return template; - } - } -+ -+static int -+setenv (const char *var, const char *val, int ovr) -+{ -+ BOOL b; -+ char c[2]; -+ if (!ovr) -+ { -+ DWORD d; -+ d = GetEnvironmentVariableA (var, c, 2); -+ if (0 != d && GetLastError () != ERROR_ENVVAR_NOT_FOUND) -+ return; -+ } -+ b = SetEnvironmentVariableA (var, val); -+ if (b) -+ return 0; -+ return 1; -+} - #endif - - FcBool diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0007-pkgconfig.mingw.patch b/msys2/PKGBUILD/30-mingw-w64-fontconfig/0007-pkgconfig.mingw.patch deleted file mode 100644 index 0895c2fc43c..00000000000 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0007-pkgconfig.mingw.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- fontconfig-2.11.93/m4/pkg.m4.orig 2015-03-09 02:54:03.000000000 +0000 -+++ fontconfig-2.11.93/m4/pkg.m4 2015-04-06 11:04:21.862416100 +0000 -@@ -111,8 +111,8 @@ - pkg_failed=no - AC_MSG_CHECKING([for $1]) - --_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) --_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+_PKG_CONFIG([$1][_CFLAGS], [cflags --dont-define-prefix], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs --dont-define-prefix], [$2]) - - m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS - and $1[]_LIBS to avoid the need to call pkg-config. -@@ -207,7 +207,7 @@ - [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl - AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - --_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -+_PKG_CONFIG([$1], [variable="][$3][" --dont-define-prefix], [$2]) - AS_VAR_COPY([$1], [pkg_cv_][$1]) - - AS_VAR_IF([$1], [""], [$5], [$4])dnl diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/0011-conf-copy-instead-of-symlink.patch b/msys2/PKGBUILD/30-mingw-w64-fontconfig/0011-conf-copy-instead-of-symlink.patch new file mode 100644 index 00000000000..4c0a69d385d --- /dev/null +++ b/msys2/PKGBUILD/30-mingw-w64-fontconfig/0011-conf-copy-instead-of-symlink.patch @@ -0,0 +1,24 @@ +--- fontconfig-2.15.0/conf.d/link_confs.py.orig 2024-02-18 12:02:06.238444000 +0100 ++++ fontconfig-2.15.0/conf.d/link_confs.py 2024-02-18 11:20:14.335114100 +0100 +@@ -26,6 +26,8 @@ + if not os.path.exists(confpath): + os.makedirs(confpath) + ++ args.availpath = str(PurePath(os.environ.get('DESTDIR'), *PurePath(args.availpath).parts[1:])) ++ + for link in args.links: + src = os.path.join(args.availpath, link) + dst = os.path.join(confpath, link) +@@ -33,6 +35,12 @@ + os.remove(dst) + except FileNotFoundError: + pass ++ ++ if os.name == "nt": ++ import shutil ++ shutil.copyfile(src, dst) ++ continue ++ + try: + os.symlink(os.path.relpath(src, start=args.confpath), dst) + except NotImplementedError: diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD index cac98dd7673..ba7a0d043f1 100644 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD @@ -4,20 +4,18 @@ _realname=fontconfig pkgbase=mingw-w64-jellyfin-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" -pkgver=2.15.0 +pkgver=2.16.0 pkgrel=1 pkgdesc="A library for configuring and customizing font access (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://wiki.freedesktop.org/www/Software/fontconfig/" msys2_repository_url="https://gitlab.freedesktop.org/fontconfig/fontconfig" license=("custom") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-autotools" - "${MINGW_PACKAGE_PREFIX}-python-lxml" + "${MINGW_PACKAGE_PREFIX}-meson" "${MINGW_PACKAGE_PREFIX}-gperf" - "${MINGW_PACKAGE_PREFIX}-gettext-runtime" - "python") + "${MINGW_PACKAGE_PREFIX}-gettext-runtime") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-jellyfin-freetype" "${MINGW_PACKAGE_PREFIX}-jellyfin-libxml2" @@ -25,75 +23,54 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" options=('staticlibs' 'strip') install=${_realname}-${MSYSTEM}.install source=("https://www.freedesktop.org/software/fontconfig/release/fontconfig-${pkgver}.tar.xz" - 0002-fix-mkdir.mingw.patch - 0004-fix-mkdtemp.mingw.patch - 0005-fix-setenv.mingw.patch - 0007-pkgconfig.mingw.patch - https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a76b95105ca26c600279b2daf4bd43b37a918823.patch) -sha256sums=('63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e' - '9e5700b9c555e60cd8116fdc2e24cf0a01de01e83373dbbe78cef1e32b91da3b' - '57ff8420dbf62873b6fcb38b52fb7b37e0e278425a9125e15dccba54668c8ab9' - '552b54010f9fe4097f332cf2397bbd3e78489542d3bbf07792ed1cfe9381796e' - 'af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b' - 'c225c156c4732a492c9588c8d33705ca29af6f3195f201f4012b09ff012f1831') + 0011-conf-copy-instead-of-symlink.patch) +sha256sums=('6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220' + '73ed74a1f4624466084d219e2fbc0d5780da9f63763f1307629251e58cccf2cd') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { - cd "${srcdir}"/${_realname}-${pkgver} + cd "${_realname}-${pkgver}" - patch -p1 -i ${srcdir}/0002-fix-mkdir.mingw.patch - patch -p1 -i ${srcdir}/0004-fix-mkdtemp.mingw.patch - patch -p1 -i ${srcdir}/0005-fix-setenv.mingw.patch - patch -p1 -i ${srcdir}/0007-pkgconfig.mingw.patch - - # backport because it seems relevant for us - patch -p1 -i ${srcdir}/a76b95105ca26c600279b2daf4bd43b37a918823.patch - - autoreconf -fiv + patch -p1 -i ${srcdir}/0011-conf-copy-instead-of-symlink.patch } build() { export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" - cd "${srcdir}/build-${MINGW_CHOST}" - # Use msys python for link_confs.py, so we don't have to fixup the path conversion - # and patch out symlinking - PYTHON=/usr/bin/python \ - ../${_realname}-${pkgver}/configure \ - --prefix=${FF_MINGW_PREFIX} \ - --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} \ - --disable-shared \ - --enable-static \ - --enable-iconv \ - --with-libiconv=${FF_MINGW_PREFIX} \ - --enable-libxml2 \ - --with-libxml2=${FF_MINGW_PREFIX} \ - --disable-docs \ - --with-arch=${CARCH} \ - as_ln_s="cp -pR" + mkdir -p "build-${MSYSTEM}-static" && cd "build-${MSYSTEM}-static" + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + meson setup \ + --default-library=static \ + --prefix="${FF_MINGW_PREFIX}" \ + --wrap-mode=nodownload \ + --auto-features=enabled \ + --buildtype=plain \ + -Dxml-backend=libxml2 \ + -Ddoc-man=disabled \ + -Ddoc-txt=disabled \ + -Ddoc-pdf=disabled \ + -Ddoc-html=disabled \ + -Dcache-build=disabled \ + ../"${_realname}-${pkgver}" - sed -i 's,all-am: Makefile $(PROGRAMS),all-am:,' test/Makefile - make + meson compile } package() { - cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + cd "${srcdir}/build-${MSYSTEM}-static" + DESTDIR="${pkgdir}" meson install - find "${pkgdir}${FF_MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" # Also install libintl lib cp "${MINGW_TOOLCHAIN_PREFIX}"/lib/libintl.a "${pkgdir}${FF_MINGW_PREFIX}/lib/" - # Convert MSYS2-specific paths to pkg-config variables (see issue #872) - sed -i "s#${FF_MINGW_PREFIX}/lib#\${libdir}#g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc - sed -i "s#${FF_MINGW_PREFIX}/include#\${includedir}#g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc + sed -i "s|${FF_MINGW_PREFIX}/etc$|\${prefix}/etc|g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc + sed -i "s|${FF_MINGW_PREFIX}/etc/|\${sysconfdir}/|g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc + sed -i "s|${FF_MINGW_PREFIX}/var|\${prefix}/var|g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc # Also statically link to libintl sed -s "s|-liconv|-liconv\ -lintl|g" -i "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/fontconfig.pc diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/fontconfig-CLANG32.install b/msys2/PKGBUILD/30-mingw-w64-fontconfig/fontconfig-CLANG32.install deleted file mode 100644 index af2663dafbf..00000000000 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/fontconfig-CLANG32.install +++ /dev/null @@ -1,30 +0,0 @@ -MINGW_INSTALL=clang32 - -post_install() { - if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then - echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update" - else - echo -n "updating font cache... " - ${MINGW_INSTALL}/bin/fc-cache -f - echo "done." - fi -} - -post_upgrade() { - if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then - echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update" - else - echo -n "updating font cache... " - ${MINGW_INSTALL}/bin/fc-cache -f - echo "done." - fi -} - -post_remove() { - cat << _EOF - - Check for dead symlinks and leftover files - in ${MINGW_INSTALL}/etc/fonts/conf.d/ - -_EOF -} diff --git a/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD index 0aec7e57f95..580c22ae9d4 100644 --- a/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD @@ -4,11 +4,11 @@ _realname=harfbuzz pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=10.1.0 +pkgver=10.2.0 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/harfbuzz/harfbuzz" msys2_references=( "archlinux: harfbuzz" @@ -28,7 +28,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-fonttools" "${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.xz" "001-fix-build-with-chafa.patch") -sha256sums=('6ce3520f2d089a33cef0fc48321334b8e0b72141f6a763719aaaecd2779ecb82' +sha256sums=('620e3468faec2ea8685d32c46a58469b850ef63040b3565cde05959825b48227' '26b37a1ca9872973905ecb96bcbe3f054472252320956faa74428206900d360e') noextract=("harfbuzz-${pkgver}.tar.xz") diff --git a/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD index 9e0871d4318..9c688866cbe 100644 --- a/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD @@ -7,7 +7,7 @@ pkgver=3.100 pkgrel=3 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://lame.sourceforge.io/" msys2_references=( "cpe: cpe:/a:lame_project:lame" diff --git a/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD index 2b7be5b575d..133627cdf5d 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.3.4 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://www.videolan.org/developers/libbluray.html' msys2_references=( "cpe: cpe:/a:videolan:libbluray" diff --git a/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD index 4195ba1b56d..26959c20e9e 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.3.5 pkgrel=1 pkgdesc="Ogg bitstream and framing library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://xiph.org/" license=('BSD') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" diff --git a/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD index 607da9b9570..9b2ddd6d9c7 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD @@ -3,11 +3,11 @@ _realname=libvpx pkgbase=mingw-w64-jellyfin-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" -pkgver=1.14.1 +pkgver=1.15.0 pkgrel=1 pkgdesc="The VP8/VP9 Codec SDK (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread-git") makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" @@ -22,14 +22,10 @@ msys2_references=( "cpe: cpe:/a:webmproject:libvpx" ) source=(${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz - 0001-enable-shared-on.mingw.patch - 0003-cross-with-native-binutils.mingw.patch - 0005-fix-exports.mingw.patch) + 0001-enable-shared-on.mingw.patch) options=('strip' 'staticlibs') sha256sums=('901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977' - 'f37a24525725cad215d73c538c0b06343b043f2b07553e7dc25835bd68af0695' - 'fabe7d4a756b33016947f741b1b5d8cbbf9aefd8862240645d0ed7bf7b4a3739' - '7c511b5df935278da2cba32b03b90582f360ab6786a5e32028bc82025193fabd') + 'f37a24525725cad215d73c538c0b06343b043f2b07553e7dc25835bd68af0695') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" @@ -55,8 +51,6 @@ prepare() { cd ${srcdir}/${_realname}-${pkgver} apply_patch_with_msg 0001-enable-shared-on.mingw.patch - apply_patch_with_msg 0003-cross-with-native-binutils.mingw.patch - apply_patch_with_msg 0005-fix-exports.mingw.patch } build() { diff --git a/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD index 535a971b4c6..eb287aaaa57 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD @@ -4,11 +4,11 @@ _realname=libwebp pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=1 pkgdesc="A library to encode and decode images in WebP format (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://developers.google.com/speed/webp/' msys2_references=( "cpe: cpe:/a:webmproject:libwebp" @@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" provides=("${MINGW_PACKAGE_PREFIX}-libsharpyuv") source=(${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libwebp/archive/v${pkgver}.tar.gz 0001-mingw-cmake-output.patch) -sha256sums=('12af50c45530f0a292d39a88d952637e43fb2d4ab1883c44ae729840f7273381' +sha256sums=('668c9aba45565e24c27e17f7aaf7060a399f7f31dba6c97a044e1feacb930f37' '30ed42b782af427f57049abada30ce6d4d62318ee13014585cb352b570c68e3d') validpgpkeys=('6B0E6B70976DE303EDF2F601F9C3D6BDB8232B5D') diff --git a/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD index 787b38e8966..fbe290462c9 100644 --- a/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.5.2 pkgrel=1 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.opus-codec.org/" msys2_repository_url="https://github.com/xiph/opus" msys2_references=( diff --git a/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD b/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD index a8425612e71..7a3b5ee91a5 100644 --- a/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD +++ b/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.3.7 pkgrel=2 pkgdesc="Vorbis codec library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://xiph.org/" msys2_references=( "cpe: cpe:/a:xiph.org:libvorbis" diff --git a/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD index 824300366cc..685d0e0660f 100644 --- a/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.5.0 pkgrel=1 pkgdesc="AV1 cross-platform decoder focused on speed and correctness (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://code.videolan.org/videolan/dav1d' msys2_references=( "cpe: cpe:/a:videolan:dav1d" diff --git a/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD index 59d5f66c855..8e7e81fb090 100644 --- a/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD @@ -8,7 +8,7 @@ pkgver=git pkgrel=1 pkgdesc="Fraunhofer FDK AAC stripped from parts with patent concerns (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') msys2_references=( 'archlinux: libfdk-aac' ) diff --git a/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD index 84de4ca75b5..9d11ba74138 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD @@ -7,7 +7,7 @@ pkgver=0.17.3 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://github.com/libass/libass' msys2_references=( "cpe: cpe:/a:libass_project:libass" diff --git a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD index 1952b7daf77..d1860b5365d 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD @@ -3,11 +3,11 @@ _realname=libopenmpt pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=0.7.12 +pkgver=0.7.13 pkgrel=1 pkgdesc="A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://lib.openmpt.org/libopenmpt/' msys2_repository_url='https://github.com/OpenMPT/openmpt' msys2_references=( @@ -20,7 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-jellyfin-zlib" makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") source=("https://lib.openmpt.org/files/${_realname}/src/${_realname}-${pkgver}+release.autotools.tar.gz") -sha256sums=('79ab3ce3672601e525b5cc944f026c80c03032f37d39caa84c8ca3fdd75e0c98') +sha256sums=('dcd7cde4f9c498eb496c4556e1c1b81353e2a74747e8270a42565117ea42e1f1') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" diff --git a/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD index 2dec86bd946..122aacf8fb4 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.1.1 pkgrel=7 pkgdesc="An open video codec developed by the Xiph.org (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://xiph.org/" license=('BSD') depends=("${MINGW_PACKAGE_PREFIX}-jellyfin-libpng" diff --git a/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD index c0d23686163..bafa7bb5cb5 100644 --- a/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 epoch=2 pkgdesc='OpenCL (Open Computing Language) header files (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://registry.khronos.org/OpenCL/' license=('spdx:Apache-2.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" diff --git a/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD index e629ccdd230..a7d3eccd3ac 100644 --- a/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD @@ -3,11 +3,11 @@ _realname=x264 pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-libx264") -pkgver=0.164.r3191.da14df5 +pkgver=0.164.r3191.373697b pkgrel=1 pkgdesc="Library for encoding H264/AVC video streams (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.videolan.org/developers/x264.html" license=("custom") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" @@ -17,7 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" || echo "${MINGW_PACKAGE_PREFIX}-nasm" ) "git") options=('strip' 'staticlibs') -_commit="da14df5535fd46776fb1c9da3130973295c87aca" +_commit="373697b467f7cd0af88f1e9e32d4f10540df4687" source=("${_realname}"::"git+https://code.videolan.org/videolan/${_realname}.git#commit=${_commit}" 0001-beautify-pc.all.patch 0002-install-avisynth_c.h.mingw.patch diff --git a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD index 75c6de638b1..96e52f3f87a 100644 --- a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD @@ -8,7 +8,7 @@ pkgver=git pkgrel=1 pkgdesc='Open Source H265/HEVC video encoder (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') license=('GPL') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=( @@ -23,7 +23,7 @@ msys2_references=( "cpe: cpe:/a:multicorewareinc:x265" "cpe: cpe:/a:multicorewareinc:x265_high_efficiency_video_coding" ) -_commit="fa2770934b8f3d88aa866c77f27cb63f69a9ed39" +_commit="25f05ac76c6afcae97eae39d54eed005d82b93c9" source=("${_realname}"::"git+https://bitbucket.org/multicoreware/x265_git.git#commit=${_commit}") sha256sums=('SKIP') diff --git a/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD index 0162c5ae62d..be5586421e7 100644 --- a/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD @@ -7,7 +7,7 @@ pkgver=3.0.5 pkgrel=2 pkgdesc="Scaling, colorspace conversion, and dithering library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/sekrit-twc/zimg" license=('spdx:WTFPL') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" diff --git a/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD index b82ed8f12fb..cc9de8d739d 100644 --- a/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.4.35 pkgrel=1 pkgdesc='Header files for AMD Advanced Media Framework' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://github.com/GPUOpen-LibrariesAndSDKs/AMF/' license=('spdx:MIT') source=("${_realname}-${pkgver}.tar.gz::https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/v${pkgver}.tar.gz") diff --git a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD index e437fa3984a..7b47d74e6f8 100644 --- a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD @@ -3,11 +3,11 @@ _realname=libvpl pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=2.13.0 +pkgver=2.14.0 pkgrel=1 pkgdesc="Intel Video Processing Library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://intel.github.io/libvpl' msys2_repository_url="https://github.com/intel/libvpl" license=('spdx:MIT') diff --git a/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD index a3ada064600..aea7ba4f37a 100644 --- a/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD @@ -8,7 +8,7 @@ pkgver=2023.04.17 pkgrel=1 pkgdesc="OpenCL ICD Loader (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') msys2_references=( 'aur: mingw-w64-opencl-icd' )