From cb90745b2dc127a68a2faca30200b9354177abfb Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:25:22 -0500 Subject: [PATCH 1/6] intel-gmmlib: update to 22.3.3 --- 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 04e407b1de4d3..d9fa4c6fbd83c 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.3 revision=1 archs="i686* x86_64*" build_style=cmake @@ -18,7 +18,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/intel/gmmlib" distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz" -checksum=0b2253894c6fc8455b6d7c5e87e6504a76d6f60ea192e1445c2f93164bf529c0 +checksum=86651bd2803c9f0afd82471bec784e65d2b418dee315a053d22215eb2a679be7 lib32disabled=yes From 2d2fd54a4e64703a0343a75fac6169ab86ce6ba9 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:25:47 -0500 Subject: [PATCH 2/6] intel-media-driver: update to 22.6.4 --- ...mmon-Enable-MMC-in-free-kernel-build.patch | 125 ++++++++++++++++++ .../intel-media-driver/patches/execinfo.patch | 58 -------- srcpkgs/intel-media-driver/template | 4 +- 3 files changed, 127 insertions(+), 60 deletions(-) create mode 100644 srcpkgs/intel-media-driver/patches/0001-Media-Common-Enable-MMC-in-free-kernel-build.patch delete mode 100644 srcpkgs/intel-media-driver/patches/execinfo.patch diff --git a/srcpkgs/intel-media-driver/patches/0001-Media-Common-Enable-MMC-in-free-kernel-build.patch b/srcpkgs/intel-media-driver/patches/0001-Media-Common-Enable-MMC-in-free-kernel-build.patch new file mode 100644 index 0000000000000..525fb688722c8 --- /dev/null +++ b/srcpkgs/intel-media-driver/patches/0001-Media-Common-Enable-MMC-in-free-kernel-build.patch @@ -0,0 +1,125 @@ +From e68feab7db036838d9521ba3b9f00717c37c024c Mon Sep 17 00:00:00 2001 +From: JayYang +Date: Tue, 21 Mar 2023 17:17:55 +0800 +Subject: [PATCH] [Media Common] Enable MMC in free kernel build + +Add mmc build definition in free kernel build +--- + media_driver/agnostic/gen9/codec/hal/media_srcs.cmake | 2 +- + media_driver/cmake/linux/media_feature_flags_linux.cmake | 3 +-- + .../media_interfaces_m9_bxt/media_interfaces_g9_bxt.cpp | 2 +- + .../media_interfaces_m9_cfl/media_interfaces_g9_cfl.cpp | 2 +- + .../media_interfaces_m9_glk/media_interfaces_g9_glk.cpp | 2 +- + .../media_interfaces_m9_kbl/media_interfaces_g9_kbl.cpp | 2 +- + .../media_interfaces_m9_skl/media_interfaces_g9_skl.cpp | 2 +- + 7 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/media_driver/agnostic/gen9/codec/hal/media_srcs.cmake b/media_driver/agnostic/gen9/codec/hal/media_srcs.cmake +index 8bb36bafe..78902a22d 100644 +--- a/media_driver/agnostic/gen9/codec/hal/media_srcs.cmake ++++ b/media_driver/agnostic/gen9/codec/hal/media_srcs.cmake +@@ -27,7 +27,7 @@ set(TMP_1_HEADERS_ + ${CMAKE_CURRENT_LIST_DIR}/codechal_hw_g9_X.h + ) + +-if(${MMC_Supported} STREQUAL "yes") ++if(${MMC_Supported} STREQUAL "yes" AND ENABLE_NONFREE_KERNELS AND ENABLE_KERNELS) + set(TMP_1_SOURCES_ + ${TMP_1_SOURCES_} + ${CMAKE_CURRENT_LIST_DIR}/codechal_memdecomp_g9.cpp +diff --git a/media_driver/cmake/linux/media_feature_flags_linux.cmake b/media_driver/cmake/linux/media_feature_flags_linux.cmake +index de0ca853f..8121ea60c 100644 +--- a/media_driver/cmake/linux/media_feature_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_feature_flags_linux.cmake +@@ -35,7 +35,6 @@ if(NOT ENABLE_KERNELS OR NOT ENABLE_NONFREE_KERNELS) + bs_set_if_undefined(HEVC_Encode_VME_Supported "no") + bs_set_if_undefined(MPEG2_Encode_VME_Supported "no") + bs_set_if_undefined(CMRT_HEVC_ENC_FEI_Supported "no") +- bs_set_if_undefined(MMC_Supported "no") + bs_set_if_undefined(VC1_Decode_Supported "no") + bs_set_if_undefined(Decode_Processing_Supported "no") + bs_set_if_undefined(Kernel_Auto_Denoise_Supported "no") +@@ -46,7 +45,6 @@ else() + bs_set_if_undefined(HEVC_Encode_VME_Supported "${Encode_VME_Supported}") + bs_set_if_undefined(MPEG2_Encode_VME_Supported "${Encode_VME_Supported}") + bs_set_if_undefined(CMRT_HEVC_ENC_FEI_Supported "yes") +- bs_set_if_undefined(MMC_Supported "yes") + bs_set_if_undefined(VC1_Decode_Supported "yes") + bs_set_if_undefined(Decode_Processing_Supported "yes") + bs_set_if_undefined(Kernel_Auto_Denoise_Supported "yes") +@@ -64,6 +62,7 @@ bs_set_if_undefined(VP9_Decode_Supported "yes") + bs_set_if_undefined(VP_SFC_Supported "yes") + bs_set_if_undefined(Common_Encode_Supported "yes") + bs_set_if_undefined(Media_Scalability_Supported "yes") ++bs_set_if_undefined(MMC_Supported "yes") + + # features controlled by global flag Encode_VDEnc_Supported + bs_set_if_undefined(AVC_Encode_VDEnc_Supported "${Encode_VDEnc_Supported}") +diff --git a/media_driver/media_interface/media_interfaces_m9_bxt/media_interfaces_g9_bxt.cpp b/media_driver/media_interface/media_interfaces_m9_bxt/media_interfaces_g9_bxt.cpp +index 3f306ee2a..8e4c0f532 100644 +--- a/media_driver/media_interface/media_interfaces_m9_bxt/media_interfaces_g9_bxt.cpp ++++ b/media_driver/media_interface/media_interfaces_m9_bxt/media_interfaces_g9_bxt.cpp +@@ -135,7 +135,7 @@ MOS_STATUS MhwInterfacesG9Bxt::Initialize( + + return MOS_STATUS_SUCCESS; + } +-#ifdef _MMC_SUPPORTED ++#if defined(_MMC_SUPPORTED) && defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE) + static bool bxtRegisteredMmd = + MediaFactory:: + Register((uint32_t)IGFX_BROXTON); +diff --git a/media_driver/media_interface/media_interfaces_m9_cfl/media_interfaces_g9_cfl.cpp b/media_driver/media_interface/media_interfaces_m9_cfl/media_interfaces_g9_cfl.cpp +index b8fa1eec0..84e0fad1d 100644 +--- a/media_driver/media_interface/media_interfaces_m9_cfl/media_interfaces_g9_cfl.cpp ++++ b/media_driver/media_interface/media_interfaces_m9_cfl/media_interfaces_g9_cfl.cpp +@@ -44,7 +44,7 @@ static bool cflRegisteredMhw = + MediaFactory:: + Register((uint32_t)IGFX_COFFEELAKE); + +-#ifdef _MMC_SUPPORTED ++#if defined(_MMC_SUPPORTED) && defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE) + static bool cflRegisteredMmd = + MediaFactory:: + Register((uint32_t)IGFX_COFFEELAKE); +diff --git a/media_driver/media_interface/media_interfaces_m9_glk/media_interfaces_g9_glk.cpp b/media_driver/media_interface/media_interfaces_m9_glk/media_interfaces_g9_glk.cpp +index de81e6091..2638cb3a6 100644 +--- a/media_driver/media_interface/media_interfaces_m9_glk/media_interfaces_g9_glk.cpp ++++ b/media_driver/media_interface/media_interfaces_m9_glk/media_interfaces_g9_glk.cpp +@@ -65,7 +65,7 @@ static bool glkRegisteredMhw = + MediaFactory:: + Register((uint32_t)IGFX_GEMINILAKE); + +-#ifdef _MMC_SUPPORTED ++#if defined(_MMC_SUPPORTED) && defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE) + static bool glkRegisteredMmd = + MediaFactory:: + Register((uint32_t)IGFX_GEMINILAKE); +diff --git a/media_driver/media_interface/media_interfaces_m9_kbl/media_interfaces_g9_kbl.cpp b/media_driver/media_interface/media_interfaces_m9_kbl/media_interfaces_g9_kbl.cpp +index 99d786185..4e9c6e7f1 100644 +--- a/media_driver/media_interface/media_interfaces_m9_kbl/media_interfaces_g9_kbl.cpp ++++ b/media_driver/media_interface/media_interfaces_m9_kbl/media_interfaces_g9_kbl.cpp +@@ -131,7 +131,7 @@ MOS_STATUS MhwInterfacesG9Kbl::Initialize( + + return MOS_STATUS_SUCCESS; + } +-#ifdef _MMC_SUPPORTED ++#if defined(_MMC_SUPPORTED) && defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE) + static bool kblRegisteredMmd = + MediaFactory:: + Register((uint32_t)IGFX_KABYLAKE); +diff --git a/media_driver/media_interface/media_interfaces_m9_skl/media_interfaces_g9_skl.cpp b/media_driver/media_interface/media_interfaces_m9_skl/media_interfaces_g9_skl.cpp +index e2520edf7..4b0012c64 100644 +--- a/media_driver/media_interface/media_interfaces_m9_skl/media_interfaces_g9_skl.cpp ++++ b/media_driver/media_interface/media_interfaces_m9_skl/media_interfaces_g9_skl.cpp +@@ -139,7 +139,7 @@ MOS_STATUS MhwInterfacesG9Skl::Initialize( + + return MOS_STATUS_SUCCESS; + } +-#ifdef _MMC_SUPPORTED ++#if defined(_MMC_SUPPORTED) && defined(ENABLE_KERNELS) && !defined(_FULL_OPEN_SOURCE) + static bool sklRegisteredMmd = + MediaFactory:: + Register((uint32_t)IGFX_SKYLAKE); +-- +2.40.0 + diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch deleted file mode 100644 index 25d21192d5a1d..0000000000000 --- 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 a5bab06ac9476..8a920840acdfe 100644 --- a/srcpkgs/intel-media-driver/template +++ b/srcpkgs/intel-media-driver/template @@ -1,6 +1,6 @@ # Template file for 'intel-media-driver' pkgname=intel-media-driver -version=22.5.3 +version=22.6.4 revision=1 archs="x86_64*" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Orphaned " license="MIT, BSD-3-Clause" homepage="https://github.com/intel/media-driver" distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz" -checksum=65652b365d48be3c9f0b3c561502952b92ee5fcc587520b88d0d752cf2a6a3b5 +checksum=0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 build_options="nonfree" desc_option_nonfree="Enable nonfree kernels" From f12b3b07dec109c6b6a686a15e0725766020d662 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:31:43 -0500 Subject: [PATCH 3/6] New package: onevpl-2023.1.2 --- common/shlibs | 2 ++ srcpkgs/onevpl-devel | 1 + srcpkgs/onevpl/template | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 120000 srcpkgs/onevpl-devel create mode 100644 srcpkgs/onevpl/template diff --git a/common/shlibs b/common/shlibs index 2d528aa798ee5..eff37394b4545 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4326,3 +4326,5 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1 libvmaf.so.1 vmaf-2.3.1_1 liblc3.so.1 liblc3-1.0.3_1 libmimalloc.so.2 mimalloc-2.1.2_1 +libmfx.so.1 libmfx-22.6.4_1 +libvpl.so.2 onevpl-2023.1.2_1 diff --git a/srcpkgs/onevpl-devel b/srcpkgs/onevpl-devel new file mode 120000 index 0000000000000..e2306500b4871 --- /dev/null +++ b/srcpkgs/onevpl-devel @@ -0,0 +1 @@ +onevpl \ No newline at end of file diff --git a/srcpkgs/onevpl/template b/srcpkgs/onevpl/template new file mode 100644 index 0000000000000..85c7c2da85ce9 --- /dev/null +++ b/srcpkgs/onevpl/template @@ -0,0 +1,34 @@ +# Template file for 'onevpl' +pkgname=onevpl +version=2023.1.2 +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=b2261cca174ce1815f3d47c647921ab17f68267c69c1e2444ff27aab7d199cbb + +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 ed5aa50f44a2cf03110ddaeaed10fa9440622d8b Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 15:27:04 -0500 Subject: [PATCH 4/6] New package: onevpl-intel-gpu-22.6.4 --- srcpkgs/onevpl-intel-gpu-devel | 1 + srcpkgs/onevpl-intel-gpu/template | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 120000 srcpkgs/onevpl-intel-gpu-devel create mode 100644 srcpkgs/onevpl-intel-gpu/template diff --git a/srcpkgs/onevpl-intel-gpu-devel b/srcpkgs/onevpl-intel-gpu-devel new file mode 120000 index 0000000000000..47920ceecf919 --- /dev/null +++ b/srcpkgs/onevpl-intel-gpu-devel @@ -0,0 +1 @@ +onevpl-intel-gpu \ No newline at end of file diff --git a/srcpkgs/onevpl-intel-gpu/template b/srcpkgs/onevpl-intel-gpu/template new file mode 100644 index 0000000000000..f14acb728a54d --- /dev/null +++ b/srcpkgs/onevpl-intel-gpu/template @@ -0,0 +1,27 @@ +# Template file for 'onevpl-intel-gpu' +pkgname=onevpl-intel-gpu +version=22.6.4 +revision=1 +archs="x86_64*" +build_style=cmake +configure_args="-Wno-dev -DCMAKE_BUILD_TYPE=Release" +hostmakedepends="cmake pkg-config" +makedepends="libdrm-devel libva-devel onevpl-devel" +short_desc="Runtime implementation of oneVPL API for Intel Gen GPUs" +maintainer="zlice " +license="MIT" +homepage="https://github.com/oneapi-src/oneVPL-intel-gpu" +changelog="https://github.com/oneapi-src/oneVPL-intel-gpu/blob/main/CHANGELOG.md" +distfiles="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${version}.tar.gz" +checksum=74b0979dcb2af1b7c68edb8cbcb02d539de511090b12fac50652cbacd707c4e6 + +post_install() { + vlicense LICENSE +} + +onevpl-intel-gpu-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/lib/pkgconfig + } +} From b64e01d2dbeeb7b9b4a8024babcac4279e248291 Mon Sep 17 00:00:00 2001 From: zlice Date: Sun, 18 Dec 2022 01:18:17 -0500 Subject: [PATCH 5/6] New package: intel-media-sdk-22.6.4 --- srcpkgs/intel-media-sdk/patches/musl.patch | 14 ++++++++ srcpkgs/intel-media-sdk/template | 37 ++++++++++++++++++++++ srcpkgs/intel-media-sdk/update | 1 + srcpkgs/libmfx | 1 + srcpkgs/libmfx-devel | 1 + 5 files changed, 54 insertions(+) create mode 100644 srcpkgs/intel-media-sdk/patches/musl.patch create mode 100644 srcpkgs/intel-media-sdk/template create mode 100644 srcpkgs/intel-media-sdk/update create mode 120000 srcpkgs/libmfx create mode 120000 srcpkgs/libmfx-devel diff --git a/srcpkgs/intel-media-sdk/patches/musl.patch b/srcpkgs/intel-media-sdk/patches/musl.patch new file mode 100644 index 0000000000000..4ae70924b744f --- /dev/null +++ b/srcpkgs/intel-media-sdk/patches/musl.patch @@ -0,0 +1,14 @@ +--- a/tools/tracer/tracer/tracer_linux.cpp 2022-11-18 03:02:59.000000000 -0500 ++++ b/tools/tracer/tracer/tracer_linux.cpp 2022-12-18 01:44:51.341542572 -0500 +@@ -32,6 +32,11 @@ + #include + #include "tracer.h" + ++#ifndef RTLD_DEEPBIND ++// musl neither defines nor can use RTLD_DEEPBIND ++#define RTLD_DEEPBIND 0 ++#endif ++ + #if defined(__i386__) + #define LIBMFXHW "libmfxhw32.so.1" + #elif defined(__x86_64__) diff --git a/srcpkgs/intel-media-sdk/template b/srcpkgs/intel-media-sdk/template new file mode 100644 index 0000000000000..7aeab51802f8e --- /dev/null +++ b/srcpkgs/intel-media-sdk/template @@ -0,0 +1,37 @@ +# Template file for 'intel-media-sdk' +pkgname=intel-media-sdk +version=22.6.4 +revision=1 +archs="x86_64*" +build_style=cmake +configure_args="-Wno-dev -DBUILD_SAMPLES=OFF -DBUILD_TESTS=ON" +hostmakedepends="pkg-config" +makedepends="libva-devel libdrm-devel intel-gmmlib-devel" +short_desc="Intel Media SDK" +maintainer="Stefano Ragni " +license="MIT, BSD-3-Clause" +homepage="https://github.com/Intel-Media-SDK/MediaSDK" +distfiles="https://github.com/Intel-Media-SDK/MediaSDK/archive/refs/tags/intel-mediasdk-${version}.tar.gz" +checksum=197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 + +post_install() { + vlicense LICENSE +} + +libmfx_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc="Intel MediaSDK mfx lib" + pkg_install() { + vmove usr/lib/mfx + vmove "usr/lib/libmfx*.so*" + } +} + +libmfx-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/intel-media-sdk/update b/srcpkgs/intel-media-sdk/update new file mode 100644 index 0000000000000..434a2bc67f7a1 --- /dev/null +++ b/srcpkgs/intel-media-sdk/update @@ -0,0 +1 @@ +pkgname=intel-media diff --git a/srcpkgs/libmfx b/srcpkgs/libmfx new file mode 120000 index 0000000000000..8ffc7099c2272 --- /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 0000000000000..8ffc7099c2272 --- /dev/null +++ b/srcpkgs/libmfx-devel @@ -0,0 +1 @@ +intel-media-sdk \ No newline at end of file From 44194fbf165a8e0ffec0f1abfe111651d2379d2b Mon Sep 17 00:00:00 2001 From: zlice Date: Sun, 18 Dec 2022 01:19:08 -0500 Subject: [PATCH 6/6] ffmpeg: revbump for intel-media-driver codecs. --- srcpkgs/ffmpeg/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index ae26496e79293..6872798b358fb 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -27,11 +27,12 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel) $(vopt_if srt srt-devel) $(vopt_if rist librist-devel) $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if mfx 'libmfx libmfx-devel') $(vopt_if nvenc nv-codec-headers) $(vopt_if nvdec nv-codec-headers)" depends="ffplay>=${version}_${revision}" build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio - dav1d zimg webp sofa vulkan drm svtav1 srt rist nvdec" + dav1d zimg webp sofa vulkan drm svtav1 srt rist nvdec mfx" build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm srt rist" desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)" desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)" @@ -39,10 +40,14 @@ desc_option_sofa="Enable support for AES SOFA" desc_option_webp="Enable support for WebP" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) + i686*) hostmakedepends+=" nasm" build_options_default+=" vaapi vdpau nvenc nvdec" ;; + x86_64*) + hostmakedepends+=" nasm" + build_options_default+=" vaapi vdpau mfx nvenc nvdec" + ;; ppc64*) build_options_default+=" vaapi vdpau";; mips*) CFLAGS="-mnan=legacy";; esac @@ -125,6 +130,7 @@ do_configure() { $(vopt_enable svtav1 libsvtav1) \ $(vopt_enable srt libsrt) \ $(vopt_enable rist librist) \ + $(vopt_enable mfx libmfx) \ $(vopt_if nvenc '--enable-nvenc') \ $(vopt_if nvdec '--enable-nvdec') }