1 |
commit: 71af24fc8bbdf44f4406f3b51799e135975de6f1 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 23 22:01:01 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 2 18:01:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71af24fc |
7 |
|
8 |
x11-libs/libva-intel-media-driver: Remove IUSE=custom-cflags |
9 |
|
10 |
This USE flag is wrongly named, at a minimum. It does not prevent the |
11 |
build system from stripping out user-specified CFLAGS. Instead, it |
12 |
prevents the build system from adding a few unwanted CFLAGS, like -g and |
13 |
-m64. |
14 |
|
15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
16 |
|
17 |
...edia-driver-21.4.2-Remove-unwanted-CFLAGS.patch | 43 ++++++++++++++++++++++ |
18 |
.../libva-intel-media-driver-9999.ebuild | 5 +-- |
19 |
2 files changed, 45 insertions(+), 3 deletions(-) |
20 |
|
21 |
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch |
22 |
new file mode 100644 |
23 |
index 000000000000..288fe2d7f517 |
24 |
--- /dev/null |
25 |
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch |
26 |
@@ -0,0 +1,43 @@ |
27 |
+From f1c5c12d866783f7a3079be440c06fdb8a931ed2 Mon Sep 17 00:00:00 2001 |
28 |
+From: Matt Turner <mattst88@×××××.com> |
29 |
+Date: Tue, 23 Nov 2021 12:28:05 -0800 |
30 |
+Subject: [PATCH] Remove unwanted CFLAGS |
31 |
+ |
32 |
+--- |
33 |
+ media_driver/cmake/linux/media_compile_flags_linux.cmake | 7 ------- |
34 |
+ 1 file changed, 7 deletions(-) |
35 |
+ |
36 |
+diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake |
37 |
+index 512ef17b..e8ade76d 100755 |
38 |
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake |
39 |
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake |
40 |
+@@ -52,16 +52,12 @@ set(MEDIA_COMPILER_FLAGS_COMMON |
41 |
+ -ffunction-sections |
42 |
+ -Wl,--gc-sections |
43 |
+ |
44 |
+- # -m32 or -m64 |
45 |
+- -m${ARCH} |
46 |
+- |
47 |
+ # Global defines |
48 |
+ -DLINUX=1 |
49 |
+ -DLINUX |
50 |
+ -DNO_RTTI |
51 |
+ -DNO_EXCEPTION_HANDLING |
52 |
+ -DINTEL_NOT_PUBLIC |
53 |
+- -g |
54 |
+ ) |
55 |
+ |
56 |
+ |
57 |
+@@ -189,9 +185,6 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA |
58 |
+ if(${PLATFORM} STREQUAL "linux") |
59 |
+ #set predefined compiler flags set |
60 |
+ add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}") |
61 |
+- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>") |
62 |
+- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>") |
63 |
+- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>") |
64 |
+ |
65 |
+ foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON}) |
66 |
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") |
67 |
+-- |
68 |
+2.32.0 |
69 |
+ |
70 |
|
71 |
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild |
72 |
index 0a05dcd1c864..b54b915594c7 100644 |
73 |
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild |
74 |
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild |
75 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/intel/media-driver" |
76 |
|
77 |
LICENSE="MIT BSD redistributable? ( no-source-code )" |
78 |
SLOT="0" |
79 |
-IUSE="+custom-cflags +redistributable test X" |
80 |
+IUSE="+redistributable test X" |
81 |
|
82 |
RESTRICT="!test? ( test )" |
83 |
|
84 |
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}" |
85 |
|
86 |
PATCHES=( |
87 |
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch |
88 |
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch |
89 |
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch |
90 |
"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch |
91 |
) |
92 |
|
93 |
@@ -49,7 +49,6 @@ src_configure() { |
94 |
-DUSE_X11=$(usex X) |
95 |
-DENABLE_NONFREE_KERNELS=$(usex redistributable) |
96 |
-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now |
97 |
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) |
98 |
) |
99 |
|
100 |
cmake_src_configure |