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 BBC67138740 for ; Thu, 24 Jun 2021 22:00:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10BD0E08D3; Thu, 24 Jun 2021 22:00:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 E746BE08D3 for ; Thu, 24 Jun 2021 22:00:25 +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 77631335C85 for ; Thu, 24 Jun 2021 22:00:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C813797 for ; Thu, 24 Jun 2021 22:00:23 +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: <1624572016.0918ac754e46de2cef575171093473146bede270.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glu/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/glu/glu-9999.ebuild X-VCS-Directories: media-libs/glu/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0918ac754e46de2cef575171093473146bede270 X-VCS-Branch: master Date: Thu, 24 Jun 2021 22:00:23 +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: 97c71408-541f-4bac-a277-b043e41be768 X-Archives-Hash: b72f84dff5ce19d4e95b94f152f28af7 commit: 0918ac754e46de2cef575171093473146bede270 Author: Matt Turner gentoo org> AuthorDate: Thu Jun 24 21:55:22 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Jun 24 22:00:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0918ac75 media-libs/glu: Port to Meson Signed-off-by: Matt Turner gentoo.org> media-libs/glu/glu-9999.ebuild | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild index a20186b9dad..978531ce2bb 100644 --- a/media-libs/glu/glu-9999.ebuild +++ b/media-libs/glu/glu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -inherit autotools multilib-minimal ${GIT_ECLASS} +inherit meson-multilib ${GIT_ECLASS} DESCRIPTION="The OpenGL Utility Library" HOMEPAGE="https://gitlab.freedesktop.org/mesa/glu" @@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then SRC_URI="" else SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="SGI-B-2.0" @@ -28,20 +28,10 @@ IUSE="static-libs" DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - multilib_src_configure() { - ECONF_SOURCE="${S}" econf $(use_enable static-libs static) -} - -multilib_src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -src_test() { - :; + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Dgl_provider=glvnd + ) + meson_src_configure }