commit: 71af24fc8bbdf44f4406f3b51799e135975de6f1 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Nov 23 22:01:01 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Dec 2 18:01:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71af24fc
x11-libs/libva-intel-media-driver: Remove IUSE=custom-cflags This USE flag is wrongly named, at a minimum. It does not prevent the build system from stripping out user-specified CFLAGS. Instead, it prevents the build system from adding a few unwanted CFLAGS, like -g and -m64. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...edia-driver-21.4.2-Remove-unwanted-CFLAGS.patch | 43 ++++++++++++++++++++++ .../libva-intel-media-driver-9999.ebuild | 5 +-- 2 files changed, 45 insertions(+), 3 deletions(-) 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 new file mode 100644 index 000000000000..288fe2d7f517 --- /dev/null +++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch @@ -0,0 +1,43 @@ +From f1c5c12d866783f7a3079be440c06fdb8a931ed2 Mon Sep 17 00:00:00 2001 +From: Matt Turner <[email protected]> +Date: Tue, 23 Nov 2021 12:28:05 -0800 +Subject: [PATCH] Remove unwanted CFLAGS + +--- + media_driver/cmake/linux/media_compile_flags_linux.cmake | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake +index 512ef17b..e8ade76d 100755 +--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake +@@ -52,16 +52,12 @@ set(MEDIA_COMPILER_FLAGS_COMMON + -ffunction-sections + -Wl,--gc-sections + +- # -m32 or -m64 +- -m${ARCH} +- + # Global defines + -DLINUX=1 + -DLINUX + -DNO_RTTI + -DNO_EXCEPTION_HANDLING + -DINTEL_NOT_PUBLIC +- -g + ) + + +@@ -189,9 +185,6 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA + if(${PLATFORM} STREQUAL "linux") + #set predefined compiler flags set + add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}") +- add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>") +- add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>") +- add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>") + + foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON}) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +-- +2.32.0 + 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 index 0a05dcd1c864..b54b915594c7 100644 --- 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 @@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/intel/media-driver"; LICENSE="MIT BSD redistributable? ( no-source-code )" SLOT="0" -IUSE="+custom-cflags +redistributable test X" +IUSE="+redistributable test X" RESTRICT="!test? ( test )" @@ -36,7 +36,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch - "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch + "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch ) @@ -49,7 +49,6 @@ src_configure() { -DUSE_X11=$(usex X) -DENABLE_NONFREE_KERNELS=$(usex redistributable) -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now - -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) ) cmake_src_configure
