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 33A521382C5 for ; Thu, 1 Mar 2018 05:39:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CFC6E08D6; Thu, 1 Mar 2018 05:39:08 +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 2CCC8E08D6 for ; Thu, 1 Mar 2018 05:39:08 +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 2271D335C39 for ; Thu, 1 Mar 2018 05:39:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 789771ED for ; Thu, 1 Mar 2018 05:39:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1519882736.a5c01af508f0951513133787c1699c5058d51ca1.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libdrm/libdrm-9999.ebuild X-VCS-Directories: x11-libs/libdrm/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a5c01af508f0951513133787c1699c5058d51ca1 X-VCS-Branch: master Date: Thu, 1 Mar 2018 05:39:05 +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-Archives-Salt: d246d624-b6c2-4d0d-ae0a-0d0486f289d0 X-Archives-Hash: 68035679058ffbf2642c75bd64aa4905 commit: a5c01af508f0951513133787c1699c5058d51ca1 Author: Matt Turner gentoo org> AuthorDate: Thu Mar 1 05:37:23 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Mar 1 05:38:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c01af5 x11-libs/libdrm: Switch to using Meson build system x11-libs/libdrm/libdrm-9999.ebuild | 79 ++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild index 092c800d11d..e516fe208c8 100644 --- a/x11-libs/libdrm/libdrm-9999.ebuild +++ b/x11-libs/libdrm/libdrm-9999.ebuild @@ -1,15 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -XORG_MULTILIB=yes -inherit xorg-2 +EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} meson multilib-minimal DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/" if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git" + SRC_URI="" else SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" @@ -22,42 +27,50 @@ done IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" RESTRICT="test" # see bug #236845 +LICENSE="MIT" +SLOT="0" -RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}] - video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" +RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] ) + video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" -src_prepare() { - if [[ ${PV} = 9999* ]]; then - # tests are restricted, no point in building them - sed -ie 's/tests //' "${S}"/Makefile.am - fi - xorg-2_src_prepare - epatch_user +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack } -src_configure() { - XORG_CONFIGURE_OPTIONS=( +multilib_src_configure() { + local emesonargs=( # Udev is only used by tests now. - --disable-udev - --disable-cairo-tests - $(use_enable video_cards_amdgpu amdgpu) - $(use_enable video_cards_exynos exynos-experimental-api) - $(use_enable video_cards_freedreno freedreno) - $(use_enable video_cards_intel intel) - $(use_enable video_cards_nouveau nouveau) - $(use_enable video_cards_omap omap-experimental-api) - $(use_enable video_cards_radeon radeon) - $(use_enable video_cards_tegra tegra-experimental-api) - $(use_enable video_cards_vc4 vc4) - $(use_enable video_cards_vivante etnaviv-experimental-api) - $(use_enable video_cards_vmware vmwgfx) - $(use_enable libkms) + -Dudev=false + -Dcairo-tests=false + -Damdgpu=$(usex video_cards_amdgpu true false) + -Dexynos=$(usex video_cards_exynos true false) + -Dfreedreno=$(usex video_cards_freedreno true false) + -Dintel=$(usex video_cards_intel true false) + -Dnouveau=$(usex video_cards_nouveau true false) + -Domap=$(usex video_cards_omap true false) + -Dradeon=$(usex video_cards_radeon true false) + -Dtegra=$(usex video_cards_tegra true false) + -Dvc4=$(usex video_cards_vc4 true false) + -Detnaviv=$(usex video_cards_vivante true false) + -Dvmwgfx=$(usex video_cards_vmware true false) + -Dlibkms=$(usex libkms true false) # valgrind installs its .pc file to the pkgconfig for the primary arch - --enable-valgrind=$(usex valgrind auto no) + -Dvalgrind=$(usex valgrind auto false) ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} - xorg-2_src_configure +multilib_src_install() { + meson_src_install }