View | Details | Raw Unified | Return to bug 261666 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11/linux-nvidia-libs/Makefile (-17 / +28 lines)
Lines 1-5 Link Here
1 
PORTNAME=	nvidia-libs
 1 
PORTNAME=	nvidia-libs
2 
DISTVERSION?=	470.86
 2 
DISTVERSION?=	510.47.03
3 
# Always try to set PORTREVISION as it can be overridden by the slave ports
 3 
# Always try to set PORTREVISION as it can be overridden by the slave ports
4 
PORTREVISION?=	0
 4 
PORTREVISION?=	0
5 
CATEGORIES=	x11 linux
 5 
CATEGORIES=	x11 linux
Lines 121-127 PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \ Link Here
121 
		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
 121 
		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
122 
		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
 122 
		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
123 
.endif
 123 
.endif
124 
.if ${NVVERSION} >= 470.04201 # 470.42.01
 124 
.if ${NVVERSION} >= 495.02905 # 495.29.05
125 
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.9
126 
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
127 
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'
128 
.elif ${NVVERSION} >= 470.04201 # 470.42.01
125 
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.7
 129 
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.7
126 
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1
 130 
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1
127 
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/'
 131 
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/'
Lines 168-192 PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/' Link Here
168 
.else
 172 
.else
169 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
 173 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
170 
.endif
 174 
.endif
175 
.if ${NVVERSION} >= 331.013 && ${NVVERSION} < 495.02905
176 
LINUX_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
177 
LINUX_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
178 
		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
179 
LINUX32_LIBS+=	libnvidia-ifr.so.${PORTVERSION}
180 
LINUX32_LINKS+=	libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
181 
		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
182 
.else
183 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-ifr,d'
184 
.endif
171 
.if ${NVVERSION} >= 331.013
 185 
.if ${NVVERSION} >= 331.013
172 
LINUX_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 186 
LINUX_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
173 
		libnvidia-fbc.so.${PORTVERSION} \
 187 
		libnvidia-fbc.so.${PORTVERSION} \
174 
		libnvidia-glsi.so.${PORTVERSION} \
 188 
		libnvidia-glsi.so.${PORTVERSION}
175 
		libnvidia-ifr.so.${PORTVERSION}
176 
LINUX_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
 189 
LINUX_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
177 
		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
 190 
		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
178 
		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
179 
		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
180 
LINUX32_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
 191 
LINUX32_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
181 
		libnvidia-fbc.so.${PORTVERSION} \
 192 
		libnvidia-fbc.so.${PORTVERSION} \
182 
		libnvidia-glsi.so.${PORTVERSION} \
 193 
		libnvidia-glsi.so.${PORTVERSION}
183 
		libnvidia-ifr.so.${PORTVERSION}
184 
LINUX32_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
 194 
LINUX32_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
185 
		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
 195 
		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so
186 
		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
187 
		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
188 
.else
 196 
.else
189 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi|ifr),d'
 197 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi),d'
190 
.endif
 198 
.endif
191 
.if ${NVVERSION} >= 310.014
 199 
.if ${NVVERSION} >= 310.014
192 
LINUX_LIBS+=	libnvidia-encode.so.${PORTVERSION}
 200 
LINUX_LIBS+=	libnvidia-encode.so.${PORTVERSION}
Lines 240-251 LINUX_DATA+= nvidia_icd.json /etc/vulkan/icd.d Link Here
240 
.else
 248 
.else
241 
PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
 249 
PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
242 
.endif
 250 
.endif
251 
.if ${NVVERSION} >= 410.057 && ${NVVERSION} < 495.02905
252 
LINUX_LIBS+=	libnvidia-cbl.so.${PORTVERSION}
253 
.else
254 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-cbl\.so,d'
255 
.endif
243 
.if ${NVVERSION} >= 410.057
 256 
.if ${NVVERSION} >= 410.057
244 
LINUX_LIBS+=	libnvidia-cbl.so.${PORTVERSION} \
 257 
LINUX_LIBS+=	libnvidia-rtcore.so.${PORTVERSION}
245 
		libnvidia-rtcore.so.${PORTVERSION}
246 
.else
 258 
.else
247 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-cbl\.so,d' \
 259 
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-rtcore\.so,d'
248 
		'\,${LINUXBASE}.*libnvidia-rtcore\.so,d'
249 
.endif
 260 
.endif
250 
.if ${NVVERSION} >= 396.018
 261 
.if ${NVVERSION} >= 396.018
251 
LINUX_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
 262 
LINUX_LIBS+=	libnvidia-glvkspirv.so.${PORTVERSION}
(-)b/x11/linux-nvidia-libs/distinfo (-3 / +3 lines)
Lines 1-6 Link Here
1 
TIMESTAMP = 1636390330
 1 
TIMESTAMP = 1643748640
2 
SHA256 (NVIDIA-Linux-x86_64-470.86.run) = 4fb7a039dbd210648c785030e81844350b1b69e8d56c8da6953b050958673c4f
 2 
SHA256 (NVIDIA-Linux-x86_64-510.47.03.run) = f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690
3 
SIZE (NVIDIA-Linux-x86_64-470.86.run) = 273149806
 3 
SIZE (NVIDIA-Linux-x86_64-510.47.03.run) = 328823536
4 
SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
 4 
SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
5 
SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417
 5 
SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417
6 
SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
 6 
SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
(-)b/x11/nvidia-driver/Makefile (-4 / +7 lines)
Lines 14-20 Link Here
14 
# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 14 
# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
15 

          15
          

        

        

          16
          
PORTNAME?=	nvidia-driver

          16
          
PORTNAME?=	nvidia-driver

        

          
            

              17
              
DISTVERSION?=	470.86


              17
              
DISTVERSION?=	510.47.03

            

        

          18
          
# Always try to set PORTREVISION as it can be overridden by the slave ports

          18
          
# Always try to set PORTREVISION as it can be overridden by the slave ports

        

        

          19
          
PORTREVISION?=	0

          19
          
PORTREVISION?=	0

        

        

          20
          
CATEGORIES=	x11

          20
          
CATEGORIES=	x11

        

  

    
      
            Lines 64-72
          SUB_FILES+=	nvidia.conf
      
      
        Link Here
      
    
  

        

          64
          
SUB_FILES+=	pkg-deinstall pkg-install

          64
          
SUB_FILES+=	pkg-deinstall pkg-install

        

        

          65
          
.endif

          65
          
.endif

        

        

          66
          
SUB_PATCHES=	extra-patch-src-Makefile \

          66
          
SUB_PATCHES=	extra-patch-src-Makefile \

        

          
            

              67
              
		extra-patch-src-nv-freebsd.h \


              67
              
		extra-patch-src-nv-freebsd.h

            

            

              68
              
		extra-patch-src-nvidia_dev.c \


              68
              
.if ${NVVERSION} < 510.03901

            

            

              
              

              69
              
SUB_PATCHES+=	extra-patch-src-nvidia_dev.c \

            

        

          69
          
		extra-patch-src-nvidia_pci.c

          70
          
		extra-patch-src-nvidia_pci.c

        

            

              
              
              71
              
.endif

            

            

              72
              

            

        

          70
          
DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0

          73
          
DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0

        

        

          71
          
MODULESDIR=	lib/xorg/modules

          74
          
MODULESDIR=	lib/xorg/modules

        

        

          72
          
EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia

          75
          
EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia

        

  

    
      
            Lines 90-96
          EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebs
      
      
        Link Here
      
    
  

        

          90
          
.  endif

          93
          
.  endif

        

        

          91
          
SUB_PATCHES+=	extra-patch-src-nvidia_ctl.c \

          94
          
SUB_PATCHES+=	extra-patch-src-nvidia_ctl.c \

        

        

          92
          
		extra-patch-src-nvidia_linux.c

          95
          
		extra-patch-src-nvidia_linux.c

        

          
            

              93
              
.else


              96
              
.elif ${NVVERSION} < 510.03901

            

        

          94
          
EXTRA_PATCHES+=	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \

          97
          
EXTRA_PATCHES+=	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \

        

        

          95
          
		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \

          98
          
		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \

        

        

          96
          
		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c

          99
          
		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c

        



(-)b/x11/nvidia-driver/distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1636390338


              1
              
TIMESTAMP = 1643747691

            

            

              2
              
SHA256 (NVIDIA-FreeBSD-x86_64-470.86.tar.xz) = 6174da504982270a971a3e0af02eba7ad383214c18b97be70afc70c8907cb726


              2
              
SHA256 (NVIDIA-FreeBSD-x86_64-510.47.03.tar.xz) = 232e3cd9c4d2ae6648f3301241c1f46ad2624eca206a85b72b209400be8f2ddf

            

            

              3
              
SIZE (NVIDIA-FreeBSD-x86_64-470.86.tar.xz) = 99463184


              3
              
SIZE (NVIDIA-FreeBSD-x86_64-510.47.03.tar.xz) = 108088660

            

        

          4
          
SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd

          4
          
SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd

        

        

          5
          
SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942

          5
          
SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942

        

        

          6
          
SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b

          6
          
SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b

        






  

  Return to bug 261666