]> git.pld-linux.org Git - packages/xorg-driver-video-nvidia.git/blobdiff - xorg-driver-video-nvidia.spec
projects / packages / xorg-driver-video-nvidia.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- new patches
[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 2ad1d8e987138e96ba005612200eb0383e3324e4..06b4e9e6e3e7f6b9e0fcca6faca17c496d7622ba 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,12 +4,11 @@
 %bcond_without smp             # without smp packages
 %bcond_without kernel          # without kernel packages
 %bcond_with    verbose         # verbose build (V=1)
-%bcond_with    tls             # install libraries with tls support
 #
 %define                _nv_ver         1.0
-%define                _nv_rel         6111
+%define                _nv_rel         6629
 %define                _min_x11        6.7.0
-%define                _rel            5
+%define                _rel            4
 #
 Summary:       Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):   Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -21,16 +20,21 @@ Vendor:             nVidia Corp.
 Group:         X11/XFree86
 # why not pkg0!?
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: 51e83be46f83c52102ccb8995b54f4e2
-# Source0-size:        8167999
+# Source0-md5: f7737c1e95371f37a4fd30da2f11e72c
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
-# Source1-md5: 6c7b0c8b3ce5c34186e0c80042e6d046
-# Source1-size:        7333486
+# Source1-md5: 652e69f549c81a7a3f2806daa74b9c36
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
-Patch2:                %{name}-pci_x_class.patch
-Patch3:                %{name}-enable-pci.patch 
-Patch4:                %{name}-power-suspend.patch
+Patch2:                %{name}-conftest.patch
+# http://www.minion.de/files/1.0-6629/
+Patch3:                NVIDIA_kernel-1.0-6629-1155389.diff
+Patch4:                NVIDIA_kernel-1.0-6629-1161283.diff
+Patch5:                NVIDIA_kernel-1.0-6629-1165235.diff
+Patch6:                NVIDIA_kernel-1.0-6629-1171869.diff
+Patch7:                NVIDIA_kernel-1.0-6629-1175225.diff
+Patch8:                NVIDIA_kernel-1.0-6629-1182399.diff
+Patch9:                NVIDIA_kernel-1.0-6629-1189413.diff
+Patch10:       NVIDIA_kernel-1.0-6629-1201042.diff
 URL:           http://www.nvidia.com/object/linux.html
 BuildConflicts:        XFree86-nvidia
 BuildRequires: grep
@@ -43,7 +47,6 @@ BuildRequires:        textutils
 Requires:      X11-Xserver
 Requires:      X11-libs >= %{_min_x11}
 Requires:      X11-modules >= %{_min_x11}
-%{?with_tls:Requires:  glibc(tls)}
 Provides:      X11-OpenGL-core
 Provides:      X11-OpenGL-libGL
 Provides:      XFree86-OpenGL-core
@@ -175,8 +178,14 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -195,10 +204,14 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        touch include/config/MARKER
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD \
                M=$PWD O=$PWD \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
                CC="%{__cc}" CPP="%{__cpp}" \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD \
                M=$PWD O=$PWD \
                %{?with_verbose:V=1}
        mv nvidia.ko nvidia-$cfg.ko
@@ -208,12 +221,13 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
-       $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib},%{_bindir}}
+       $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
-install usr/lib%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}
+install usr/lib/tls/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}/tls
 install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
        $RPM_BUILD_ROOT%{_libdir}/modules/extensions
@@ -226,6 +240,7 @@ install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 
 install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers
 install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 install usr/include/GL/*.h     $RPM_BUILD_ROOT/usr/include/GL
 #install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 
@@ -237,6 +252,7 @@ ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1
 ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
 
+%if %{with kernel}
 cd usr/src/nv/
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
@@ -245,6 +261,7 @@ install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 install nvidia-smp.ko \
        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -282,12 +299,14 @@ EOF
 %defattr(644,root,root,755)
 %doc LICENSE
 %doc usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample}
-%lang(de) %doc usr/share/doc/README.DE
+#%%lang(de) %doc usr/share/doc/README.DE
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
-%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
+%dir /usr/%{_lib}/tls
+%attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
+%attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
 %ifarch amd64
 # support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
 #dir %{_libdir32}
Linux Drivers for nVidia GeForce/Quadro Chips
This page took 0.034974 seconds and 4 git commands to generate.