From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SUg3r-0001gP-TA for garchives@archives.gentoo.org; Wed, 16 May 2012 15:22:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF5ACE0CD6; Wed, 16 May 2012 15:22:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 68D7FE0CD6 for ; Wed, 16 May 2012 15:22:35 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 949E51B401C for ; Wed, 16 May 2012 15:22:34 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 52E1D2004B; Wed, 16 May 2012 15:22:33 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: ChangeLog nvidia-drivers-295.49.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog nvidia-drivers-295.49.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20120516152233.52E1D2004B@flycatcher.gentoo.org> Date: Wed, 16 May 2012 15:22:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fd800420-5031-4b4c-8570-73f5fa6514a5 X-Archives-Hash: 4b5d2869cdd1b0f0975a4d6e2e737f31 aballier 12/05/16 15:22:33 Modified: ChangeLog nvidia-drivers-295.49.ebuild Log: Add support for x86_64 FreeBSD. Do not try to install 32bits libs if mu= ltilib is not requested as the FreeBSD x86_64 package does not provide 32= bits libs. Merge most of x86-fbsd code under kernel_FreeBSD as the x86 an= d x86_64 packages are similar. Keyword ~amd64-fbsd. =20 (Portage version: 2.2.0_alpha105/cvs/Linux x86_64) Revision Changes Path 1.343 x11-drivers/nvidia-drivers/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/ChangeLog?rev=3D1.343&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/ChangeLog?rev=3D1.343&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/ChangeLog?r1=3D1.342&r2=3D1.343 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- ChangeLog 4 May 2012 14:58:57 -0000 1.342 +++ ChangeLog 16 May 2012 15:22:33 -0000 1.343 @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,= v 1.342 2012/05/04 14:58:57 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,= v 1.343 2012/05/16 15:22:33 aballier Exp $ + + 16 May 2012; Alexis Ballier + nvidia-drivers-295.49.ebuild: + Add support for x86_64 FreeBSD. Do not try to install 32bits libs if m= ultilib + is not requested as the FreeBSD x86_64 package does not provide 32bits= libs. + Merge most of x86-fbsd code under kernel_FreeBSD as the x86 and x86_64 + packages are similar. Keyword ~amd64-fbsd. =20 04 May 2012; Doug Goldstein nvidia-drivers-295.49.= ebuild, metadata.xml: 1.3 x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebu= ild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-295.49.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-295.49.ebuild?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-295.49.ebuild?r1=3D1.2&r2=3D1.3 Index: nvidia-drivers-295.49.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drive= rs-295.49.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nvidia-drivers-295.49.ebuild 4 May 2012 14:58:57 -0000 1.2 +++ nvidia-drivers-295.49.ebuild 16 May 2012 15:22:33 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-dri= vers-295.49.ebuild,v 1.2 2012/05/04 14:58:57 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-dri= vers-295.49.ebuild,v 1.3 2012/05/16 15:22:33 aballier Exp $ =20 EAPI=3D"2" =20 @@ -9,17 +9,19 @@ X86_NV_PACKAGE=3D"NVIDIA-Linux-x86-${PV}" AMD64_NV_PACKAGE=3D"NVIDIA-Linux-x86_64-${PV}" X86_FBSD_NV_PACKAGE=3D"NVIDIA-FreeBSD-x86-${PV}" +AMD64_FBSD_NV_PACKAGE=3D"NVIDIA-FreeBSD-x86_64-${PV}" =20 DESCRIPTION=3D"NVIDIA X11 driver and GLX libraries" HOMEPAGE=3D"http://www.nvidia.com/" SRC_URI=3D"x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/= ${X86_NV_PACKAGE}.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AM= D64_NV_PACKAGE}.run ) + amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${P= V}/${AMD64_FBSD_NV_PACKAGE}.tar.gz ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${= X86_FBSD_NV_PACKAGE}.tar.gz )" =20 LICENSE=3D"NVIDIA" SLOT=3D"0" -KEYWORDS=3D"-* ~amd64 ~x86 ~x86-fbsd" -IUSE=3D"acpi custom-cflags multilib kernel_linux +tools" +KEYWORDS=3D"-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE=3D"acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools" RESTRICT=3D"strip" EMULTILIB_PKG=3D"true" =20 @@ -234,7 +236,8 @@ =20 # set variables to where files are in the package structure if use kernel_FreeBSD; then - S=3D"${WORKDIR}/${X86_FBSD_NV_PACKAGE}" + use x86-fbsd && S=3D"${WORKDIR}/${X86_FBSD_NV_PACKAGE}" + use amd64-fbsd && S=3D"${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}" NV_DOC=3D"${S}/doc" NV_EXEC=3D"${S}/obj" NV_LIB=3D"${S}/obj" @@ -270,7 +273,7 @@ ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as = they will be ignored." fi =20 - if ! use x86-fbsd; then + if ! use kernel_FreeBSD; then cd "${S}" unpack_makeself else @@ -280,7 +283,7 @@ =20 src_prepare() { # Please add a brief description for every added patch - use x86-fbsd && cd doc + use kernel_FreeBSD && cd doc =20 if use kernel_linux; then # Quiet down warnings the user does not need to see @@ -310,7 +313,7 @@ # it by itself, pass this. =20 cd "${NV_SRC}" - if use x86-fbsd; then + if use kernel_FreeBSD; then MAKE=3D"$(get_bmake)" CFLAGS=3D"-Wno-sign-compare" emake CC=3D"$(tc-ge= tCC)" \ LD=3D"$(tc-getLD)" LDFLAGS=3D"$(raw-ldflags)" || die elif use kernel_linux; then @@ -342,9 +345,11 @@ =20 insinto /lib/udev/rules.d newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules - elif use x86-fbsd; then - insinto /boot/modules - doins "${S}/src/nvidia.kld" || die + elif use kernel_FreeBSD; then + if use x86-fbsd; then + insinto /boot/modules + doins "${S}/src/nvidia.kld" || die + fi =20 exeinto /boot/modules doexe "${S}/src/nvidia.ko" || die @@ -416,7 +421,7 @@ =20 # Documentation dohtml ${NV_DOC}/html/* - if use x86-fbsd; then + if use kernel_FreeBSD; then dodoc "${NV_DOC}/README" doman "${NV_MAN}/nvidia-xconfig.1" doman "${NV_MAN}/nvidia-settings.1" @@ -451,7 +456,7 @@ =20 doicon ${NV_EXEC}/nvidia-settings.png =20 - if has_multilib_profile ; then + if has_multilib_profile && use multilib ; then local OABI=3D${ABI} for ABI in $(get_install_abis) ; do src_install-libs @@ -502,7 +507,7 @@ # The GLX libraries donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use x86-fbsd; then + if use kernel_FreeBSD; then donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} else donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}