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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D9FA15A7D9 for ; Tue, 21 Mar 2023 20:56:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33786E08E0; Tue, 21 Mar 2023 20:56:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14C45E08E0 for ; Tue, 21 Mar 2023 20:56:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C6B8341188 for ; Tue, 21 Mar 2023 20:56:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5592B8F0 for ; Tue, 21 Mar 2023 20:56:20 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1679432079.dc3742d93a480dbd8e8e8eda0a53b1254bffdb28.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oneVPL/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild media-libs/oneVPL/oneVPL-2023.1.3.ebuild X-VCS-Directories: media-libs/oneVPL/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: dc3742d93a480dbd8e8e8eda0a53b1254bffdb28 X-VCS-Branch: master Date: Tue, 21 Mar 2023 20:56:20 +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: fb135794-1b74-45c5-8a43-b8caeac6336a X-Archives-Hash: 8a6f347823c24bf72f511e1513623434 commit: dc3742d93a480dbd8e8e8eda0a53b1254bffdb28 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Mar 21 08:46:44 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Mar 21 20:54:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3742d9 media-libs/oneVPL: add multilib support Signed-off-by: Andrew Ammerlaan gentoo.org> ...L-2023.1.3.ebuild => oneVPL-2023.1.3-r1.ebuild} | 41 ++++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/media-libs/oneVPL/oneVPL-2023.1.3.ebuild b/media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild similarity index 74% rename from media-libs/oneVPL/oneVPL-2023.1.3.ebuild rename to media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild index 223184c18698..0758b6389a95 100644 --- a/media-libs/oneVPL/oneVPL-2023.1.3.ebuild +++ b/media-libs/oneVPL/oneVPL-2023.1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake optfeature +inherit cmake-multilib optfeature DESCRIPTION="oneAPI Video Processing Library, dispatcher, tools, and examples" HOMEPAGE="https://github.com/oneapi-src/oneVPL" @@ -13,34 +13,37 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="dri drm examples experimental +tools test vaapi wayland X" +IUSE="dri drm examples experimental tools test vaapi wayland X" RESTRICT="!test? ( test )" -# Most of these flags only have an effect on the tools +# Tools fails to compile on 32-bit REQUIRED_USE=" dri? ( X drm ) - drm? ( tools ) - X? ( tools vaapi ) - wayland? ( tools drm ) - vaapi? ( tools ) + X? ( vaapi ) + wayland? ( drm ) + abi_x86_32? ( !tools ) + abi_x86_x32? ( !tools ) " -BDEPEND="virtual/pkgconfig" -DEPEND=" - x11-libs/libpciaccess - vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] ) - drm? ( x11-libs/libdrm ) +RDEPEND=" + x11-libs/libpciaccess[${MULTILIB_USEDEP}] + vaapi? ( media-libs/libva[X?,wayland?,drm(+)?,${MULTILIB_USEDEP}] ) + drm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) wayland? ( - dev-libs/wayland - dev-libs/wayland-protocols + dev-libs/wayland[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11 - x11-libs/libxcb + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + wayland? ( + dev-libs/wayland-protocols + ) +" +BDEPEND="virtual/pkgconfig" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DBUILD_DISPATCHER=ON @@ -65,7 +68,7 @@ src_configure() { cmake_src_configure } -src_install() { +multilib_src_install() { cmake_src_install # Remove these license files rm -r "${ED}/usr/share/vpl/licensing" || die