summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2025-03-30 08:57:45 -0300
committerDaniel Bermond2025-03-30 08:57:45 -0300
commit697f025f454c430e079de9f01a9d2a6210b3b664 (patch)
tree719dae1b392a344e46c6c15a1aae5f575b8be356
parent8c7fbe9a841f73d18564ed46d198f7a648d71410 (diff)
downloadaur-intel-media-sdk-git.tar.gz
Add fix for cmake 4.0
Diffstat
-rw-r--r--.SRCINFO9
-rw-r--r--030-intel-media-sdk-libcttmetrics-static-only.patch (renamed from 030-intel-media-libcttmetrics-static-only.patch)0
-rw-r--r--040-intel-media-sdk-cmake4-fix.patch52
-rwxr-xr-xPKGBUILD15
4 files changed, 68 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f45b926ba05d..160fb443288d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = intel-media-sdk-git
pkgdesc = Legacy API for hardware video acceleration on Intel GPUs (Broadwell to Rocket Lake) (git version)
pkgver = 2023.2.2.r1.g7a72de33
- pkgrel = 2
+ pkgrel = 3
url = https://software.intel.com/en-us/media-sdk/
arch = x86_64
license = MIT
@@ -19,13 +19,17 @@ pkgbase = intel-media-sdk-git
source = git+https://github.com/Intel-Media-SDK/MediaSDK.git
source = 010-intel-media-sdk-fix-reproducible-build.patch::https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch
source = 020-intel-media-sdk-gcc13-fix.patch
- source = 030-intel-media-libcttmetrics-static-only.patch
+ source = 030-intel-media-sdk-libcttmetrics-static-only.patch
+ source = 040-intel-media-sdk-cmake4-fix.patch
sha256sums = SKIP
sha256sums = f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc
sha256sums = 38fc06cdc31372d26f1dc2a7e5b1ea57c22f8f83fbf84e0af5638a8040aa7f4e
sha256sums = a473fd7dbd3c7240a3511471cfad6a39dc462b102c88cd23c35e25f2e8ec0246
+ sha256sums = 86adb2d54a72cb442214cc82524c0ab65d86986cad2d6a4522837091229f9e4c
pkgname = intel-media-sdk-git
+ depends = gcc-libs
+ depends = glibc
depends = libdrm
depends = libva
depends = wayland
@@ -39,5 +43,6 @@ pkgname = intel-media-sdk-git
pkgname = libmfx-git
pkgdesc = Intel Media SDK dispatcher library (git version)
depends = gcc-libs
+ depends = glibc
provides = libmfx
conflicts = libmfx
diff --git a/030-intel-media-libcttmetrics-static-only.patch b/030-intel-media-sdk-libcttmetrics-static-only.patch
index ad2dba8e9a2e..ad2dba8e9a2e 100644
--- a/030-intel-media-libcttmetrics-static-only.patch
+++ b/030-intel-media-sdk-libcttmetrics-static-only.patch
diff --git a/040-intel-media-sdk-cmake4-fix.patch b/040-intel-media-sdk-cmake4-fix.patch
new file mode 100644
index 000000000000..7ebe763d27c2
--- /dev/null
+++ b/040-intel-media-sdk-cmake4-fix.patch
@@ -0,0 +1,52 @@
+--- a/contrib/googletest/CMakeLists.txt
++++ b/contrib/googletest/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.8)
++cmake_minimum_required(VERSION 3.5.0)
+
+ if (POLICY CMP0048)
+ cmake_policy(SET CMP0048 NEW)
+--- a/contrib/googletest/googlemock/CMakeLists.txt
++++ b/contrib/googletest/googlemock/CMakeLists.txt
+@@ -39,7 +39,7 @@ else()
+ cmake_policy(SET CMP0048 NEW)
+ project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+-cmake_minimum_required(VERSION 2.6.4)
++cmake_minimum_required(VERSION 3.5.0)
+
+ if (COMMAND set_up_hermetic_build)
+ set_up_hermetic_build()
+--- a/contrib/googletest/googletest/CMakeLists.txt
++++ b/contrib/googletest/googletest/CMakeLists.txt
+@@ -46,7 +46,7 @@ else()
+ cmake_policy(SET CMP0048 NEW)
+ project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+-cmake_minimum_required(VERSION 2.6.4)
++cmake_minimum_required(VERSION 3.5.0)
+
+ if (POLICY CMP0063) # Visibility
+ cmake_policy(SET CMP0063 NEW)
+--- a/contrib/googletest/googletest/README.md
++++ b/contrib/googletest/googletest/README.md
+@@ -115,7 +115,7 @@ pulled into the main build with `add_subdirectory()`. For example:
+
+ New file `CMakeLists.txt.in`:
+
+- cmake_minimum_required(VERSION 2.8.2)
++ cmake_minimum_required(VERSION 3.5.0)
+
+ project(googletest-download NONE)
+
+--- a/contrib/googletest/googletest/docs/Pkgconfig.md
++++ b/contrib/googletest/googletest/docs/Pkgconfig.md
+@@ -20,7 +20,7 @@ all examples here we assume you want to compile the sample
+ Using `pkg-config` in CMake is fairly easy:
+
+ ```
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+
+ cmake_policy(SET CMP0048 NEW)
+ project(my_gtest_pkgconfig VERSION 0.0.1 LANGUAGES CXX)
diff --git a/PKGBUILD b/PKGBUILD
index be7b634024b8..03b94470e779 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgbase=intel-media-sdk-git
pkgname=('intel-media-sdk-git' 'libmfx-git')
pkgver=2023.2.2.r1.g7a72de33
-pkgrel=2
+pkgrel=3
pkgdesc='Legacy API for hardware video acceleration on Intel GPUs (Broadwell to Rocket Lake) (git version)'
arch=('x86_64')
url='https://software.intel.com/en-us/media-sdk/'
@@ -20,11 +20,13 @@ makedepends=('libdrm' 'libva' 'wayland' 'intel-media-driver'
source=('git+https://github.com/Intel-Media-SDK/MediaSDK.git'
'010-intel-media-sdk-fix-reproducible-build.patch'::'https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch'
'020-intel-media-sdk-gcc13-fix.patch'
- '030-intel-media-libcttmetrics-static-only.patch')
+ '030-intel-media-sdk-libcttmetrics-static-only.patch'
+ '040-intel-media-sdk-cmake4-fix.patch')
sha256sums=('SKIP'
'f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc'
'38fc06cdc31372d26f1dc2a7e5b1ea57c22f8f83fbf84e0af5638a8040aa7f4e'
- 'a473fd7dbd3c7240a3511471cfad6a39dc462b102c88cd23c35e25f2e8ec0246')
+ 'a473fd7dbd3c7240a3511471cfad6a39dc462b102c88cd23c35e25f2e8ec0246'
+ '86adb2d54a72cb442214cc82524c0ab65d86986cad2d6a4522837091229f9e4c')
export GIT_LFS_SKIP_SMUDGE='1'
@@ -33,7 +35,8 @@ prepare() {
git -C MediaSDK lfs pull "${source[0]/git+/}"
patch -d MediaSDK -Np1 -i "${srcdir}/010-intel-media-sdk-fix-reproducible-build.patch"
patch -d MediaSDK -Np1 -i "${srcdir}/020-intel-media-sdk-gcc13-fix.patch"
- patch -d MediaSDK -Np1 -i "${srcdir}/030-intel-media-libcttmetrics-static-only.patch"
+ patch -d MediaSDK -Np1 -i "${srcdir}/030-intel-media-sdk-libcttmetrics-static-only.patch"
+ patch -d MediaSDK -Np1 -i "${srcdir}/040-intel-media-sdk-cmake4-fix.patch"
}
pkgver() {
@@ -63,7 +66,7 @@ check() {
}
package_intel-media-sdk-git() {
- depends=('libdrm' 'libva' 'wayland' "libmfx-git=${pkgver}" 'intel-media-driver')
+ depends=('gcc-libs' 'glibc' 'libdrm' 'libva' 'wayland' "libmfx-git=${pkgver}" 'intel-media-driver')
provides=('intel-media-sdk' 'vpl-runtime')
conflicts=('intel-media-sdk')
options=('!emptydirs')
@@ -81,7 +84,7 @@ package_intel-media-sdk-git() {
package_libmfx-git() {
pkgdesc='Intel Media SDK dispatcher library (git version)'
- depends=('gcc-libs')
+ depends=('gcc-libs' 'glibc')
provides=('libmfx')
conflicts=('libmfx')