SPECS: xorg-driver-video-nvidia-legacy2.spec, xorg-driver-video-nv...
hawk
hawk at pld-linux.org
Wed Apr 30 23:47:15 CEST 2008
Author: hawk Date: Wed Apr 30 21:47:15 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix building with kernel 2.6.25
---- Files affected:
SPECS:
xorg-driver-video-nvidia-legacy2.spec (1.39 -> 1.40) , xorg-driver-video-nvidia-legacy.spec (1.60 -> 1.61) , xorg-driver-video-nvidia.spec (1.145 -> 1.146)
---- Diffs:
================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy2.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy2.spec:1.39 SPECS/xorg-driver-video-nvidia-legacy2.spec:1.40
--- SPECS/xorg-driver-video-nvidia-legacy2.spec:1.39 Thu Mar 27 21:57:12 2008
+++ SPECS/xorg-driver-video-nvidia-legacy2.spec Wed Apr 30 23:47:10 2008
@@ -26,6 +26,7 @@
# Source1-md5: 5285d2b3205e0e571dc1fff668c89e06
Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-desktop.patch
+Patch2: NVIDIA_kernel-96.43.05-2290218.diff
URL: http://www.nvidia.com/object/unix.html
BuildRequires: %{kgcc_package}
%if %{with kernel}
@@ -174,6 +175,9 @@
%endif
%patch0 -p1
%patch1 -p1
+%if "%{_kernel_ver}" >= "2.6.25"
+%patch2 -p0
+%endif
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
%build
@@ -304,6 +308,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2008-04-30 21:47:10 hawk
+- fix building with kernel 2.6.25
+
Revision 1.39 2008-03-27 20:57:12 glen
- rel 7 (2.6.22.19-5)
================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.60 SPECS/xorg-driver-video-nvidia-legacy.spec:1.61
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.60 Mon Apr 7 22:52:08 2008
+++ SPECS/xorg-driver-video-nvidia-legacy.spec Wed Apr 30 23:47:10 2008
@@ -27,6 +27,7 @@
Patch0: X11-driver-nvidia-legacy-gcc34.patch
Patch1: X11-driver-nvidia-legacy-GL.patch
Patch2: %{pname}-desktop.patch
+Patch3: NVIDIA_kernel-71.86.04-2305230.diff
URL: http://www.nvidia.com/object/unix.html
BuildRequires: %{kgcc_package}
%if %{with kernel} && %{with dist_kernel}
@@ -155,6 +156,9 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%if "%{_kernel_ver}" >= "2.6.25"
+%patch3 -p0
+%endif
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
%build
@@ -269,6 +273,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.61 2008-04-30 21:47:10 hawk
+- fix building with kernel 2.6.25
+
Revision 1.60 2008-04-07 20:52:08 twittner
- too much '}' ?
================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.145 SPECS/xorg-driver-video-nvidia.spec:1.146
--- SPECS/xorg-driver-video-nvidia.spec:1.145 Wed Apr 30 23:03:01 2008
+++ SPECS/xorg-driver-video-nvidia.spec Wed Apr 30 23:47:10 2008
@@ -28,6 +28,7 @@
Source2: %{pname}-xinitrc.sh
Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-desktop.patch
+Patch2: NVIDIA_kernel-169.12-2286310.diff
URL: http://www.nvidia.com/object/unix.html
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -165,6 +166,9 @@
%endif
%patch0 -p1
%patch1 -p1
+%if "%{_kernel_ver}" >= "2.6.25"
+%patch2 -p0
+%endif
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
%build
@@ -348,6 +352,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.146 2008-04-30 21:47:10 hawk
+- fix building with kernel 2.6.25
+
Revision 1.145 2008-04-30 21:03:01 hawk
- reverted back to stable drivers, beta branched as DEVEL (they doesn't
work ok, screen gets corrupted)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia-legacy2.spec?r1=1.39&r2=1.40&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia-legacy.spec?r1=1.60&r2=1.61&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia.spec?r1=1.145&r2=1.146&f=u
More information about the pld-cvs-commit
mailing list