From cd470768f62b2291b2076a068afb5471553c3051 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:25:22 -0500 Subject: [PATCH 1/9] 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 585517eb6f0f284099990288b3dbff2252f04bd4 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:25:47 -0500 Subject: [PATCH 2/9] intel-media-driver: update to 22.6.4 --- .../intel-media-driver/patches/execinfo.patch | 58 ------------------- srcpkgs/intel-media-driver/template | 4 +- 2 files changed, 2 insertions(+), 60 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..1735b90c65ce 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="Stefano Ragni " 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 9b0d7f6f331c80cd840343ffb516af042684db6f Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:29:32 -0500 Subject: [PATCH 3/9] 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 222ce958bf2da02dac0ca7b4f321fbf9b5490799 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:29:40 -0500 Subject: [PATCH 4/9] 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 60f3aad4c2fab88d813d5390c4d683ea851acff6 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 09:31:43 -0500 Subject: [PATCH 5/9] 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 a31696653afd0066ddd3a8c81858699f99e71e79 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 16 Dec 2022 15:27:04 -0500 Subject: [PATCH 6/9] onevpl-intel-gpu: new package version 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 000000000000..47920ceecf91 --- /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 000000000000..f14acb728a54 --- /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 bd4ea4b061e3f08b957ee0a3c8812869083198f5 Mon Sep 17 00:00:00 2001 From: zlice Date: Sun, 18 Dec 2022 01:18:17 -0500 Subject: [PATCH 7/9] new packages: intel-media-sdk libmfx libmfx-devel version 22.6.4 --- common/shlibs | 1 + srcpkgs/intel-media-sdk/libmfx | 1 + 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 + 7 files changed, 56 insertions(+) create mode 120000 srcpkgs/intel-media-sdk/libmfx 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/common/shlibs b/common/shlibs index ba5c89ee3bad..a1e099b7b12e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4221,3 +4221,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/intel-media-sdk/libmfx b/srcpkgs/intel-media-sdk/libmfx new file mode 120000 index 000000000000..e2fbbd29eaa2 --- /dev/null +++ b/srcpkgs/intel-media-sdk/libmfx @@ -0,0 +1 @@ +libmfx \ No newline at end of file diff --git a/srcpkgs/intel-media-sdk/patches/musl.patch b/srcpkgs/intel-media-sdk/patches/musl.patch new file mode 100644 index 000000000000..4ae70924b744 --- /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 000000000000..7aeab51802f8 --- /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 000000000000..434a2bc67f7a --- /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 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 From 490f15406ce3d877fd9ec9b0c96c472a6ef602b4 Mon Sep 17 00:00:00 2001 From: zlice Date: Sun, 18 Dec 2022 01:19:08 -0500 Subject: [PATCH 8/9] ffmpeg: add libmfx support for x86_64 Intel vaapi --- srcpkgs/ffmpeg/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 23a3d5c9967b..c15f70c122af 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg version=4.4.3 -revision=2 +revision=3 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" @@ -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,7 +40,8 @@ desc_option_sofa="Enable support for AES SOFA" desc_option_webp="Enable support for WebP" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc nvdec";; + i686*) build_options_default+=" vaapi vdpau nvenc nvdec";; + x86_64*) build_options_default+=" vaapi vdpau mfx nvenc nvdec";; ppc64*) build_options_default+=" vaapi vdpau";; mips*) CFLAGS="-mnan=legacy";; esac @@ -124,6 +126,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') } From 8d5e41c8e76ff692b049dd9fa797043e2102b293 Mon Sep 17 00:00:00 2001 From: zlice Date: Sun, 18 Dec 2022 01:40:15 -0500 Subject: [PATCH 9/9] igt-gpu-tools: update to version 1.26 --- ...-loading-failure-in-resolve-function.patch | 63 ------------------- ...t_edid-Allocate-raw-8-bytes-for-VSDB.patch | 42 ------------- srcpkgs/igt-gpu-tools/template | 6 +- 3 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch delete mode 100644 srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch diff --git a/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch b/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch deleted file mode 100644 index 0c3b554d9949..000000000000 --- a/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git lib/igt_halffloat.c lib/igt_halffloat.c -index 08ab05fc..e5e8a5bd 100644 ---- a/lib/igt_halffloat.c -+++ b/lib/igt_halffloat.c -@@ -24,6 +24,19 @@ - - #include - #include -+#include -+ -+#ifdef HAVE_CPUID_H -+#include -+#else -+#define __get_cpuid_max(x, y) 0 -+#define __cpuid(level, a, b, c, d) a = b = c = d = 0 -+#define __cpuid_count(level, count, a, b, c, d) a = b = c = d = 0 -+#endif -+ -+#ifndef bit_F16C -+#define bit_F16C (1 << 29) -+#endif - - #include "igt_halffloat.h" - #include "igt_x86.h" -@@ -182,6 +195,20 @@ static void half_to_float_f16c(const uint16_t *h, float *f, unsigned int num) - - #pragma GCC pop_options - -+static bool f16c_is_supported(void) -+{ -+ unsigned max = __get_cpuid_max(0, NULL); -+ unsigned eax, ebx, ecx, edx; -+ -+ if (max >= 1) { -+ __cpuid(1, eax, ebx, ecx, edx); -+ -+ if (ecx & bit_F16C) -+ return true; -+ } -+ return false; -+} -+ - static void float_to_half(const float *f, uint16_t *h, unsigned int num) - { - for (int i = 0; i < num; i++) -@@ -196,7 +223,7 @@ static void half_to_float(const uint16_t *h, float *f, unsigned int num) - - static void (*resolve_float_to_half(void))(const float *f, uint16_t *h, unsigned int num) - { -- if (igt_x86_features() & F16C) -+ if (f16c_is_supported()) - return float_to_half_f16c; - - return float_to_half; -@@ -207,7 +234,7 @@ void igt_float_to_half(const float *f, uint16_t *h, unsigned int num) - - static void (*resolve_half_to_float(void))(const uint16_t *h, float *f, unsigned int num) - { -- if (igt_x86_features() & F16C) -+ if (f16c_is_supported()) - return half_to_float_f16c; - - return half_to_float; diff --git a/srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch b/srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch deleted file mode 100644 index 7cc9e289305c..000000000000 --- a/srcpkgs/igt-gpu-tools/patches/igt_edid-Allocate-raw-8-bytes-for-VSDB.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2107b0a53692fb329175bc16169c3699712187aa Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 27 Feb 2021 14:10:41 -0800 -Subject: [PATCH] lib/igt_edid: Allocate raw 8-bytes for VSDB - -hdmi_vsdb is an element of cea_vsdb which makes the size of cea_vsdb to -be 8 ( 3bytes ieee_oui ) + ( 5bytes hdmi_vsdb struct), its true that we -only use 7 bytes technically we can only allocate 7byte array but since -we are writing to elements of hdmi_vsdb struct which is sitting at offet -4-8 in cea_vsdb, compiler thinks we have an element which is out of -array bounds since out allocated size is 7bytes - -This errors out -../git/lib/igt_edid.c:365:13: error: array subscript 'struct hdmi_vsdb[0]' is partly outside array bounds of 'char[7]' [-Werror=array-bounds] - 365 | hdmi->src_phy_addr[0] = 0x10; - | ^~ - -allocating one extra byte matches with size of cea_vsdb and compiler is -happy - -Signed-off-by: Khem Raj -Reviewed-by: Martin Peres ---- - lib/igt_edid.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/igt_edid.c b/lib/igt_edid.c -index 1c85486d..ce09cc47 100644 ---- a/lib/igt_edid.c -+++ b/lib/igt_edid.c -@@ -351,7 +351,7 @@ void cea_sad_init_pcm(struct cea_sad *sad, int channels, - const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size) - { - /* We'll generate a VSDB with 2 extension fields. */ -- static char raw[CEA_VSDB_HDMI_MIN_SIZE + 2] = {0}; -+ static char raw[CEA_VSDB_HDMI_MIN_SIZE + 3] = {0}; - struct cea_vsdb *vsdb; - struct hdmi_vsdb *hdmi; - --- -GitLab - diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index 02f6cc4bba66..159bfd0bdc21 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -1,7 +1,7 @@ # Template file for 'igt-gpu-tools' pkgname=igt-gpu-tools -version=1.25 -revision=6 +version=1.26 +revision=1 build_style=meson configure_args="-Db_ndebug=false -Db_lto=false" # b_lto=true makes the build hang at a random point @@ -14,7 +14,7 @@ maintainer="Orphaned " license="MIT" homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11 +checksum=36d4193b9f22fbb4834ec97be3bb6322ec901e20f7be018f0a50d3eb03ec9bb7 # tests don't behave in containers make_check=ci-skip