* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-16 20:54 Doug Klima (cardoe)
0 siblings, 0 replies; 7+ messages in thread
From: Doug Klima (cardoe) @ 2008-01-16 20:54 UTC (permalink / raw
To: gentoo-commits
cardoe 08/01/16 20:54:08
Modified: nvidia-drivers-169.07.ebuild
Log:
missed some use uses for USE flags.
(Portage version: 2.1.4)
Revision Changes Path
1.4 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.3&r2=1.4
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 20:39:59 -0000 1.3
+++ nvidia-drivers-169.07.ebuild 16 Jan 2008 20:54:08 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.3 2008/01/16 20:39:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.4 2008/01/16 20:54:08 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -17,7 +17,7 @@
LICENSE="NVIDIA"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib"
+IUSE="acpi custom-cflags gtk multilib kernel_linux"
RESTRICT="strip"
EMULTILIB_PKG="true"
@@ -152,7 +152,7 @@
}
src_unpack() {
- if kernel_linux && kernel_is lt 2 6 7; then
+ if use kernel_linux && kernel_is lt 2 6 7; then
echo
ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
ewarn "This is not officially supported for ${P}. It is likely you"
@@ -206,7 +206,7 @@
cd "${NV_SRC}"
if use x86-fbsd; then
MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
- elif kernel_linux; then
+ elif use kernel_linux; then
linux-mod_src_compile
fi
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-18 21:26 Doug Klima (cardoe)
0 siblings, 0 replies; 7+ messages in thread
From: Doug Klima (cardoe) @ 2008-01-18 21:26 UTC (permalink / raw
To: gentoo-commits
cardoe 08/01/18 21:26:47
Modified: nvidia-drivers-169.07.ebuild
Log:
more QA_ configurations for x86
(Portage version: 2.1.4)
Revision Changes Path
1.8 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.7&r2=1.8
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 22:00:05 -0000 1.7
+++ nvidia-drivers-169.07.ebuild 18 Jan 2008 21:26:47 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.7 2008/01/16 22:00:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.8 2008/01/18 21:26:47 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -58,7 +58,7 @@
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}"
-QA_EXECSTACK_x86=" usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
usr/lib/opengl/nvidia/extensions/libglx.so"
@@ -74,6 +74,10 @@
usr/lib64/opengl/nvidia/extensions/libglx.so
usr/bin/nvidia-xconfig"
+QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so"
+
if use x86; then
PKG_V="-pkg0"
NV_PACKAGE="${X86_NV_PACKAGE}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-16 22:00 Doug Klima (cardoe)
0 siblings, 0 replies; 7+ messages in thread
From: Doug Klima (cardoe) @ 2008-01-16 22:00 UTC (permalink / raw
To: gentoo-commits
cardoe 08/01/16 22:00:05
Modified: nvidia-drivers-169.07.ebuild
Log:
more FreeBSD CFLAG tweaking. x86 TEXTRELS and EXECSTACK addition
(Portage version: 2.1.4)
Revision Changes Path
1.7 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.6&r2=1.7
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 21:37:46 -0000 1.6
+++ nvidia-drivers-169.07.ebuild 16 Jan 2008 22:00:05 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.6 2008/01/16 21:37:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.7 2008/01/16 22:00:05 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -35,6 +35,15 @@
acpi? ( sys-power/acpid )"
PDEPEND="gtk? ( media-video/nvidia-settings )"
+QA_TEXTRELS_x86="usr/lib/libXvMCNVIDIA.so.${PV}
+ usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+ usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so
+ usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
usr/lib/opengl/nvidia/lib/libGL.so.1
usr/lib/opengl/nvidia/lib/libGLcore.so.1
@@ -49,7 +58,11 @@
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}"
-QA_EXECSTACK_amd64=" usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+QA_EXECSTACK_x86=" usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
usr/lib64/xorg/modules/drivers/nvidia_drv.so
usr/lib64/libXvMCNVIDIA.so.${PV}
@@ -182,8 +195,8 @@
cd "${NV_SRC}"
if use x86-fbsd; then
- MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
- LDFLAGS="$(raw-ldflags)" CFLAGS="-Wno-sign-compare"|| die
+ MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
elif use kernel_linux; then
linux-mod_src_compile
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-16 21:37 Doug Klima (cardoe)
0 siblings, 0 replies; 7+ messages in thread
From: Doug Klima (cardoe) @ 2008-01-16 21:37 UTC (permalink / raw
To: gentoo-commits
cardoe 08/01/16 21:37:47
Modified: nvidia-drivers-169.07.ebuild
Log:
silence FreeBSD warnings. add FreeBSD TEXTRELS
(Portage version: 2.1.4)
Revision Changes Path
1.6 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.5&r2=1.6
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 21:09:21 -0000 1.5
+++ nvidia-drivers-169.07.ebuild 16 Jan 2008 21:37:46 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.5 2008/01/16 21:09:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.6 2008/01/16 21:37:46 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -35,6 +35,14 @@
acpi? ( sys-power/acpid )"
PDEPEND="gtk? ( media-video/nvidia-settings )"
+QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+ usr/lib/opengl/nvidia/lib/libGL.so.1
+ usr/lib/opengl/nvidia/lib/libGLcore.so.1
+ usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.1
+ usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1
+ usr/lib/opengl/nvidia/extensions/libglx.so
+ usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
@@ -174,7 +182,8 @@
cd "${NV_SRC}"
if use x86-fbsd; then
- MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+ MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+ LDFLAGS="$(raw-ldflags)" CFLAGS="-Wno-sign-compare"|| die
elif use kernel_linux; then
linux-mod_src_compile
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-16 21:09 Doug Klima (cardoe)
0 siblings, 0 replies; 7+ messages in thread
From: Doug Klima (cardoe) @ 2008-01-16 21:09 UTC (permalink / raw
To: gentoo-commits
cardoe 08/01/16 21:09:22
Modified: nvidia-drivers-169.07.ebuild
Log:
remove all the QA_EXECSTACKS, QA_WXLOAD, and QA_TEXTRELS so we can get an accurate list of what nvidia still does
(Portage version: 2.1.4)
Revision Changes Path
1.5 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.4&r2=1.5
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 20:54:08 -0000 1.4
+++ nvidia-drivers-169.07.ebuild 16 Jan 2008 21:09:21 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.4 2008/01/16 20:54:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.5 2008/01/16 21:09:21 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -35,55 +35,24 @@
acpi? ( sys-power/acpid )"
PDEPEND="gtk? ( media-video/nvidia-settings )"
-QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
- usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
- usr/lib/libXvMCNVIDIA.so.${PV}
- usr/lib/xorg/modules/drivers/nvidia_drv.so
- usr/lib/opengl/nvidia/extensions/libglx.so"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
- usr/lib/opengl/nvidia/lib/libGL.so.1
- usr/lib/opengl/nvidia/lib/libGLcore.so.1
- usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-#QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-# usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-# usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-# usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-# usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib/opengl/nvidia/extensions/libglx.so"
-
-#QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-# usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-# usr/lib64/opengl/nvidia/extensions/libglx.so
-# usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-# usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/drivers/nvidia_drv.so
- usr/lib/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib/opengl/nvidia/extensions/libglx.so
- usr/lib/libXvMCNVIDIA.so.${PV}
+QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+ usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}"
+
+QA_EXECSTACK_amd64=" usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/xorg/modules/drivers/nvidia_drv.so
+ usr/lib64/libXvMCNVIDIA.so.${PV}
+ usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+ usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+ usr/lib64/opengl/nvidia/extensions/libglx.so
usr/bin/nvidia-xconfig"
-#QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
-# usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-# usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-# usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-# usr/lib64/opengl/nvidia/extensions/libglx.so
-# usr/lib64/libXvMCNVIDIA.so.${PV}
-# usr/bin/nvidia-xconfig"
-
if use x86; then
PKG_V="-pkg0"
NV_PACKAGE="${X86_NV_PACKAGE}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-16 20:39 Doug Klima (cardoe)
0 siblings, 0 replies; 7+ messages in thread
From: Doug Klima (cardoe) @ 2008-01-16 20:39 UTC (permalink / raw
To: gentoo-commits
cardoe 08/01/16 20:39:59
Modified: nvidia-drivers-169.07.ebuild
Log:
tweak some more directory usage
(Portage version: 2.1.4)
Revision Changes Path
1.3 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.2&r2=1.3
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 19:21:15 -0000 1.2
+++ nvidia-drivers-169.07.ebuild 16 Jan 2008 20:39:59 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.2 2008/01/16 19:21:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.3 2008/01/16 20:39:59 cardoe Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -17,7 +17,7 @@
LICENSE="NVIDIA"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi gtk multilib"
+IUSE="acpi custom-cflags gtk multilib"
RESTRICT="strip"
EMULTILIB_PKG="true"
@@ -53,21 +53,21 @@
usr/lib/opengl/nvidia/extensions/libglx.so
usr/lib/xorg/modules/drivers/nvidia_drv.so"
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
- usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}"
+#QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+# usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+# usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+# usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+# usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}"
QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
usr/lib/opengl/nvidia/extensions/libglx.so"
-QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib64/opengl/nvidia/extensions/libglx.so
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}"
+#QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+# usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+# usr/lib64/opengl/nvidia/extensions/libglx.so
+# usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+# usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}"
QA_EXECSTACK_x86="usr/lib/xorg/modules/drivers/nvidia_drv.so
usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -76,13 +76,13 @@
usr/lib/libXvMCNVIDIA.so.${PV}
usr/bin/nvidia-xconfig"
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
- usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
- usr/lib64/opengl/nvidia/extensions/libglx.so
- usr/lib64/libXvMCNVIDIA.so.${PV}
- usr/bin/nvidia-xconfig"
+#QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
+# usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+# usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+# usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+# usr/lib64/opengl/nvidia/extensions/libglx.so
+# usr/lib64/libXvMCNVIDIA.so.${PV}
+# usr/bin/nvidia-xconfig"
if use x86; then
PKG_V="-pkg0"
@@ -95,7 +95,7 @@
NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
fi
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
+S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
mtrr_check() {
ebegin "Checking for MTRR support"
@@ -119,9 +119,9 @@
die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
fi
- if kernel_linux; then
+ if use kernel_linux; then
linux-mod_pkg_setup
- MODULE_NAMES="nvidia(video:${S})"
+ MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
mtrr_check
fi
@@ -141,17 +141,17 @@
if use kernel_FreeBSD; then
NV_DOC="${S}/doc"
NV_EXEC="${S}/obj"
+ NV_SRC="${S}/src"
elif use kernel_linux; then
NV_DOC="${S}/usr/share/doc"
NV_EXEC="${S}/usr/bin"
+ NV_SRC="${S}/usr/src/nv"
else
die "Could not determine proper NVIDIA package"
fi
}
src_unpack() {
- local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
-
if kernel_linux && kernel_is lt 2 6 7; then
echo
ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
@@ -170,9 +170,9 @@
fi
# Patches go below here, add brief description
- use x86-fbsd \
- && cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
- || cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+ cd "${S}"
+ use x86-fbsd && cd doc
+
# Use the correct defines to make gtkglext build work
epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
# Use some more sensible gl headers and make way for new glext.h
@@ -188,13 +188,13 @@
sed -i \
-e 's:-Wpointer-arith::g' \
-e 's:-Wsign-compare::g' \
- "${S}"/Makefile.kbuild
+ "${NV_SRC}"/Makefile.kbuild
# If you set this then it's your own fault when stuff breaks :)
- [[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
+ use custom-cflags && sed -i "s:-O:${CFLAGS}:" Makefile.*
# If greater than 2.6.5 use M= instead of SUBDIR=
- cd "${S}"; convert_to_m Makefile.kbuild
+ convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
}
@@ -202,9 +202,9 @@
# This is already the default on Linux, as there's no toplevel Makefile, but
# on FreeBSD there's one and triggers the kernel module build, as we install
# it by itself, pass this.
+
+ cd "${NV_SRC}"
if use x86-fbsd; then
- cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src"
- echo LDFLAGS="$(raw-ldflags)"
MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
elif kernel_linux; then
linux-mod_src_compile
@@ -214,7 +214,7 @@
src_install() {
local MLTEST=$(type dyn_unpack)
- cd "${WORKDIR}"/${NV_PACKAGE}${PKG_V}
+ cd "${S}"
if use kernel_linux; then
linux-mod_src_install
@@ -234,10 +234,10 @@
doins "${WORKDIR}"/nvidia || die
elif use x86-fbsd; then
insinto /boot/modules
- doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld" || die
+ doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
exeinto /boot/modules
- doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko" || die
+ doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
fi
if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
@@ -260,14 +260,14 @@
is_final_abi || return 0
# Documentation
- dodoc ${NV_DOC}/{XF86Config.sample,Copyrights}
- dohtml ${NV_DOC}/html/*
+ dodoc "${NV_DOC}"/{XF86Config.sample,Copyrights}
+ dohtml "${NV_DOC}"/html/*
if use x86-fbsd; then
- dodoc doc/README
+ dodoc "${NV_DOC}/README"
else
# Docs
- newdoc usr/share/doc/README.txt README
- dodoc usr/share/doc/NVIDIA_Changelog
+ newdoc "${NV_DOC}/README.txt" README
+ dodoc "${NV_DOC}/NVIDIA_Changelog"
fi
# Helper Apps
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild
@ 2008-01-16 19:21 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 7+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2008-01-16 19:21 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 08/01/16 19:21:15
Modified: nvidia-drivers-169.07.ebuild
Log:
whitespace
(Portage version: 2.1.3.19)
Revision Changes Path
1.2 x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild?r1=1.1&r2=1.2
Index: nvidia-drivers-169.07.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-drivers-169.07.ebuild 16 Jan 2008 16:20:54 -0000 1.1
+++ nvidia-drivers-169.07.ebuild 16 Jan 2008 19:21:15 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.1 2008/01/16 16:20:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.2 2008/01/16 19:21:15 mr_bones_ Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -262,7 +262,7 @@
# Documentation
dodoc ${NV_DOC}/{XF86Config.sample,Copyrights}
dohtml ${NV_DOC}/html/*
- if use x86-fbsd; then
+ if use x86-fbsd; then
dodoc doc/README
else
# Docs
@@ -272,7 +272,7 @@
# Helper Apps
dobin ${NV_EXEC}/nvidia-xconfig || die
- dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+ dobin ${NV_EXEC}/nvidia-bug-report.sh || die
}
# Install nvidia library:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-01-18 21:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-16 20:54 [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-169.07.ebuild Doug Klima (cardoe)
-- strict thread matches above, loose matches on Subject: below --
2008-01-18 21:26 Doug Klima (cardoe)
2008-01-16 22:00 Doug Klima (cardoe)
2008-01-16 21:37 Doug Klima (cardoe)
2008-01-16 21:09 Doug Klima (cardoe)
2008-01-16 20:39 Doug Klima (cardoe)
2008-01-16 19:21 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox