commit:     dc3742d93a480dbd8e8e8eda0a53b1254bffdb28
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 08:46:44 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <andrewammerlaan <AT> 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

Reply via email to