Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.1] Update llvm version for Ubuntu jammy #239

Merged
merged 2 commits into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ case ${cli_release} in
'jammy')
release="ubuntu:jammy"
gcc_version="11"
llvm_version="14"
llvm_version="15"
;;
'kinetic')
release="ubuntu:kinetic"
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/20-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="d7d0bc6581e332f49c9ff628f548eced03c65189"
SCRIPT_COMMIT="547edbf1cbdccd46b2e8ff322a456eaa5931c5df"

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

SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960"
SCRIPT_COMMIT="11d93a81143ecb6c5ac7f67d7059bf11bd93ef35"

ffbuild_enabled() {
# Dependency of GPL-Only librubberband
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="6d7b8b22c4f4ca6cde1998997ae4ea2aa6e57d26"
SCRIPT_COMMIT="e78e2d29a95baf6053e30cc9422aa20319259803"

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

SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
SCRIPT_COMMIT="c2666a6d9a6ed18b1bfcef8176e25f62993e24db"
SCRIPT_COMMIT="ec3e747d2fe874f265464bb83a5705df39e2003f"

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="04a47932a3844f7e73e3af8b05fb98c8b54fb779"
SCRIPT_COMMIT="96ed20725c99275f286a9a9cf461548731b6828c"

ffbuild_enabled() {
return 0
Expand Down
4 changes: 2 additions & 2 deletions builder/scripts.d/45-opencl.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
SCRIPT_COMMIT="8c4f0111ccf2350a51655d8bbe862c7405f2c0db"
SCRIPT_COMMIT="ca7e258f681734b2ae1ef74ddf0808627a507889"

SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718"
SCRIPT_COMMIT2="617580b23fbf11233f6c7d365671edacd2bcd735"

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

SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
SCRIPT_COMMIT="74c03b4edfe61ff5f30cc0b61f7d2deff025c6a3"
SCRIPT_COMMIT="cfcc51836c1f2c174b67073cc8bed92e7e9c9569"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
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="eb166af8f9f4184108fe8e0611a09af03d12059e"
SCRIPT_COMMIT="96cbac89a02220eb21e13ca5fa7c8c5adf77028a"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/50-libxfixes.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/libxfixes.git"
SCRIPT_COMMIT="ad22c5ade8789cdb606b244336106a713473318c"
SCRIPT_COMMIT="c1cab28e27dd1c5a81394965248b57e490ccf2ca"

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

SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
SCRIPT_COMMIT="056feac0780220822e71a2fd38a83353102e5b36"
SCRIPT_COMMIT="179d7278d7485ceea2d440807be9d677d32aedc4"

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="4bfa819fc3d6aa4714ad28f8dab46d0fa95177ad"
SCRIPT_COMMIT="daee84bf3cde928dc1cd0b502c1b6a50cbff2495"

ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && 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="922bd82b4e0b4df1e23d8d4325417be812dfa23a"
SCRIPT_COMMIT="76e71ddf42b693a5b0502aefc786aa48b677e671"

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="0f42bd3fb81cd79dfaef5c6aef26c643c48be909"
SCRIPT_COMMIT="31b6d12892cebc57adccc62994f29ebbca828fa0"

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="349f4353dd638f2f85e7dd2d9df9a68f54d9919c"
SCRIPT_COMMIT="50ac4f7c97ae29ebf16e3364c057bdc46782a47d"

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

SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
SCRIPT_COMMIT="4cdf44ccaa605460499c52f39eff5517da2fc3c8"
SCRIPT_COMMIT="208c0d4e8c6fac9d2058e6a169a4322f94f5306a"

ffbuild_enabled() {
[[ $TARGET == *arm64 ]] && return -1
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="18952"
SCRIPT_REV="19009"

ffbuild_enabled() {
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="39822840c506d72cef5a742d28f32ea28e144345"
SCRIPT_COMMIT="b010763bdb6f5dc8c7c43ed34440465be9c735cf"

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="f338431ff69b258686b575ef9a0520fa857399fe"
SCRIPT_COMMIT="21f84cffd13eac92ac73c3c40853e1d1309fb0e9"

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

SCRIPT_REPO="https://github.com/intel/libva.git"
SCRIPT_COMMIT="3aadcf0e8035e320b6be1fedb4d5fb5182b63377"
SCRIPT_COMMIT="d46b38374a2c07ea3773fb96d4a8b1146173c27f"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && 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="c07d076cf20ab41d8077a804dda70fdbc3b97386"
SCRIPT_COMMIT="753305affb093ae15d5e4b333125267b16258c21"

ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
Expand Down
6 changes: 3 additions & 3 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ prepare_extra_amd64() {
# Provides MSDK runtime (libmfxhw64.so.1) for 11th Gen Rocket Lake and older
# Provides MFX dispatcher (libmfx.so.1) for FFmpeg
pushd ${SOURCE_DIR}
git clone -b intel-mediasdk-23.1.5 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git
git clone -b intel-mediasdk-23.1.6 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git
pushd MediaSDK
sed -i 's|MFX_PLUGINS_CONF_DIR "/plugins.cfg"|"/usr/lib/jellyfin-ffmpeg/lib/mfx/plugins.cfg"|g' api/mfx_dispatch/linux/mfxloader.cpp
mkdir build && pushd build
Expand Down Expand Up @@ -296,7 +296,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-23.1.5 --depth=1 https://github.com/intel/media-driver.git
git clone -b intel-media-23.1.6 --depth=1 https://github.com/intel/media-driver.git
pushd media-driver
# Possible fix for TGLx timeout caused by 'HCP Scalability Decode' under heavy load
wget -q -O - https://github.com/intel/media-driver/commit/284750bf.patch | git apply
Expand Down Expand Up @@ -382,7 +382,7 @@ prepare_extra_amd64() {
pushd ${SOURCE_DIR}
git clone https://gitlab.freedesktop.org/mesa/mesa.git
pushd mesa
git reset --hard "1995762d"
git reset --hard "4b182dbc"
popd
# disable the broken hevc packed header
MESA_VA_PIC="mesa/src/gallium/frontends/va/picture.c"
Expand Down