From b45e5ad3954795c934298cb12b032d7c3adad848 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:25:22 -0500 Subject: [PATCH 1/7] intel-gmmlib: update to 22.3.2 --- srcpkgs/intel-gmmlib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template index 8ed6ed3cf56c..246fb392b005 100644 --- a/srcpkgs/intel-gmmlib/template +++ b/srcpkgs/intel-gmmlib/template @@ -1,6 +1,6 @@ # Template file for 'intel-gmmlib' pkgname=intel-gmmlib -version=22.2.0 +version=22.3.2 revision=1 archs="i686* x86_64*" build_style=cmake @@ -18,7 +18,7 @@ maintainer="Stefano Ragni " license="MIT" homepage="https://github.com/intel/gmmlib" distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz" -checksum=0b2253894c6fc8455b6d7c5e87e6504a76d6f60ea192e1445c2f93164bf529c0 +checksum=f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 lib32disabled=yes From 0190951c86fc8adb4c6b17ce540783d3abbfd5d5 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:25:47 -0500 Subject: [PATCH 2/7] intel-media-driver: update to 22.6.4 --- .../intel-media-driver/patches/execinfo.patch | 58 ------------------- srcpkgs/intel-media-driver/template | 14 +++-- 2 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 srcpkgs/intel-media-driver/patches/execinfo.patch diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch deleted file mode 100644 index 25d21192d5a1..000000000000 --- a/srcpkgs/intel-media-driver/patches/execinfo.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b17354142563b45e0ebf427485591426481368fd Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 29 Jul 2022 19:51:39 +0200 -Subject: [PATCH] Fix uClibc build - -uClibc does not provide execinfo.h ---- - CMakeLists.txt | 6 ++++++ - .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 053904748..4a3f0869e 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) - - option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) - -+include(CheckIncludeFileCXX) -+check_include_file_cxx("execinfo.h" HAVE_EXECINFO) -+if (HAVE_EXECINFO) -+ add_definitions(-DHAVE_EXECINFO) -+endif() -+ - include(GNUInstallDirs) - - if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX) -diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -index bde216b83..120b02d55 100644 ---- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -@@ -34,7 +34,9 @@ - #include - #include // fork - #include -+#ifdef HAVE_EXECINFO - #include // backtrace -+#endif - #include - #include // fstat - #include // System V IPC -@@ -2473,6 +2475,7 @@ void MosUtilities::MosTraceEvent( - MOS_FreeMemory(pTraceBuf); - } - } -+#ifdef HAVE_EXECINFO - if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) - { - // reserve space for header and stack size field. -@@ -2492,6 +2495,7 @@ void MosUtilities::MosTraceEvent( - size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); - } - } -+#endif - } - return; - } diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template index 1ca94569e117..18976578e5b8 100644 --- a/srcpkgs/intel-media-driver/template +++ b/srcpkgs/intel-media-driver/template @@ -1,18 +1,24 @@ # Template file for 'intel-media-driver' pkgname=intel-media-driver -version=22.5.3 +version=22.6.4 revision=1 -archs="x86_64*" +archs="i688* x86_64*" build_style=cmake -configure_args="-Wno-dev -DENABLE_NONFREE_KERNELS=$(vopt_if nonfree ON OFF)" +configure_args="-Wno-dev -DENABLE_NONFREE_KERNELS=$(vopt_if nonfree ON OFF) -DGEN8=OFF -DGEN9=OFF" hostmakedepends="pkg-config" makedepends="libva-devel libX11-devel intel-gmmlib-devel libpciaccess-devel" short_desc="Intel Media Driver for VAAPI (Broadwell+)" maintainer="Stefano Ragni " license="MIT, BSD-3-Clause" homepage="https://github.com/intel/media-driver" +#distfiles="https://github.com/intel/media-driver/archive/30937ac39c62a1c65143bc8167badb3086221a14.tar.gz" +#checksum=91b03adf296d79313d272e048d62f2dd5d61f39e9578d884e3fdf727da4d90b8 +#distfiles="https://github.com/intel/media-driver/archive/6c5c07df8bb35e2573b376800d091701957ca1b9.tar.gz" +#checksum=b966d62f0483474a050f789457770e1f6e21fc214188ac9292b8743a505b92b7 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz" -checksum=65652b365d48be3c9f0b3c561502952b92ee5fcc587520b88d0d752cf2a6a3b5 +#checksum=08d8d041f94b094a2dd5c4739c413b75185521c7f788a02411395ff374ee4ead +# 22.6.4 +checksum=0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 build_options="nonfree" desc_option_nonfree="Enable nonfree kernels" From ffbb4943c47ec6f74ff4cec771dee3689aad4815 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:29:32 -0500 Subject: [PATCH 3/7] mlt: update to 6.26.1 --- srcpkgs/mlt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 5d00583083fc..45f579ecd86b 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,7 +1,7 @@ # Template file for 'mlt' pkgname=mlt -version=6.22.1 -revision=4 +version=6.26.1 +revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE --enable-gpl --enable-gpl3 --disable-swfdec --without-kde @@ -18,7 +18,7 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=a3debdf0b8811f0d20c902cc3df3d05dad7d3ff36d1db16c0a7338d0d5989998 +checksum=8a484bbbf51f33e25312757531f3ad2ce20607149d20fcfcb40a3c1e60b20b4e CFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" CXXFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" From adcb9b507434c28993c52558f950ac2e114ace80 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:29:40 -0500 Subject: [PATCH 4/7] mlt7: update to 7.12.0 --- srcpkgs/mlt7/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 6c2fd36c4bba..e5972cc0411b 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -1,7 +1,7 @@ # Template file for 'mlt7' pkgname=mlt7 -version=7.8.0 -revision=2 +version=7.12.0 +revision=1 build_style=cmake configure_args="-DSWIG_PYTHON=ON" hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which @@ -16,7 +16,7 @@ maintainer="John " license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=4165e62e007e37d65e96517a45817517067897eedef4d83de7208dbd74b1f0f7 +checksum=41af600a5b223e067dff529d4ebe83bf8dee4efa807c8f928141e1174f13c45c if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From e6c181472e210fd492032986689605a10e24df9b Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:31:43 -0500 Subject: [PATCH 5/7] onevpl: new package v2023.1.0 --- srcpkgs/onevpl-devel | 1 + srcpkgs/onevpl/patches/path_max.patch | 10 ++++++++ srcpkgs/onevpl/template | 34 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 120000 srcpkgs/onevpl-devel create mode 100644 srcpkgs/onevpl/patches/path_max.patch create mode 100644 srcpkgs/onevpl/template diff --git a/srcpkgs/onevpl-devel b/srcpkgs/onevpl-devel new file mode 120000 index 000000000000..e2306500b487 --- /dev/null +++ b/srcpkgs/onevpl-devel @@ -0,0 +1 @@ +onevpl \ No newline at end of file diff --git a/srcpkgs/onevpl/patches/path_max.patch b/srcpkgs/onevpl/patches/path_max.patch new file mode 100644 index 000000000000..d97c61a13b22 --- /dev/null +++ b/srcpkgs/onevpl/patches/path_max.patch @@ -0,0 +1,10 @@ +--- a/dispatcher/test/unit/src/dispatcher_util.cpp 2022-11-10 16:02:54.000000000 -0500 ++++ b/dispatcher/test/unit/src/dispatcher_util.cpp 2022-12-16 13:08:40.247832899 -0500 +@@ -5,6 +5,7 @@ + ############################################################################*/ + + #include ++#include + + #include "src/dispatcher_common.h" + diff --git a/srcpkgs/onevpl/template b/srcpkgs/onevpl/template new file mode 100644 index 000000000000..a47eb1fdeaf0 --- /dev/null +++ b/srcpkgs/onevpl/template @@ -0,0 +1,34 @@ +# Template file for 'onevpl' +pkgname=onevpl +version=2023.1.0 +revision=1 +archs="x86_64*" +build_style=cmake +configure_args=" + -DCMAKE_BUILD_TYPE=Release -Wno-dev + -DBUILD_PYTHON_BINDING:BOOL='OFF' + -DBUILD_EXAMPLES:BOOL='OFF' + -DBUILD_TESTS:BOOL='ON' + -DINSTALL_EXAMPLE_CODE:BOOL='OFF'" +hostmakedepends="cmake libX11 python wayland-protocols pkg-config" +makedepends="libva-devel libX11-devel wayland-devel" +short_desc="Intel oneAPI Video Processing library" +maintainer="zlice " +license="MIT" +homepage="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onevpl.html" +distfiles="https://github.com/oneapi-src/oneVPL/archive/v${version}/${pkgname}-${version}.tar.gz" +checksum=0a1991278c64849f471e4b307a7c01f465a308674f359054886c32352e887b60 + +post_install() { + vlicense LICENSE +} + +onevpl-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 65edd015b111f1aba963847f804eddffe794fe45 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 12:26:03 -0500 Subject: [PATCH 6/7] intel-media-sdk: new package version 22.6.4 --- srcpkgs/intel-media-sdk/patches/musl.patch | 15 ++++++++ srcpkgs/intel-media-sdk/template | 44 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 srcpkgs/intel-media-sdk/patches/musl.patch create mode 100644 srcpkgs/intel-media-sdk/template diff --git a/srcpkgs/intel-media-sdk/patches/musl.patch b/srcpkgs/intel-media-sdk/patches/musl.patch new file mode 100644 index 000000000000..218cf3caaaf0 --- /dev/null +++ b/srcpkgs/intel-media-sdk/patches/musl.patch @@ -0,0 +1,15 @@ +--- a/tools/tracer/tracer/tracer_linux.cpp 2022-11-18 03:02:59.000000000 -0500 ++++ b/tools/tracer/tracer/tracer_linux.cpp 2022-12-16 13:52:37.124802710 -0500 +@@ -40,6 +40,11 @@ + #error Unsupported architecture + #endif + ++#ifndef RTLD_DEEPBIND ++// musl neither defines nor can use RTLD_DEEPBIND ++#define RTLD_DEEPBIND 0 ++#endif ++ + static const char* g_mfxlib; + static const char* g_mfxlib_in_dir; + + diff --git a/srcpkgs/intel-media-sdk/template b/srcpkgs/intel-media-sdk/template new file mode 100644 index 000000000000..d430b8d1f9cc --- /dev/null +++ b/srcpkgs/intel-media-sdk/template @@ -0,0 +1,44 @@ +# Template file for 'intel-media-sdk' +pkgname=intel-media-sdk +version=22.6.4 +revision=1 +archs="i686* x86_64*" +build_style=cmake +configure_args="-DBUILD_ALL:BOOL='ON' -DBUILD_TOOLS:BOOL='ON' + -DENABLE_ITT:BOOL='OFF' -DENABLE_OPENCL:BOOL='OFF' + -DENABLE_WAYLAND:BOOL=$(vopt_if wayland 'ON') + -DMFX_APPS_DIR='/usr/lib/mfx' -Wno-dev" +hostmakedepends="cmake llvm pkg-config python3 intel-media-driver + $(vopt_if wayland 'wayland-protocols wayland-devel')" +makedepends="libdrm-devel libva-devel intel-media-driver + libpciaccess-devel libxcb-devel + $(vopt_if wayland 'wayland-devel wayland-protocols')" +short_desc="C API to access hardware-accelerated video decode and encode" +maintainer="Orphaned " +license="MIT" +homepage="https://github.com/Intel-Media-SDK" +changelog="https://github.com/Intel-Media-SDK/MediaSDK/blob/master/CHANGELOG.md" +distfiles="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz" +checksum=197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 + +build_options="wayland" +build_options_default="wayland" + +post_install() { + vlicense LICENSE +} + +libmfx_package() { + short_desc="Intel-Media-SDK libmfx library" + pkg_install() { + vmove "usr/lib/libmfx*so*" + } +} + +libmfx-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include/mfx + vmove usr/lib/pkgconfig + } +} From 3cc84b6572870fbbf62a0bc64925dc9765b04a32 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 12:26:23 -0500 Subject: [PATCH 7/7] libmfx: new package version 22.6.4 --- common/shlibs | 1 + srcpkgs/libmfx | 1 + srcpkgs/libmfx-devel | 1 + 3 files changed, 3 insertions(+) create mode 120000 srcpkgs/libmfx create mode 120000 srcpkgs/libmfx-devel diff --git a/common/shlibs b/common/shlibs index b9fecc044025..02899ed99cb8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4224,3 +4224,4 @@ libfst.so.25 openfst-1.8.2_1 libvosk.so vosk-api-0.3.43_1 libdspy-1.so.1 d-spy-1.4.0_1 libpanel-1.so.1 libpanel-1.0.1_1 +libmfx.so.1 libmfx-22.6.4_1 diff --git a/srcpkgs/libmfx b/srcpkgs/libmfx new file mode 120000 index 000000000000..8ffc7099c227 --- /dev/null +++ b/srcpkgs/libmfx @@ -0,0 +1 @@ +intel-media-sdk \ No newline at end of file diff --git a/srcpkgs/libmfx-devel b/srcpkgs/libmfx-devel new file mode 120000 index 000000000000..8ffc7099c227 --- /dev/null +++ b/srcpkgs/libmfx-devel @@ -0,0 +1 @@ +intel-media-sdk \ No newline at end of file