Skip to content

Commit 9063aed

Browse files
eweos-helper[bot]YukariChiba
eweos-helper[bot]
authored and
YukariChiba
committed
[intel-media-driver] 25.2.0-1: new upstream version
Apply an under-review patch to fix compatibility with CMake 4.0. Reference: intel/media-driver#1918 Link: intel/media-driver#1919
1 parent e814b93 commit 9063aed

File tree

2 files changed

+191
-4
lines changed

2 files changed

+191
-4
lines changed

‎0002-fix-compatibility-with-cmake-4.0.patch‎

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
From c8a2c037e25498e366467860b461b8681cea5356 Mon Sep 17 00:00:00 2001
2+
From: Rudi Heitbaum <[email protected]>
3+
Date: Fri, 28 Mar 2025 05:06:53 +0000
4+
Subject: [PATCH] [Media Common] Update cmake_minimum_required to 3.5
5+
consisently across CMakeLists
6+
7+
Some of the CMakeLists.txt are already requiring CMake 3.5.
8+
Update remaining files to 3.5.
9+
This supports the compilation with cmake-4.0.0
10+
11+
Signed-off-by: Rudi Heitbaum <[email protected]>
12+
---
13+
Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt | 2 +-
14+
Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt | 2 +-
15+
Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt | 2 +-
16+
Tools/MediaDriverTools/KrnToHex/CMakeLists.txt | 2 +-
17+
Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt | 2 +-
18+
cmrtlib/CMakeLists.txt | 2 +-
19+
cmrtlib/linux/CMakeLists.txt | 2 +-
20+
media_driver/linux/ult/CMakeLists.txt | 2 +-
21+
media_driver/linux/ult/libdrm_mock/CMakeLists.txt | 2 +-
22+
media_driver/linux/ult/ult_app/CMakeLists.txt | 2 +-
23+
media_driver/linux/ult/ult_app/googletest/CMakeLists.txt | 2 +-
24+
os_release_info.cmake | 2 +-
25+
12 files changed, 12 insertions(+), 12 deletions(-)
26+
27+
diff --git a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
28+
index 2c72d282d2b..025b9354254 100644
29+
--- a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
30+
+++ b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
31+
@@ -18,7 +18,7 @@
32+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
33+
# OTHER DEALINGS IN THE SOFTWARE.
34+
35+
-cmake_minimum_required (VERSION 2.8)
36+
+cmake_minimum_required(VERSION 3.5)
37+
project(IntelGenDmyHexTool)
38+
add_compile_options(-std=c++11)
39+
40+
diff --git a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
41+
index cc586ba766d..519ca954d33 100644
42+
--- a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
43+
+++ b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
44+
@@ -18,7 +18,7 @@
45+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
46+
# OTHER DEALINGS IN THE SOFTWARE.
47+
48+
-cmake_minimum_required(VERSION 2.6)
49+
+cmake_minimum_required(VERSION 3.5)
50+
51+
project(GenKrnBin)
52+
53+
diff --git a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
54+
index 713d08600ec..91eacf15d8b 100644
55+
--- a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
56+
+++ b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
57+
@@ -18,7 +18,7 @@
58+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
59+
# OTHER DEALINGS IN THE SOFTWARE.
60+
61+
-cmake_minimum_required (VERSION 2.8)
62+
+cmake_minimum_required(VERSION 3.5)
63+
project(IntelKernelBinToSourceTool)
64+
add_compile_options(-std=c++11)
65+
66+
diff --git a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
67+
index a3cb7341c6e..e2bfde5e884 100644
68+
--- a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
69+
+++ b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
70+
@@ -18,7 +18,7 @@
71+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
72+
# OTHER DEALINGS IN THE SOFTWARE.
73+
74+
-cmake_minimum_required (VERSION 2.8)
75+
+cmake_minimum_required(VERSION 3.5)
76+
project(KrnToHexTool)
77+
add_compile_options(-std=c++11)
78+
79+
diff --git a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
80+
index af622be19cb..40e4eba171e 100644
81+
--- a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
82+
+++ b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
83+
@@ -18,7 +18,7 @@
84+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
85+
# OTHER DEALINGS IN THE SOFTWARE.
86+
87+
-cmake_minimum_required(VERSION 2.6)
88+
+cmake_minimum_required(VERSION 3.5)
89+
90+
project(KrnToHex_IGA)
91+
92+
diff --git a/cmrtlib/CMakeLists.txt b/cmrtlib/CMakeLists.txt
93+
index 9ecb1e4e10a..54f907b3772 100644
94+
--- a/cmrtlib/CMakeLists.txt
95+
+++ b/cmrtlib/CMakeLists.txt
96+
@@ -19,7 +19,7 @@
97+
# OTHER DEALINGS IN THE SOFTWARE.
98+
99+
set(BUILD_ALL $ENV{BUILD_ALL})
100+
-cmake_minimum_required(VERSION 2.8)
101+
+cmake_minimum_required(VERSION 3.5)
102+
project(CM_RT)
103+
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/linux)
104+
105+
diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
106+
index b066138d9df..df02bab2a69 100644
107+
--- a/cmrtlib/linux/CMakeLists.txt
108+
+++ b/cmrtlib/linux/CMakeLists.txt
109+
@@ -18,7 +18,7 @@
110+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
111+
# OTHER DEALINGS IN THE SOFTWARE.
112+
113+
-cmake_minimum_required(VERSION 2.8)
114+
+cmake_minimum_required(VERSION 3.5)
115+
include (${CMAKE_CURRENT_LIST_DIR}/cmrt_utils.cmake)
116+
117+
118+
diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt
119+
index 9fb5b39ee42..f06b490110b 100644
120+
--- a/media_driver/linux/ult/CMakeLists.txt
121+
+++ b/media_driver/linux/ult/CMakeLists.txt
122+
@@ -17,7 +17,7 @@
123+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
124+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
125+
# OTHER DEALINGS IN THE SOFTWARE.
126+
-cmake_minimum_required(VERSION 3.1)
127+
+cmake_minimum_required(VERSION 3.5)
128+
129+
if ("${BUILD_TYPE}" STREQUAL "debug")
130+
set(CMAKE_BUILD_TYPE "Debug")
131+
diff --git a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt
132+
index 438715a91c3..e5d2c88ed5b 100644
133+
--- a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt
134+
+++ b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt
135+
@@ -17,7 +17,7 @@
136+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
137+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
138+
# OTHER DEALINGS IN THE SOFTWARE.
139+
-cmake_minimum_required(VERSION 2.8)
140+
+cmake_minimum_required(VERSION 3.5)
141+
142+
project(libdrm_mock)
143+
144+
diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt
145+
index 1b24fed7fc5..64217b9fe65 100644
146+
--- a/media_driver/linux/ult/ult_app/CMakeLists.txt
147+
+++ b/media_driver/linux/ult/ult_app/CMakeLists.txt
148+
@@ -17,7 +17,7 @@
149+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
150+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
151+
# OTHER DEALINGS IN THE SOFTWARE.
152+
-cmake_minimum_required(VERSION 3.1)
153+
+cmake_minimum_required(VERSION 3.5)
154+
155+
project(devult)
156+
157+
diff --git a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt
158+
index 6b1f7433596..bba044a97d8 100644
159+
--- a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt
160+
+++ b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt
161+
@@ -17,7 +17,7 @@
162+
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
163+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
164+
# OTHER DEALINGS IN THE SOFTWARE.
165+
-cmake_minimum_required(VERSION 2.8)
166+
+cmake_minimum_required(VERSION 3.5)
167+
168+
project(devult)
169+
170+
diff --git a/os_release_info.cmake b/os_release_info.cmake
171+
index b4a84e2c5cb..a3b879d8545 100644
172+
--- a/os_release_info.cmake
173+
+++ b/os_release_info.cmake
174+
@@ -29,7 +29,7 @@ set(_os_release_info TRUE)
175+
# of the local cmake environment.
176+
177+
# Set cmake policies for at least this level:
178+
-cmake_minimum_required(VERSION 2.8.12)
179+
+cmake_minimum_required(VERSION 3.5)
180+
181+
182+
# Function get_os_release_info - Determine and return OS name and version

‎PKGBUILD‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: Yao Zi <[email protected]>
22

33
pkgname=intel-media-driver
4-
pkgver=25.1.4
4+
pkgver=25.2.0
55
pkgrel=1
66
pkgdesc='Intel Media Driver for VAAPI'
77
url='https://github.com/intel/media-driver/'
@@ -10,10 +10,15 @@ arch=(x86_64)
1010
license=(BSD-3-Clause MIT)
1111
depends=(musl libva intel-gmmlib)
1212
makedepends=(cmake linux-headers)
13+
# 0001: Downstream, silent Clang warnings about usage of VLA, which is common
14+
# in intel-media-driver
15+
# 0002: Under review, fix compatibility with CMake 4.0
1316
source=("https://github.com/intel/media-driver/archive/refs/tags/intel-media-$pkgver.tar.gz"
14-
"0001-silence-clang-cxx-vla-extension.patch")
15-
sha256sums=('6339bba3168102f5a608f447076c9efb2a8194e847a9dac219fbc13324192a76'
16-
'5daa5c7716935c7133e2e9beffff7d635571fa1efbca5b888b8c01f9bff3ddba')
17+
"0001-silence-clang-cxx-vla-extension.patch"
18+
"0002-fix-compatibility-with-cmake-4.0.patch::https://github.com/intel/media-driver/pull/1919.patch")
19+
sha256sums=('be7a1aa9341c637a6adb26164adffeffcad859980246fab4df04f3d7d8e2114b'
20+
'5daa5c7716935c7133e2e9beffff7d635571fa1efbca5b888b8c01f9bff3ddba'
21+
'03dfeb072533b20e79bdff83e38f6f729010c771e7896955c83c4dc0e35b8b83')
1722
_dirname="media-driver-intel-media-$pkgver"
1823

1924
prepare() {

0 commit comments

Comments
 (0)