From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9A62139335 for ; Tue, 29 Jun 2021 17:37:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F80BE0857; Tue, 29 Jun 2021 17:37:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B01E5E0857 for ; Tue, 29 Jun 2021 17:37:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D61533BDE5 for ; Tue, 29 Jun 2021 17:37:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E9BA744 for ; Tue, 29 Jun 2021 17:37:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1624988231.17befa36302a513bcf3e80930815c5050b6c91e6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/, x11-libs/libva-intel-media-driver/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libva-intel-media-driver/Manifest x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild X-VCS-Directories: x11-libs/libva-intel-media-driver/ x11-libs/libva-intel-media-driver/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 17befa36302a513bcf3e80930815c5050b6c91e6 X-VCS-Branch: master Date: Tue, 29 Jun 2021 17:37:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b86776ad-1e77-4bab-ba61-890c5fee4237 X-Archives-Hash: 1e8341d9f7867fe75610b8ddaeb048b7 commit: 17befa36302a513bcf3e80930815c5050b6c91e6 Author: Karlson2k (Evgeny Grin) narod ru> AuthorDate: Sun Jun 27 11:59:42 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 29 17:37:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17befa36 x11-libs/libva-intel-media-driver: updated to version 21.2.2 pre Signed-off-by: Karlson2k (Evgeny Grin) narod.ru> Closes: https://github.com/gentoo/gentoo/pull/21423 Signed-off-by: Sam James gentoo.org> x11-libs/libva-intel-media-driver/Manifest | 1 + ...a-intel-media-driver-21.2.2_custom_cflags.patch | 52 ++++++++++++++++++++++ ... => libva-intel-media-driver-21.2.2_pre.ebuild} | 6 +-- .../libva-intel-media-driver-9999.ebuild | 4 +- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest index 3bfeb9f0b70..bedf5dcb761 100644 --- a/x11-libs/libva-intel-media-driver/Manifest +++ b/x11-libs/libva-intel-media-driver/Manifest @@ -3,3 +3,4 @@ DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5be DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4 DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121 +DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch new file mode 100644 index 00000000000..c0f598ce6cd --- /dev/null +++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch @@ -0,0 +1,52 @@ + Prevent overriding of user-defined CFLAGS. + + +--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake +@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON + -fdata-sections + -ffunction-sections + -Wl,--gc-sections ++) + ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # -m32 or -m64 + -m${ARCH} ++) ++endif(OVERRIDE_COMPILER_FLAGS) + ++list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # Global defines + -DLINUX=1 + -DLINUX + -DNO_RTTI + -DNO_EXCEPTION_HANDLING + -DINTEL_NOT_PUBLIC ++) ++ ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON + -g + ) + +@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm") + -mtune=atom + ) + endif() ++endif(OVERRIDE_COMPILER_FLAGS) + + if(${ARCH} STREQUAL "64") + set(MEDIA_COMPILER_FLAGS_COMMON +@@ -189,9 +200,11 @@ 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}") ++if (OVERRIDE_COMPILER_FLAGS) + add_compile_options("$<$:${MEDIA_COMPILER_FLAGS_DEBUG}>") + add_compile_options("$<$:${MEDIA_COMPILER_FLAGS_RELEASE}>") + add_compile_options("$<$:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>") ++endif(OVERRIDE_COMPILER_FLAGS) + + foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON}) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") 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-21.2.2_pre.ebuild similarity index 91% copy from x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild copy to x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild index 072d1d906b9..6eec248e7f0 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-21.2.2_pre.ebuild @@ -15,7 +15,7 @@ else MY_PV="${PV%_pre}" SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" S="${WORKDIR}/media-driver-intel-media-${MY_PV}" - KEYWORDS="~amd64" + KEYWORDS="" # no keywords for '_pre' releases fi DESCRIPTION="Intel Media Driver for VAAPI (iHD)" @@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X" RESTRICT="!test? ( test )" -DEPEND=">=media-libs/gmmlib-21.1.1 +DEPEND=">=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?] " RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch - "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch + "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch ) 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 072d1d906b9..7e53505dd38 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 @@ -27,14 +27,14 @@ IUSE="+custom-cflags set-as-default test X" RESTRICT="!test? ( test )" -DEPEND=">=media-libs/gmmlib-21.1.1 +DEPEND=">=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?] " RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch - "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch + "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch )