* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-295.53.ebuild ChangeLog nvidia-drivers-173.14.34.ebuild nvidia-drivers-295.49.ebuild
@ 2012-05-21 22:52 Doug Goldstein (cardoe)
0 siblings, 0 replies; only message in thread
From: Doug Goldstein (cardoe) @ 2012-05-21 22:52 UTC (permalink / raw
To: gentoo-commits
cardoe 12/05/21 22:52:59
Modified: nvidia-drivers-295.53.ebuild ChangeLog
nvidia-drivers-173.14.34.ebuild
nvidia-drivers-295.49.ebuild
Log:
Dropped the custom-cflags USE flag in favor of calling epatch_user to give users more flexibility.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild?r1=1.1&r2=1.2
Index: nvidia-drivers-295.53.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-drivers-295.53.ebuild 21 May 2012 22:04:23 -0000 1.1
+++ nvidia-drivers-295.53.ebuild 21 May 2012 22:52:59 -0000 1.2
@@ -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-drivers-295.53.ebuild,v 1.1 2012/05/21 22:04:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild,v 1.2 2012/05/21 22:52:59 cardoe Exp $
EAPI="2"
@@ -21,7 +21,7 @@
LICENSE="NVIDIA"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux +tools"
RESTRICT="strip"
EMULTILIB_PKG="true"
@@ -292,20 +292,15 @@
-e 's:-Wsign-compare::g' \
"${NV_SRC}"/Makefile.kbuild
- # Fix building with Linux 3.3.x wrt #408841
- sed -i \
- -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \
- kernel/conftest.sh || die
-
- # If you set this then it's your own fault when stuff breaks :)
- use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
# If greater than 2.6.5 use M= instead of SUBDIR=
convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
cat <<- EOF > "${S}"/nvidia.icd
/usr/$(get_libdir)/libcuda.so
EOF
+
+ # Allow user patches so they can support RC kernels and whatever else
+ epatch_user
}
src_compile() {
1.346 x11-drivers/nvidia-drivers/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.346&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.346&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?r1=1.345&r2=1.346
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- ChangeLog 21 May 2012 22:47:18 -0000 1.345
+++ ChangeLog 21 May 2012 22:52:59 -0000 1.346
@@ -1,6 +1,12 @@
# 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.345 2012/05/21 22:47:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.346 2012/05/21 22:52:59 cardoe Exp $
+
+ 21 May 2012; Doug Goldstein <cardoe@gentoo.org>
+ nvidia-drivers-173.14.34.ebuild, nvidia-drivers-295.49.ebuild,
+ nvidia-drivers-295.53.ebuild:
+ Dropped the custom-cflags USE flag in favor of calling epatch_user to give
+ users more flexibility.
*nvidia-drivers-173.14.34 (21 May 2012)
1.2 x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild?r1=1.1&r2=1.2
Index: nvidia-drivers-173.14.34.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-drivers-173.14.34.ebuild 21 May 2012 22:47:18 -0000 1.1
+++ nvidia-drivers-173.14.34.ebuild 21 May 2012 22:52:59 -0000 1.2
@@ -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-drivers-173.14.34.ebuild,v 1.1 2012/05/21 22:47:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v 1.2 2012/05/21 22:52:59 cardoe Exp $
EAPI="2"
@@ -19,7 +19,7 @@
LICENSE="NVIDIA"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags multilib kernel_linux tools"
+IUSE="acpi multilib kernel_linux tools"
RESTRICT="strip"
EMULTILIB_PKG="true"
@@ -274,12 +274,11 @@
-e 's:-Wsign-compare::g' \
"${NV_SRC}"/Makefile.kbuild
- # If you set this then it's your own fault when stuff breaks :)
- use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
# If greater than 2.6.5 use M= instead of SUBDIR=
convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
+
+ epatch_user
}
src_compile() {
1.5 x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild?r1=1.4&r2=1.5
Index: nvidia-drivers-295.49.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-drivers-295.49.ebuild 21 May 2012 22:04:23 -0000 1.4
+++ nvidia-drivers-295.49.ebuild 21 May 2012 22:52:59 -0000 1.5
@@ -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-drivers-295.49.ebuild,v 1.4 2012/05/21 22:04:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.5 2012/05/21 22:52:59 cardoe Exp $
EAPI="2"
@@ -21,7 +21,7 @@
LICENSE="NVIDIA"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux +tools"
RESTRICT="strip"
EMULTILIB_PKG="true"
@@ -297,15 +297,14 @@
-e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \
kernel/conftest.sh || die
- # If you set this then it's your own fault when stuff breaks :)
- use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
# If greater than 2.6.5 use M= instead of SUBDIR=
convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
cat <<- EOF > "${S}"/nvidia.icd
/usr/$(get_libdir)/libcuda.so
EOF
+
+ epatch_user
}
src_compile() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-21 22:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-21 22:52 [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-295.53.ebuild ChangeLog nvidia-drivers-173.14.34.ebuild nvidia-drivers-295.49.ebuild Doug Goldstein (cardoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox