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 39F5113835B for ; Mon, 4 Jan 2021 17:00:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F615E0A7C; Mon, 4 Jan 2021 16:59:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 45293E0A7C for ; Mon, 4 Jan 2021 16:59:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7ECC43411F1 for ; Mon, 4 Jan 2021 16:59:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0248493 for ; Mon, 4 Jan 2021 16:59:54 +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: <1609779050.77bf88d00121d5d23f550d91b168a0cbc917ec79.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva-intel-media-driver/files/, x11-libs/libva-intel-media-driver/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.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: 77bf88d00121d5d23f550d91b168a0cbc917ec79 X-VCS-Branch: master Date: Mon, 4 Jan 2021 16:59:54 +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: abca7fed-395f-480c-96d7-44b243cea455 X-Archives-Hash: d9b51c0678f3fe14bc84afa9139db9b4 commit: 77bf88d00121d5d23f550d91b168a0cbc917ec79 Author: Karlson2k (Evgeny Grin) narod ru> AuthorDate: Sun Jan 3 19:04:46 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 4 16:50:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bf88d0 x11-libs/libva-intel-media-driver: added X USE flag This patch fixes ambiguous usage of X11 in the package. Before this patch the package tries to autodetect presence of X11 in the system and tries to use it if found. However, presence of X11 headers doesn't grantee that required packages (libva) were installed with X11 support. Now result of build depends on USE flags instead of presence/absence of X11 headers on the build system. Closes: https://bugs.gentoo.org/743625 Signed-off-by: Karlson2k (Evgeny Grin) narod.ru> Closes: https://github.com/gentoo/gentoo/pull/18933 Signed-off-by: Sam James gentoo.org> ...va-intel-media-driver-20.2.0_x11_optional.patch | 16 ++++++++ .../libva-intel-media-driver-20.1.1-r1.ebuild | 43 +++++++++++++++++++++ .../libva-intel-media-driver-20.2.0-r1.ebuild | 45 ++++++++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch new file mode 100644 index 00000000000..81c80d80f90 --- /dev/null +++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch @@ -0,0 +1,16 @@ +--- a/media_driver/media_top_cmake.cmake ++++ b/media_driver/media_top_cmake.cmake +@@ -21,7 +21,12 @@ + project( media ) + + find_package(PkgConfig) ++if(NOT DEFINED USE_X11 OR USE_X11) + find_package(X11) ++endif(NOT DEFINED USE_X11 OR USE_X11) ++if(USE_X11 AND NOT X11_FOUND) ++ message(FATAL_ERROR "Usage of X11 is required by USE_X11 variable, but X11 package is not found") ++endif(USE_X11 AND NOT X11_FOUND) + + bs_set_if_undefined(LIB_NAME iHD_drv_video) + + diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild new file mode 100644 index 00000000000..51a01699873 --- /dev/null +++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Intel Media Driver for VAAPI (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD" +SLOT="0" +IUSE="X" + +PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch ) + +DEPEND=">=media-libs/gmmlib-${PV} + >=x11-libs/libva-2.7.1[X?] + >=x11-libs/libpciaccess-0.13.1-r1:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=OFF + -DUSE_X11=$(usex X) + ) + + cmake-utils_src_configure +} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.ebuild new file mode 100644 index 00000000000..b05c1a2f948 --- /dev/null +++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Intel Media Driver for VAAPI (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD" +SLOT="0" +IUSE="X" + +PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch ) + +DEPEND=">=media-libs/gmmlib-20.2.2 + >=x11-libs/libva-2.8.0[X?] + >=x11-libs/libpciaccess-0.13.1-r1:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=OFF + -DBUILD_TYPE=release + -DPLATFORM=linux + -DUSE_X11=$(usex X) + ) + + cmake-utils_src_configure +}