Update Mesa and Intel dependencies

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka
2025-05-15 08:30:01 +08:00
parent 7aa774badd
commit df8d8a4d47
4 changed files with 15 additions and 10 deletions
+3 -1
View File
@@ -1,7 +1,7 @@
#!/bin/bash
SCRIPT_REPO="https://github.com/intel/libvpl.git"
SCRIPT_COMMIT="025d43d086a3e663184cb49febe86152bf05409f"
SCRIPT_COMMIT="c45b5d786bf7cdabbe49ff1bab78693ad78feb78"
ffbuild_enabled() {
[[ $TARGET == mac* ]] && return -1
@@ -25,6 +25,8 @@ ffbuild_dockerbuild() {
ninja install
rm -rf "$FFBUILD_PREFIX"/{etc,share}
echo "Libs.private: -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/vpl.pc
}
ffbuild_configure() {
+2 -1
View File
@@ -558,7 +558,7 @@ popd
popd
# VPL
git clone -b v2.14.0 --depth=1 https://github.com/intel/libvpl.git
git clone -b v2.15.0 --depth=1 https://github.com/intel/libvpl.git
pushd libvpl
mkdir build && pushd build
cmake \
@@ -573,6 +573,7 @@ cmake \
..
make -j$(nproc)
make install
echo "Libs.private: -lstdc++" >> ${FF_DEPS_PREFIX}/lib/pkgconfig/vpl.pc
popd
popd
+7 -7
View File
@@ -414,7 +414,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.14.0 --depth=1 https://github.com/intel/libvpl.git
git clone -b v2.15.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
@@ -427,6 +427,7 @@ prepare_extra_amd64() {
-DBUILD_{TESTS,EXAMPLES,EXPERIMENTAL}=OFF \
..
make -j$(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/intel
echo "Libs.private: -lstdc++" >> ${TARGET_DIR}/lib/pkgconfig/vpl.pc
echo "intel${TARGET_DIR}/lib/libvpl.so* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST}
popd
popd
@@ -435,7 +436,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-25.2.1 --depth=1 https://github.com/intel/vpl-gpu-rt.git
git clone -b intel-onevpl-25.2.2 --depth=1 https://github.com/intel/vpl-gpu-rt.git
pushd vpl-gpu-rt
# Fix missing entries in PicStruct validation
wget -q -O - https://github.com/intel/vpl-gpu-rt/commit/c7eb030.patch | git apply
@@ -457,12 +458,10 @@ 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-25.2.1 --depth=1 https://github.com/intel/media-driver.git
git clone -b intel-media-25.2.2 --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/25fb926.patch | git apply
# Fix DG1 support in upstream i915 KMD (prod DKMS is not required)
wget -q -O - https://github.com/intel/media-driver/commit/93c07d9.patch | git apply
mkdir build && pushd build
cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
-DENABLE_KERNELS=ON \
@@ -556,14 +555,15 @@ prepare_extra_amd64() {
pushd ${SOURCE_DIR}
mkdir mesa
pushd mesa
mesa_ver="mesa-25.0.5"
mesa_ver="mesa-25.0.6"
mesa_link="https://gitlab.freedesktop.org/mesa/mesa/-/archive/${mesa_ver}/mesa-${mesa_ver}.tar.gz"
wget ${mesa_link} -O mesa.tar.gz
tar xaf mesa.tar.gz
# Cherry-pick fixes targeting mesa-stable
wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/ee4d7e98.patch | git -C mesa-${mesa_ver} apply
wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/8aadce68.patch | git -C mesa-${mesa_ver} apply
wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/cb9ae704.patch | git -C mesa-${mesa_ver} apply
wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/3db6eaad.patch | git -C mesa-${mesa_ver} apply
wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/8d9022b8.patch | git -C mesa-${mesa_ver} apply
meson setup mesa-${mesa_ver} mesa_build \
--prefix=${TARGET_DIR} \
--libdir=lib \
+3 -1
View File
@@ -3,7 +3,7 @@
_realname=libvpl
pkgbase=mingw-w64-jellyfin-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}")
pkgver=2.14.0
pkgver=2.15.0
pkgrel=1
pkgdesc="Intel Video Processing Library (mingw-w64)"
arch=('any')
@@ -79,4 +79,6 @@ package() {
rm -r "${pkgdir}${FF_MINGW_PREFIX}/share/vpl/examples"
install -Dm644 "${srcdir}/libvpl-${pkgver}/LICENSE" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
echo "Libs.private: -lstdc++" >> "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/vpl.pc
}