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 A6A0C138335 for ; Sun, 17 Mar 2019 19:17:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC7C4E09F5; Sun, 17 Mar 2019 19:17:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 6E2BBE09F5 for ; Sun, 17 Mar 2019 19:17:13 +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 0B82D335D19 for ; Sun, 17 Mar 2019 19:17:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A81F758A for ; Sun, 17 Mar 2019 19:17:10 +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: <1552850220.e6f0b36d6b5a199deb19b5a5f5a50f88f28dff8f.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pixman/pixman-9999.ebuild X-VCS-Directories: x11-libs/pixman/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e6f0b36d6b5a199deb19b5a5f5a50f88f28dff8f X-VCS-Branch: master Date: Sun, 17 Mar 2019 19:17:10 +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: 11a33dff-6357-4509-bb2b-b1d9887060d6 X-Archives-Hash: 2c2ad1576ba42905dc4705b41d07c11c commit: e6f0b36d6b5a199deb19b5a5f5a50f88f28dff8f Author: Matt Turner gentoo org> AuthorDate: Sun Mar 17 19:06:50 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 17 19:17:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f0b36d x11-libs/pixman: Convert build to meson Signed-off-by: Matt Turner gentoo.org> x11-libs/pixman/pixman-9999.ebuild | 63 +++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild index 076a3ddb2d7..d7ab4c45e9b 100644 --- a/x11-libs/pixman/pixman-9999.ebuild +++ b/x11-libs/pixman/pixman-9999.ebuild @@ -1,30 +1,57 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -XORG_MULTILIB=yes -inherit xorg-2 +EAPI=7 EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git" -DESCRIPTION="Low-level pixel manipulation routines" -if [[ $PV != 9999* ]]; then +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} meson multilib-minimal + +DESCRIPTION="Low-level pixel manipulation routines" +HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz" fi +LICENSE="MIT" +SLOT="0" IUSE="altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -src_configure() { - XORG_CONFIGURE_OPTIONS=( - $(use_enable cpu_flags_arm_iwmmxt arm-iwmmxt) - $(use_enable cpu_flags_x86_mmxext mmx) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable altivec vmx) - $(use_enable neon arm-neon) - $(use_enable loongson2f loongson-mmi) - --disable-gtk - --disable-libpng +src_unpack() { + default + [[ $PV = 9999* ]] && git-r3_src_unpack +} + +multilib_src_configure() { + local emesonargs=( + $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) + $(meson_feature cpu_flags_x86_mmxext mmx) + $(meson_feature cpu_flags_x86_sse2 sse2) + $(meson_feature cpu_flags_x86_ssse3 ssse3) + $(meson_feature altivec vmx) + $(meson_feature neon neon) + $(meson_feature loongson2f loongson-mmi) + -Dgtk=disabled + -Dlibpng=disabled ) - xorg-2_src_configure + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install }