/[packages]/backports/5/nvidia-current/current/SPECS/nvidia-current.spec
ViewVC logotype

Diff of /backports/5/nvidia-current/current/SPECS/nvidia-current.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 549116 by tmb, Sat Nov 2 16:36:46 2013 UTC revision 550648 by tmb, Mon Nov 11 23:22:22 2013 UTC
# Line 15  Line 15 
15    
16  %if !%simple  %if !%simple
17  # When updating, please add new ids to ldetect-lst (merge2pcitable.pl)  # When updating, please add new ids to ldetect-lst (merge2pcitable.pl)
18  %define version         319.60  %define version         331.20
19  %define rel             4  %define rel             1
20  # the highest supported videodrv abi  # the highest supported videodrv abi
21  %define videodrv_abi    14  %define videodrv_abi    14
22  %endif  %endif
# Line 115  Source5:       http://us.download.nvidia.com/X Line 115  Source5:       http://us.download.nvidia.com/X
115  %endif  %endif
116  # Script for building rpms of arbitrary nvidia installers (needs this .spec appended)  # Script for building rpms of arbitrary nvidia installers (needs this .spec appended)
117  Source10:       nvidia-mgabuild-skel  Source10:       nvidia-mgabuild-skel
 # https://qa.mandriva.com/show_bug.cgi?id=39921  
 Patch1:         nvidia-settings-enable-dyntwinview-mga.patch  
118  # include xf86vmproto for X_XF86VidModeGetGammaRampSize, fixes build on cooker  # include xf86vmproto for X_XF86VidModeGetGammaRampSize, fixes build on cooker
119  Patch3:         nvidia-settings-include-xf86vmproto.patch  Patch3:         nvidia-settings-include-xf86vmproto.patch
 # fix build with -rt patched 2.6.33+  
 Patch4:         nvidia-rt-2.6.33.patch  
 # (upstream) fix build with kernel 3.11  
 Patch6:         get_num_physpages_319.patch  
 # (tmb) fix build with kernel 3.12  
 Patch7:         nvidia-current-kernel-3.12.patch  
120  %endif  %endif
121  License:        Freeware  License:        Freeware
122  BuildRoot:      %{_tmppath}/%{name}-buildroot  BuildRoot:      %{_tmppath}/%{name}-buildroot
# Line 239  HTML version of the README.txt file prov Line 231  HTML version of the README.txt file prov
231  %else  %else
232  %setup -q -c -T -a 2 -a 3 -a 4 -a 5  %setup -q -c -T -a 2 -a 3 -a 4 -a 5
233  cd nvidia-settings-%{version}  cd nvidia-settings-%{version}
 %patch1 -p1  
234  %patch3 -p1  %patch3 -p1
235  cd ..  cd ..
236  %endif  %endif
237  sh %{nsource} --extract-only  sh %{nsource} --extract-only
238    
239  %if !%simple  #%if !%simple
240  cd %{pkgname}  #cd %{pkgname}
241  %patch4 -p1  #cd ..
242  %patch6 -p0  #%endif
 %patch7 -p1  
 cd ..  
 %endif  
243    
244  rm -rf %{pkgname}/usr/src/nv/precompiled  rm -rf %{pkgname}/usr/src/nv/precompiled
245    
# Line 261  mkdir -p %{pkgname}/kernel Line 249  mkdir -p %{pkgname}/kernel
249  %endif  %endif
250    
251  # (tmb) nuke nVidia provided dkms.conf as we need our own  # (tmb) nuke nVidia provided dkms.conf as we need our own
252  rm -rf %{pkgname}/kernel/dkms.conf  rm -f %{pkgname}/kernel/dkms.conf
253    rm -f %{pkgname}/kernel/uvm/dkms.conf.fragment
254    
255  # install our own dkms.conf  # install our own dkms.conf
256  cat > %{pkgname}/kernel/dkms.conf <<EOF  cat > %{pkgname}/kernel/dkms.conf <<EOF
257  PACKAGE_NAME="%{drivername}"  PACKAGE_NAME="%{drivername}"
258  PACKAGE_VERSION="%{version}-%{release}"  PACKAGE_VERSION="%{version}-%{release}"
259  BUILT_MODULE_NAME[0]="nvidia"  BUILT_MODULE_NAME[0]="nvidia"
260  DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"  DEST_MODULE_LOCATION[0]="/kernel/drivers/gpu/drm"
261  DEST_MODULE_NAME[0]="%{modulename}"  DEST_MODULE_NAME[0]="%{modulename}"
262  MAKE[0]="make SYSSRC=\${kernel_source_dir} module"  MAKE[0]="make SYSSRC=\${kernel_source_dir} module"
263  CLEAN="make -f Makefile.kbuild clean"  CLEAN="make -f Makefile.kbuild clean"
264  AUTOINSTALL="yes"  AUTOINSTALL="yes"
265  EOF  EOF
266    
267    # WIP! make uvm build work
268    #BUILT_MODULE_NAME[1]="nvidia-uvm"
269    #BUILT_MODULE_LOCATION[1]="uvm/"
270    #DEST_MODULE_LOCATION[1]="/kernel/drivers/gpu/drm"
271    #MAKE[0]+="; make SYSSRC=\${kernel_source_dir} -C uvm module KBUILD_EXTMOD=/var/lib/dkms/%{drivername}/%{version}-%{release}/build/uvm"
272    #CLEAN+="; make -C uvm clean"
273    
274  cat > README.install.urpmi <<EOF  cat > README.install.urpmi <<EOF
275  This driver is for %cards.  This driver is for %cards.
276    
# Line 525  cat .manifest | tail -n +9 | while read Line 521  cat .manifest | tail -n +9 | while read
521                  case $file in *libvdpau_nvidia.so*);; *) continue; esac                  case $file in *libvdpau_nvidia.so*);; *) continue; esac
522                  install_lib_symlink nvidia $nvidia_libdir/$subdir                  install_lib_symlink nvidia $nvidia_libdir/$subdir
523                  ;;                  ;;
524            VDPAU_WRAPPER_LIB)
525                    parseparams arch subdir
526                    case $file in *libvdpau_nvidia.so*);; *) continue; esac
527                    install_file nvidia $nvidia_libdir/$subdir
528                    ;;
529            VDPAU_WRAPPER_SYMLINK)
530                    parseparams arch subdir dest
531                    case $file in *libvdpau_nvidia.so*);; *) continue; esac
532                    install_lib_symlink nvidia $nvidia_libdir/$subdir
533                    ;;
534          XLIB_STATIC_LIB)          XLIB_STATIC_LIB)
535                  install_file nvidia-devel %{nvidia_libdir}                  install_file nvidia-devel %{nvidia_libdir}
536                  ;;                  ;;
# Line 666  cat .manifest | tail -n +9 | while read Line 672  cat .manifest | tail -n +9 | while read
672          DOT_DESKTOP)          DOT_DESKTOP)
673                  # we provide our own for now                  # we provide our own for now
674                  ;;                  ;;
675            UVM_MODULE_SRC)
676                    install_file nvidia-dkms %{_usrsrc}/%{drivername}-%{version}-%{release}/uvm
677                    ;;
678          *)          *)
679                  error_unhandled "file $(basename $file) of unknown type $type will be skipped"                  error_unhandled "file $(basename $file) of unknown type $type will be skipped"
680          esac          esac
# Line 981  rm -rf %{buildroot} Line 990  rm -rf %{buildroot}
990  %{nvidia_libdir}/vdpau/libvdpau_nvidia.so.%{version}  %{nvidia_libdir}/vdpau/libvdpau_nvidia.so.%{version}
991  %{nvidia_libdir}/libGL.so.1  %{nvidia_libdir}/libGL.so.1
992  %{nvidia_libdir}/libnvidia-cfg.so.1  %{nvidia_libdir}/libnvidia-cfg.so.1
993    %{nvidia_libdir}/libnvidia-fbc.so.1
994    %{nvidia_libdir}/libnvidia-fbc.so.%{version}
995  %{nvidia_libdir}/libnvidia-ifr.so.1  %{nvidia_libdir}/libnvidia-ifr.so.1
996  %{nvidia_libdir}/libnvidia-ifr.so.%{version}  %{nvidia_libdir}/libnvidia-ifr.so.%{version}
997  %{nvidia_libdir}/libnvidia-ml.so.1  %{nvidia_libdir}/libnvidia-ml.so.1
# Line 991  rm -rf %{buildroot} Line 1002  rm -rf %{buildroot}
1002  %dir %{nvidia_libdir32}  %dir %{nvidia_libdir32}
1003  %dir %{nvidia_libdir32}/tls  %dir %{nvidia_libdir32}/tls
1004  %dir %{nvidia_libdir32}/vdpau  %dir %{nvidia_libdir32}/vdpau
1005    
1006    %{nvidia_libdir32}/libEGL.so.1
1007    %{nvidia_libdir32}/libEGL.so.%{version}
1008  %{nvidia_libdir32}/libGL.so.%{version}  %{nvidia_libdir32}/libGL.so.%{version}
1009    %{nvidia_libdir32}/libGLESv1_CM.so.1
1010    %{nvidia_libdir32}/libGLESv1_CM.so.%{version}
1011    %{nvidia_libdir32}/libGLESv2.so.2
1012    %{nvidia_libdir32}/libGLESv2.so.%{version}
1013    %{nvidia_libdir32}/libnvidia-eglcore.so.%{version}
1014  %{nvidia_libdir32}/libnvidia-glcore.so.%{version}  %{nvidia_libdir32}/libnvidia-glcore.so.%{version}
1015    %{nvidia_libdir32}/libnvidia-glsi.so.%{version}
1016  %{nvidia_libdir32}/libnvidia-ifr.so.1  %{nvidia_libdir32}/libnvidia-ifr.so.1
1017  %{nvidia_libdir32}/libnvidia-ifr.so.%{version}  %{nvidia_libdir32}/libnvidia-ifr.so.%{version}
1018  %{nvidia_libdir32}/libnvidia-ml.so.1  %{nvidia_libdir32}/libnvidia-ml.so.1
# Line 1039  rm -rf %{buildroot} Line 1059  rm -rf %{buildroot}
1059  %{nvidia_libdir}/libcuda.so  %{nvidia_libdir}/libcuda.so
1060  %{nvidia_libdir}/libnvcuvid.so  %{nvidia_libdir}/libnvcuvid.so
1061  %{nvidia_libdir}/libnvidia-cfg.so  %{nvidia_libdir}/libnvidia-cfg.so
1062    %{nvidia_libdir}/libnvidia-fbc.so
1063  %{nvidia_libdir}/libnvidia-ifr.so  %{nvidia_libdir}/libnvidia-ifr.so
1064  %{nvidia_libdir}/libOpenCL.so  %{nvidia_libdir}/libOpenCL.so
1065  %{nvidia_libdir}/libnvidia-ml.so  %{nvidia_libdir}/libnvidia-ml.so
1066  %{nvidia_libdir}/libnvidia-encode.so  %{nvidia_libdir}/libnvidia-encode.so
1067  %ifarch %{biarches}  %ifarch %{biarches}
1068  %{nvidia_libdir32}/libnvidia-ml.so  %{nvidia_libdir32}/libnvidia-ml.so
1069    %{nvidia_libdir32}/libEGL.so
1070  %{nvidia_libdir32}/libGL.so  %{nvidia_libdir32}/libGL.so
1071    %{nvidia_libdir32}/libGLESv1_CM.so
1072    %{nvidia_libdir32}/libGLESv2.so
1073  %{nvidia_libdir32}/libcuda.so  %{nvidia_libdir32}/libcuda.so
1074  %{nvidia_libdir32}/libnvcuvid.so  %{nvidia_libdir32}/libnvcuvid.so
1075  %{nvidia_libdir32}/libnvidia-ifr.so  %{nvidia_libdir32}/libnvidia-ifr.so
Legend:
Removed from v.549116  
changed lines
  Added in v.550648
  ViewVC Help
Powered by ViewVC 1.1.30