Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
  • Loading branch information
nyanmisaka committed Sep 28, 2024
1 parent c8c4672 commit fe4c5f4
Show file tree
Hide file tree
Showing 30 changed files with 41 additions and 40 deletions.
2 changes: 1 addition & 1 deletion builder/scripts.d/10-mingw.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
SCRIPT_COMMIT="1b554dec06f8d3c26b856a7d1575f396d8ffa403"
SCRIPT_COMMIT="d2491a9358bddc9573d0ff2fa73989e3175c2009"

ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/10-xorg-macros.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
SCRIPT_COMMIT="7ed2b3798c030bd1729b699b446b43aba2ec606e"
SCRIPT_COMMIT="91ece2a5f6408d34074522c8588ef1c53478daa0"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-freetype.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
SCRIPT_COMMIT="d2612e1c3ff839595fbf67c8263a07d6bac3aaf5"
SCRIPT_COMMIT="c82745878da1acef2ce6bd7e17a8d59b8612d509"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-fribidi.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
SCRIPT_COMMIT="3826589ea556da613bd42742a169789469e8b635"
SCRIPT_COMMIT="68162babff4f39c4e2dc164a5e825af93bda9983"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-libxml2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
SCRIPT_COMMIT="40abebbc739fb4cddfc205eeb129cefe9b9f6e5b"
SCRIPT_COMMIT="d67833a3c5db7999820a73e356327d47ec76bea9"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-harfbuzz.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
SCRIPT_COMMIT="a070f9ebbe88dc71b248af9731dd49ec93f4e6e6"
SCRIPT_COMMIT="c7ef6a2ed58ae8ec108ee0962bef46f42c73a60c"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/40-libx11.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
SCRIPT_COMMIT="19b2f5c2d0935cbf9c17ecf30604f80592807b59"
SCRIPT_COMMIT="86e71472bc826ac5c850e200cb3820485b5689cf"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/50-libxi.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
SCRIPT_COMMIT="a5af26c654b4da5fd5eaaeaa2173c734ab9e63ec"
SCRIPT_COMMIT="3c2d5aedd7708c75710b39268631762de904c304"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/60-libxcursor.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
SCRIPT_COMMIT="09617bcc9a0f1b5072212da5f8fede92ab85d157"
SCRIPT_COMMIT="833735e3232e28153411b3703dfe51883edf47ea"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-amf.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
SCRIPT_COMMIT="a6fca4a3bb5585bd0bca4d1a531c40e39f5f572b"
SCRIPT_COMMIT="3db6164375ca62337e068193658f7cb10f0c42f9"

ffbuild_enabled() {
[[ $TARGET == mac* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-dav1d.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
SCRIPT_COMMIT="bdef29970a5848dc1bfc706146253931cde0b3f6"
SCRIPT_COMMIT="f2c3ccd6a649a25d718cb0c8e8b6196fdbd2407f"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libass.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/libass/libass.git"
SCRIPT_COMMIT="3a7a9b99e75fb094f243d4b086b414556a0d9947"
SCRIPT_COMMIT="5298859c298d3c570d8d7e3b883a0d63490659b8"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libopus.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/xiph/opus.git"
SCRIPT_COMMIT="5854a9f7de06ab3505b8fe6e8943db581c2cbe70"
SCRIPT_COMMIT="ff6dea5e1a72b8a2aeb7fc3656857d86a420ab89"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libvpx.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
SCRIPT_COMMIT="fbf63dff1f528d44f24bd662abb89fd01a4a1c25"
SCRIPT_COMMIT="32de9c2becdd5d96d84d37be9f7fb9de43f24a4d"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libwebp.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
SCRIPT_COMMIT="2e81017c7a345f687223086cbc177a8459a18b52"
SCRIPT_COMMIT="220ee52967c121adf3c690fbd0605a7de6371943"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-openmpt.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
SCRIPT_REV="21571"
SCRIPT_REV="21767"

ffbuild_enabled() {
return 0
Expand Down
3 changes: 2 additions & 1 deletion builder/scripts.d/50-rkmpp.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/nyanmisaka/mpp.git"
SCRIPT_COMMIT="d7f8a2f7cd59f4c38c0d28d85fbb5e4eb307290e"
SCRIPT_COMMIT="cfad02b76ad90e8e3ad765fef0382a1901e75895"
SCRIPT_BRANCH="jellyfin-mpp"

ffbuild_enabled() {
[[ $TARGET == linux* ]] && [[ $TARGET == *arm64 ]] && return 0
Expand Down
1 change: 1 addition & 0 deletions builder/scripts.d/50-rkrga.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

SCRIPT_REPO="https://github.com/nyanmisaka/rk-mirrors.git"
SCRIPT_COMMIT="e97e327662d1c0867d4cbcc01d5caf15250fc4e7"
SCRIPT_BRANCH="jellyfin-rga"

ffbuild_enabled() {
[[ $TARGET == linux* ]] && [[ $TARGET == *arm64 ]] && return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-srt.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/Haivision/srt.git"
SCRIPT_COMMIT="9c7206f0190c0c800a5ee1e71ee61ec0d4c7e216"
SCRIPT_COMMIT="a7b3711a8a862e697f641b296743cc7c921f5fba"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-svtav1.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
SCRIPT_COMMIT="55a01def732bb9e7016d23cc512384f7a88d6e86"
SCRIPT_COMMIT="aa853f1d4f31491916a9b6ccf16ab8be410de399"

ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vaapi/40-libdrm.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
SCRIPT_COMMIT="25dec5b91fe4d2638787d033a0b22b6c1dc145e0"
SCRIPT_COMMIT="0a1162e2af357be00610377f297600806b90deca"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vulkan/45-vulkan.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
SCRIPT_COMMIT="v1.3.295"
SCRIPT_COMMIT="v1.3.296"
SCRIPT_TAGFILTER="v?.*.*"

ffbuild_enabled() {
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vulkan/55-spirv-cross.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
SCRIPT_COMMIT="6a1fb66eef1bdca14acf7d0a51a3f883499d79f0"
SCRIPT_COMMIT="b28b3559d3882f918825cd90342dcfa955770bad"

ffbuild_enabled() {
[[ $TARGET == mac* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-x265.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
SCRIPT_COMMIT="cdf897bfba098666e673a64a96fda4c057318699"
SCRIPT_COMMIT="a009ec07721b1e7fcf5289619a3cd5dd6b67a546"

ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
Expand Down
6 changes: 3 additions & 3 deletions docker-build-win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o errexit
set -o xtrace

# Update mingw-w64 headers
mingw_commit="1b554dec06f8d3c26b856a7d1575f396d8ffa403"
mingw_commit="d2491a9358bddc9573d0ff2fa73989e3175c2009"
git clone https://git.code.sf.net/p/mingw-w64/mingw-w64.git
pushd mingw-w64/mingw-w64-headers
git checkout ${mingw_commit}
Expand Down Expand Up @@ -189,7 +189,7 @@ popd
popd

# HARFBUZZ
git clone -b 9.0.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git
git clone -b 10.0.1 --depth=1 https://github.com/harfbuzz/harfbuzz.git
meson setup harfbuzz harfbuzz_build \
--prefix=${FF_DEPS_PREFIX} \
--cross-file=${FF_MESON_TOOLCHAIN} \
Expand Down Expand Up @@ -320,7 +320,7 @@ popd
# OPENMPT
mkdir mpt
pushd mpt
mpt_ver="0.7.9"
mpt_ver="0.7.10"
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
Expand Down
8 changes: 4 additions & 4 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ prepare_extra_common() {

# FRIBIDI
pushd ${SOURCE_DIR}
git clone -b v1.0.15 --depth=1 https://github.com/fribidi/fribidi.git
git clone -b v1.0.16 --depth=1 https://github.com/fribidi/fribidi.git
meson setup fribidi fribidi_build \
${MESON_CROSS_OPT} \
--prefix=${TARGET_DIR} \
Expand Down Expand Up @@ -140,7 +140,7 @@ prepare_extra_common() {

# HARFBUZZ
pushd ${SOURCE_DIR}
git clone -b 9.0.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git
git clone -b 10.0.1 --depth=1 https://github.com/harfbuzz/harfbuzz.git
meson setup harfbuzz harfbuzz_build \
${MESON_CROSS_OPT} \
--prefix=${TARGET_DIR} \
Expand Down Expand Up @@ -480,7 +480,7 @@ prepare_extra_amd64() {

# Vulkan Headers
pushd ${SOURCE_DIR}
git clone -b v1.3.295 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git
git clone -b v1.3.296 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git
pushd Vulkan-Headers
mkdir build && pushd build
cmake \
Expand All @@ -493,7 +493,7 @@ prepare_extra_amd64() {

# Vulkan ICD Loader
pushd ${SOURCE_DIR}
git clone -b v1.3.295 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git
git clone -b v1.3.296 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git
pushd Vulkan-Loader
mkdir build && pushd build
cmake \
Expand Down
9 changes: 4 additions & 5 deletions msys2/PKGBUILD/15-mingw-w64-libpng/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
_realname=libpng
pkgbase=mingw-w64-jellyfin-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}"
pkgver=1.6.43
_apngver=1.6.40
pkgver=1.6.44
pkgrel=1
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
Expand All @@ -22,9 +21,9 @@ msys2_references=(
options=('strip' '!libtool' 'staticlibs')
# apng: https://github.com/mozilla/gecko-dev/commits/master/media/libpng/apng.patch
source=("https://downloads.sourceforge.net/sourceforge/libpng/${_realname}-${pkgver}.tar.xz"
"https://raw.githubusercontent.com/mozilla/gecko-dev/ee4f298265cc851314bf431fb0efccba6af15f74/media/libpng/apng.patch")
sha256sums=('6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c'
'2a65fa19b126e85ad14ef1d1d9fc5079193e92af6b8db4454e3a875da5fdb79d')
"https://raw.githubusercontent.com/mozilla/gecko-dev/8c08a880a379953fedc7a16515bb13db0e837179/media/libpng/apng.patch")
sha256sums=('60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e'
'93a47b192b1018a13ac53eed8c25c890c5c8538755b1dd042adf291863ebe5a7')
validpgpkeys=('8048643BA2C840F4F92A195FF54984BFA16C640F') # Glenn Randers-Pehrson (mozilla) <glennrp+bmo@gmail.com>

export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild"
Expand Down
4 changes: 2 additions & 2 deletions msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
_realname=harfbuzz
pkgbase=mingw-w64-jellyfin-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}")
pkgver=9.0.0
pkgver=10.0.1
pkgrel=1
pkgdesc="OpenType text shaping engine"
arch=('any')
Expand All @@ -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=('a41b272ceeb920c57263ec851604542d9ec85ee3030506d94662067c7b6ab89e'
sha256sums=('b2cb13bd351904cb9038f907dc0dee0ae07127061242fe3556b2795c4e9748fc'
'26b37a1ca9872973905ecb96bcbe3f054472252320956faa74428206900d360e')
noextract=("harfbuzz-${pkgver}.tar.xz")

Expand Down
4 changes: 2 additions & 2 deletions msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=libopenmpt
pkgbase=mingw-w64-jellyfin-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}")
pkgver=0.7.9
pkgver=0.7.10
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')
Expand All @@ -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=('0386e918d75d797e79d5b14edd0847165d8b359e9811ef57652c0a356a2dfcf4')
sha256sums=('093713c1c1024f4f10c4779a66ceb2af51fb7c908a9e99feb892d04019220ba1')

export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}"
export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild"
Expand Down
2 changes: 1 addition & 1 deletion msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ msys2_references=(
"cpe: cpe:/a:multicorewareinc:x265"
"cpe: cpe:/a:multicorewareinc:x265_high_efficiency_video_coding"
)
_commit="cdf897bfba098666e673a64a96fda4c057318699"
_commit="a009ec07721b1e7fcf5289619a3cd5dd6b67a546"
source=("${_realname}"::"git+https://bitbucket.org/multicoreware/x265_git.git#commit=${_commit}")
sha256sums=('SKIP')

Expand Down

0 comments on commit fe4c5f4

Please sign in to comment.