From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 88AFC1388A9 for ; Wed, 6 Feb 2013 10:07:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CF8A21C026; Wed, 6 Feb 2013 10:07:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D91321C009 for ; Wed, 6 Feb 2013 10:07:26 +0000 (UTC) Received: from pomiocik.lan (213-238-96-111.adsl.inetia.pl [213.238.96.111]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 98E0133DFA1; Wed, 6 Feb 2013 10:07:24 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: aballier@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH] Convert virtualgl to cmake-multilib. Date: Wed, 6 Feb 2013 11:07:21 +0100 Message-Id: <1360145241-1869-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <20130205223518.734be97f@gentoo.org> References: <20130205223518.734be97f@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 29417f37-6685-4719-9699-982be25470bd X-Archives-Hash: 7afeb1aee96eed81510066064c5e8ef2 --- ...algl-2.3.2.ebuild => virtualgl-2.3.2-r1.ebuild} | 77 +++++----------------- 1 file changed, 17 insertions(+), 60 deletions(-) copy gx86/x11-misc/virtualgl/{virtualgl-2.3.2.ebuild => virtualgl-2.3.2-r1.ebuild} (52%) diff --git a/gx86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild b/gx86/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild similarity index 52% copy from gx86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild copy to gx86/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild index bd3d565..9e00995 100644 --- a/gx86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild +++ b/gx86/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.3 2013/02/05 17:38:27 pacho Exp $ -EAPI="4" -inherit cmake-utils multilib +EAPI=5 +inherit cmake-multilib multilib DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" HOMEPAGE="http://www.virtualgl.org/" @@ -16,14 +16,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" SLOT="0" LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" KEYWORDS="~amd64 ~x86" -IUSE="multilib ssl" +IUSE="ssl" RDEPEND="ssl? ( dev-libs/openssl ) media-libs/libjpeg-turbo x11-libs/libX11 x11-libs/libXext x11-libs/libXv - multilib? ( app-emulation/emul-linux-x86-xlibs + abi_x86_32? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-opengl ) virtual/glu @@ -31,7 +31,6 @@ RDEPEND="ssl? ( dev-libs/openssl ) DEPEND="${RDEPEND}" CMAKE_VERBOSE=1 -build32_dir="${WORKDIR}/${P}_build32" src_prepare() { # Use /var/lib, bug #428122 @@ -42,69 +41,27 @@ src_prepare() { } src_configure() { - # Configure 32bit version on multilib - use amd64 && use multilib && ( - einfo "Configuring 32bit libs..." - - local ABI=x86 - local CFLAGS="${CFLAGS--O2 -march=native -pipe} -m32" - local CXXFLAGS="${CFLAGS}" - local LDFLAGS="${LDFLAGS} -m32" - local BUILD_DIR="${build32_dir}" + local mycmakeargs=( + $(cmake-utils_use ssl VGL_USESSL) + -DVGL_DOCDIR=/usr/share/doc/${PF} + -DTJPEG_INCLUDE_DIR=/usr/include + ) - mycmakeargs=( - $(cmake-utils_use ssl VGL_USESSL) - -DVGL_DOCDIR=/usr/share/doc/"${P}" + abi_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" -DVGL_LIBDIR=/usr/$(get_libdir) - -DTJPEG_INCLUDE_DIR=/usr/include -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so - -DCMAKE_LIBRARY_PATH=/usr/lib32 - -DVGL_FAKELIBDIR=/usr/fakelib/32 + -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) + -DVGL_FAKELIBDIR=/usr/fakelib/${ABI} ) cmake-utils_src_configure - - einfo "Configuring 64bit libs..." - ) - - # Configure native version - mycmakeargs=( - $(cmake-utils_use ssl VGL_USESSL) - -DVGL_DOCDIR=/usr/share/doc/"${P}" - -DVGL_LIBDIR=/usr/$(get_libdir) - -DTJPEG_INCLUDE_DIR=/usr/include - -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so - -DCMAKE_LIBRARY_PATH=/usr/lib64 - -DVGL_FAKELIBDIR=/usr/fakelib/64 - ) - cmake-utils_src_configure -} - -src_compile() { - # Make 32bit version on multilib - use amd64 && use multilib && ( - einfo "Building 32bit libs..." - local BUILD_DIR="${build32_dir}" - cmake-utils_src_compile - - einfo "Building 64bit libs..." - ) - - # Make native version - cmake-utils_src_compile + } + multilib_parallel_foreach_abi abi_configure } src_install() { - # Install 32bit version on multilib - use amd64 && use multilib && ( - einfo "Installing 32bit libs..." - local BUILD_DIR="${build32_dir}" - cmake-utils_src_install - - einfo "Installing 64bit libs..." - ) - - # Install native version - cmake-utils_src_install + cmake-multilib_src_install # Make config dir dodir /var/lib/VirtualGL -- 1.8.1.2