Attachment #173883 for bug #201340

Lines 10-16 Link Here

(-)x11/nvidia-driver/Makefile (-24 / +62 lines)
10	# slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').	10	# slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').
11		11
12	PORTNAME= nvidia-driver	12	PORTNAME= nvidia-driver
13	DISTVERSION?= 346.96	13	DISTVERSION?= 367.35
14	# Always try to set PORTREVISION as it can be overridden by the slave ports	14	# Always try to set PORTREVISION as it can be overridden by the slave ports
15	PORTREVISION?= 0	15	PORTREVISION?= 0
16	CATEGORIES= x11	16	CATEGORIES= x11
Lines 29-35 Link Here
29		29
30	ARCH_SUFX= x86${ARCH:S/i386//:S/amd/_/}	30	ARCH_SUFX= x86${ARCH:S/i386//:S/amd/_/}
31	USES= kmod uidfix	31	USES= kmod uidfix
32	USE_XORG= xorg-server	32	USE_XORG= x11 xorg-server xext
33	USE_GL= gl	33	USE_GL= gl
34	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
35		35
Lines 57-67 Link Here
57	. endif	57	. endif
58	.endif	58	.endif
59		59
60	EXTRA_PATCHES= ${FILESDIR}/extra-patch-mk-nvidia.lib.mk \	60	# EXTRA_PATCHES= ${FILESDIR}/extra-patch-mk-nvidia.lib.mk \
61	${FILESDIR}/extra-patch-src-Makefile \	61	EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11-driver-Makefile
		62	.if ${NVVERSION} < 355.006
		63	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-Makefile \
62	${FILESDIR}/extra-patch-src-nv-freebsd.h \	64	${FILESDIR}/extra-patch-src-nv-freebsd.h \
63	${FILESDIR}/extra-patch-src-nv-misc.h \	65	${FILESDIR}/extra-patch-src-nv-misc.h
64	${FILESDIR}/extra-patch-x11-driver-Makefile	66	.else
		67	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia_Makefile \
		68	${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
		69	${FILESDIR}/extra-patch-src_nvidia_nv-misc.h
		70	.endif
		71	.if ${NVVERSION} >= 358.009
		72	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
		73	NVSRC= nvidia
		74	.endif
65		75
66	OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS	76	OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS
67	OPTIONS_DEFINE_i386= PAE	77	OPTIONS_DEFINE_i386= PAE
Lines 94-132 Link Here
94		104
95	post-patch: .SILENT	105	post-patch: .SILENT
96	# We should support -CURRENT: kill the check	106	# We should support -CURRENT: kill the check
97	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h	107	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
98	# Adjust Linux headers #include's after FreeBSD src SVN r246085	108	# Adjust Linux headers #include's after FreeBSD src SVN r246085
99	.if ${OSVERSION} > 1000027	109	.if ${OSVERSION} > 1000027
100	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \	110	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \
101	{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \	111	{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \
102	${WRKSRC}/src/nvidia_linux.c	112	${WRKSRC}/src/${NVSRC}/nvidia_linux.c
103	.endif	113	.endif
104	# Adjust vm_object locking after FreeBSD src SVN r248084	114	# Adjust vm_object locking after FreeBSD src SVN r248084
105	.if ${OSVERSION} > 1000029	115	.if ${OSVERSION} > 1000029
106	${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \	116	${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \
107	{ x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \	117	{ x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \
108	${WRKSRC}/src/nv-freebsd.h	118	${WRKSRC}/src/${NVSRC}/nv-freebsd.h
109	${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \	119	${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \
110	${WRKSRC}/src/nvidia_subr.c	120	${WRKSRC}/src/${NVSRC}/nvidia_subr.c
111	.endif	121	.endif
112	# Adjust kmem(9) calls after FreeBSD src SVN r254025	122	# Adjust kmem(9) calls after FreeBSD src SVN r254025
113	.if ${OSVERSION} > 1000040 && ${NVVERSION} < 331.067	123	.if ${OSVERSION} > 1000040 && ${NVVERSION} < 331.067
114	${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \	124	${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \
115	${WRKSRC}/src/nvidia_subr.c	125	${WRKSRC}/src/${NVSRC}/nvidia_subr.c
116	.endif	126	.endif
117	# Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src SVN r273377	127	# Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src SVN r273377
118	.if ${OSVERSION} > 1100039 \|\| ${OSVERSION} > 1001501 && ${OSVERSION} < 1100000	128	.if ${OSVERSION} > 1100039 \|\| ${OSVERSION} > 1001501 && ${OSVERSION} < 1100000
119	${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \	129	${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \
120	s/^[[:blank:]]*CTLFLAG_RD/CTLTYPE_STRING \|&/' \	130	s/^[[:blank:]]*CTLFLAG_RD/CTLTYPE_STRING \|&/' \
121	${WRKSRC}/src/nvidia_sysctl.c	131	${WRKSRC}/src/${NVSRC}/nvidia_sysctl.c
122	.endif	132	.endif
123	# Replace d_thread_t (compat shim to support FreeBSD 4) with `struct thread'	133	# Replace d_thread_t (compat shim to support FreeBSD 4) with `struct thread'
124	${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \	134	${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \
125	${WRKSRC}/src/nvidia_ctl.c ${WRKSRC}/src/nvidia_dev.c \	135	${WRKSRC}/src/${NVSRC}/nvidia_ctl.c ${WRKSRC}/src/${NVSRC}/nvidia_dev.c \
126	${WRKSRC}/src/nvidia_linux.c	136	${WRKSRC}/src/${NVSRC}/nvidia_linux.c
127	# Fix stack buffer overflow in nvidia_sysctl_bus_type()	137	.if ${NVVERSION} >= 358.009
128	${REINPLACE_CMD} -e 's/8 bus_type\[4\]/8 bus_type[8]/' \	138	${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \
129	${WRKSRC}/src/nvidia_sysctl.c	139	${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
		140	.endif
130	# Respect WITHOUT_LINUX setting	141	# Respect WITHOUT_LINUX setting
131	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& !defined(WITHOUT_LINUX)/' \	142	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& !defined(WITHOUT_LINUX)/' \
132	${WRKSRC}/lib/Makefile	143	${WRKSRC}/lib/Makefile
Lines 157-163 Link Here
157	# and "smart" installation of conflicting files heuristics)	168	# and "smart" installation of conflicting files heuristics)
158	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile	169	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
159	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \	170	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
160	${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile	171	${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile
161	# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we	172	# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
162	# won't adhere to this stupidity and install nvidia-application-profiles-*	173	# won't adhere to this stupidity and install nvidia-application-profiles-*
163	# files as part of documentation	174	# files as part of documentation
Lines 165-190 Link Here
165	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \	176	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
166	${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile	177	${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
167	.endif	178	.endif
		179	# Fix cap_rights, does not exist before 10.x
		180	.if ${OSVERSION} < 1000000 && ${NVVERSION} >= 358.009
		181	${REINPLACE_CMD} '/<sys\/caprights.h>/d ; /cap_rights_t rights/d ; s/cap_rights_init(&rights, CAP_IOCTL)/CAP_IOCTL/' \
		182	${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
		183	.endif
168	# Finally, process OPTIONS	184	# Finally, process OPTIONS
169	.if ${PORT_OPTIONS:MFREEBSD_AGP}	185	.if ${PORT_OPTIONS:MFREEBSD_AGP}
170	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \	186	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
171	${WRKSRC}/src/nv-freebsd.h	187	${WRKSRC}/src/${NVSRC}/nv-freebsd.h
172	.endif	188	.endif
173	.if ${PORT_OPTIONS:MACPI_PM}	189	.if ${PORT_OPTIONS:MACPI_PM}
174	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \	190	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
175	${WRKSRC}/src/nv-freebsd.h	191	${WRKSRC}/src/${NVSRC}/nv-freebsd.h
176	.endif	192	.endif
177	.if ! ${PORT_OPTIONS:MLINUX}	193	.if ! ${PORT_OPTIONS:MLINUX}
178	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \	194	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
179	${WRKSRC}/src/nv-freebsd.h	195	${WRKSRC}/src/${NVSRC}/nv-freebsd.h
180	.endif	196	.endif
181	.if ${PORT_OPTIONS:MPAE}	197	.if ${PORT_OPTIONS:MPAE}
182	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \	198	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \
183	${WRKSRC}/src/nv-freebsd.h	199	${WRKSRC}/src/${NVSRC}/nv-freebsd.h
184	.endif	200	.endif
185	.if ${PORT_OPTIONS:MWBINVD}	201	.if ${PORT_OPTIONS:MWBINVD}
186	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \	202	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
187	${WRKSRC}/src/nv-freebsd.h	203	${WRKSRC}/src/${NVSRC}/nv-freebsd.h
188	.endif	204	.endif
189	# Conditionally install documentation (but you generally want it)	205	# Conditionally install documentation (but you generally want it)
190	.if ! ${PORT_OPTIONS:MDOCS}	206	.if ! ${PORT_OPTIONS:MDOCS}
Lines 199-205 Link Here
199	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \	215	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \
200	${STAGEDIR}${PREFIX}/bin	216	${STAGEDIR}${PREFIX}/bin
201	# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's	217	# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
202	.if ${NVVERSION} < 310.019	218	.if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 \|\| ${NVVERSION} >= 361.016
203	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}	219	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}
204	.endif	220	.endif
205	.if ${NVVERSION} >= 310.019	221	.if ${NVVERSION} >= 310.019
Lines 212-217 Link Here
212	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL\|eglcore\|GLESv\|glsi)/d' \	228	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL\|eglcore\|GLESv\|glsi)/d' \
213	${TMPPLIST}	229	${TMPPLIST}
214	.endif	230	.endif
		231	.if ${NVVERSION} < 352.009
		232	${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump\|smi\|ml)/d' ${TMPPLIST}
		233	.endif
		234	.if ${NVVERSION} < 355.006
		235	${REINPLACE_CMD} -E '/(libEGL_nvidia\|GLdispatch\|OpenGL)/d' ${TMPPLIST}
		236	.else
		237	${REINPLACE_CMD} 's/libEGL\.so\.${PORTVERSION}/libEGL.so/' \
		238	${TMPPLIST}
		239	.endif
		240	.if ${NVVERSION} < 358.009
		241	${REINPLACE_CMD} '/nvidia-modeset.ko/d' ${TMPPLIST}
		242	.else
		243	${REINPLACE_CMD} 's/nvidia$$/nvidia-modeset/ ; s/nvidia_/nvidia-modeset_/' \
		244	${PKGMESSAGE}
		245	.endif
		246	.if ${NVVERSION} >= 361.028
		247	${REINPLACE_CMD} -E '/(EGL_nvidia\.so\|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d' \
		248	${TMPPLIST}
		249	.else
		250	${REINPLACE_CMD} -E '/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]\|\.[0-9]+\.[0-9]+)?)?$$/d ; \
		251	/libEGL_nvidia\.so\.${PORTVERSION}/d' ${TMPPLIST}
		252	.endif
215		253
216	# Target below can be used instead of standard `makesum' to correctly	254	# Target below can be used instead of standard `makesum' to correctly
217	# update distinfo (i.e., keeping other driver version entries intact)	255	# update distinfo (i.e., keeping other driver version entries intact)




TIMESTAMP = 1468687296
SHA256 (NVIDIA-FreeBSD-x86_64-367.35.tar.gz) = b33057ce23ce1ae44ddd246a7d2d9e2b0aa2ed5a289d8a83e849249de81a1035
SIZE (NVIDIA-FreeBSD-x86_64-367.35.tar.gz) = 59393955
SHA256 (NVIDIA-FreeBSD-x86-367.35.tar.gz) = 2edf78801213dea72ddd6c40acd860893623224166ad522fd47e202443cb6d50
SIZE (NVIDIA-FreeBSD-x86-367.35.tar.gz) = 62636433
SHA256 (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = b67962a4433dd1fa86cde038bb244a547f5ed6c242febc348d618886b7715d09
SIZE (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = 60536275
SHA256 (NVIDIA-FreeBSD-x86-340.96.tar.gz) = dda243ed9b36e29162b1c97b987b9ca82ef7fcff4635ac78443fdb06739ec22e
SIZE (NVIDIA-FreeBSD-x86-340.96.tar.gz) = 59678354
SHA256 (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a
SIZE (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = 35812363
SHA256 (NVIDIA-FreeBSD-x86-304.131.tar.gz) = d9d350de797d0db58ed82d73569766d8e914b0410f0f9fc78aac098fdcd31027
SIZE (NVIDIA-FreeBSD-x86-304.131.tar.gz) = 34782985
SHA256 (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b
SIZE (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 20038266




--- mk/nvidia.lib.mk.orig	2013-08-16 10:53:30.000000000 +0200
+++ mk/nvidia.lib.mk	2014-01-27 16:55:39.000000000 +0100
@@ -46,8 +46,8 @@
 .endif		
 .endif
 .if defined(AUXLINK_TGT)
-	@rm -f ${AUXLINK_LINK}
-	@ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK}
+	@rm -f ${DESTDIR}${AUXLINK_LINK}
+	@ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK}
 .endif
 .if defined(STATICLIB_NAME)
 	@rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME}




--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig	2016-05-28 15:44:11 UTC
+++ src/nvidia-modeset/nvidia-modeset-freebsd.c
@@ -245,7 +245,7 @@ struct nvkms_ref_ptr {
 
 struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)
 {
-    struct nvkms_ref_ptr *ref_ptr = nvkms_alloc(sizeof(*ref_ptr), NV_FALSE);
+    struct nvkms_ref_ptr *ref_ptr = nvkms_alloc(sizeof(*ref_ptr), NV_TRUE);
     if (ref_ptr) {
         mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);
         // The ref_ptr owner counts as a reference on the ref_ptr itself.
@@ -792,7 +792,7 @@ static int nvkms_open(
     nvkms_module.client_counter += 1;
     sx_xunlock(&nvkms_module.lock);
 
-    popen = nvkms_alloc(sizeof(*popen), NV_FALSE);
+    popen = nvkms_alloc(sizeof(*popen), NV_TRUE);
     if (popen == NULL) {
         return ENOMEM;
     }




--- src/nvidia/Makefile.orig	2015-08-26 22:35:13 UTC
+++ src/nvidia/Makefile
@@ -26,6 +26,15 @@ NO_OBJ=		true
 stdarg.h:
 	@ln -s machine/stdarg.h stdarg.h
 
+SRCS+=		opt_global.h
+.if ${MACHINE_ARCH} == "i386" && !defined(KERNBUILDDIR)
+PAE!=		sed -n '/define NV_SUPPORT_PAE/p' nv-freebsd.h
+.if !empty(PAE)
+opt_global.h:
+		echo "#define PAE 1" > ${.TARGET}
+.endif
+.endif
+
 *.c: stdarg.h
 
 beforeinstall:	${KMOD}.ko




--- src/nvidia/nv-freebsd.h.orig	2015-10-30 22:40:02 UTC
+++ src/nvidia/nv-freebsd.h
@@ -144,6 +144,11 @@ MALLOC_DECLARE(M_NVIDIA);
 #endif
 
 /*
+ * Enable/Disable support for PAE on i386.
+ */
+#undef NV_SUPPORT_PAE
+
+/*
  * Enable/Disable support for ACPI Power Management.
  */
 

Added Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia_nv-misc.h (+11 lines)
1	--- src/nvidia/nv-misc.h.orig 2015-10-30 22:24:29 UTC
2	+++ src/nvidia/nv-misc.h
3	@@ -11,6 +11,8 @@
4	#ifndef _NV_MISC_H_
5	#define _NV_MISC_H_
6
7	+#include "opt_global.h"
8	+
9	#include "nvtypes.h"
10	#include "rmretval.h"
11




--- mk/nvidia.lib.mk.orig	2015-08-24 03:56:22 UTC
+++ mk/nvidia.lib.mk
@@ -46,8 +46,8 @@ install: ${EXTRADEPS}
 .endif		
 .endif
 .if defined(AUXLINK_TGT)
-	@rm -f ${AUXLINK_LINK}
-	@ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK}
+	@rm -f ${DESTDIR}${AUXLINK_LINK}
+	@ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK}
 .endif
 .if defined(STATICLIB_NAME)
 	@rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME}

Added Link Here

(-)x11/nvidia-driver/files/patch-x11_driver_Makefile (+11 lines)
1	--- x11/driver/Makefile.orig 2015-08-24 03:56:22 UTC
2	+++ x11/driver/Makefile
3	@@ -5,7 +5,7 @@ LOCALBASE= /usr/local
4	.endif
5
6	DRIVERS= nvidia_drv.o nvidia_drv.so
7	-.if exists(${LOCALBASE}/lib/xorg/modules/drivers)
8	+.if exists(${DESTDIR}${LOCALBASE}/lib/xorg/modules/drivers)
9	DRIVERDIR= ${LOCALBASE}/lib/xorg/modules/drivers
10	.else
11	DRIVERDIR= ${LOCALBASE}/lib/modules/drivers

Lines 1-12 Link Here

(-)x11/nvidia-driver/pkg-plist (+27 lines)
1	bin/nvidia-bug-report.sh	1	bin/nvidia-bug-report.sh
		2	bin/nvidia-debugdump
		3	bin/nvidia-smi
2	lib/.nvidia/libGL.so	4	lib/.nvidia/libGL.so
3	lib/.nvidia/libGL.so.1	5	lib/.nvidia/libGL.so.1
4	lib/.nvidia/libEGL.so	6	lib/.nvidia/libEGL.so
5	lib/.nvidia/libEGL.so.1	7	lib/.nvidia/libEGL.so.1
6	lib/libGLESv1_CM.so	8	lib/libGLESv1_CM.so
7	lib/libGLESv1_CM.so.1	9	lib/libGLESv1_CM.so.1
8	lib/.nvidia/libGLESv2.so	10	lib/.nvidia/libGLESv2.so
9	lib/.nvidia/libGLESv2.so.2	11	lib/.nvidia/libGLESv2.so.2
		12	lib/libnvidia-glcore.so
		13	lib/libnvidia-glcore.so.1
10	lib/libXvMCNVIDIA.a	14	lib/libXvMCNVIDIA.a
11	lib/libXvMCNVIDIA.so	15	lib/libXvMCNVIDIA.so
12	lib/libXvMCNVIDIA.so.1	16	lib/libXvMCNVIDIA.so.1
Lines 19-40 Link Here
19	lib/libnvidia-glcore.so.1	23	lib/libnvidia-glcore.so.1
20	lib/libnvidia-glsi.so	24	lib/libnvidia-glsi.so
21	lib/libnvidia-glsi.so.1	25	lib/libnvidia-glsi.so.1
		26	lib/libnvidia-ml.so
		27	lib/libnvidia-ml.so.1
22	lib/libnvidia-tls.so	28	lib/libnvidia-tls.so
23	lib/libnvidia-tls.so.1	29	lib/libnvidia-tls.so.1
24	lib/libvdpau_nvidia.so	30	lib/libvdpau_nvidia.so
25	lib/vdpau/libvdpau_nvidia.so.1	31	lib/vdpau/libvdpau_nvidia.so.1
		32	man/man1/nvidia-smi.1.gz
26	%%MODULESDIR%%/drivers/nvidia_drv.so	33	%%MODULESDIR%%/drivers/nvidia_drv.so
27	%%MODULESDIR%%/extensions/.nvidia/libglx.so	34	%%MODULESDIR%%/extensions/.nvidia/libglx.so
28	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1	35	%%MODULESDIR%%/extensions/.nvidia/libglx.so.1
29	/%%KMODDIR%%/nvidia.ko	36	/%%KMODDIR%%/nvidia.ko
		37	/%%KMODDIR%%/nvidia-modeset.ko
30	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%	38	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%
31	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1	39	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1
		40	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
32	%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%%	41	%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%%
33	%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1	42	%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1
		43	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so
		44	%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
34	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%	45	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%
35	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1	46	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
		47	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so
		48	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.1
		49	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
36	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.%%SHLIB_VERSION%%	50	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.%%SHLIB_VERSION%%
37	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2	51	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2
		52	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so
		53	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.2
		54	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
		55	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLdispatch.so
		56	%%LINUX%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0
		57	%%LINUX%%%%LINUXBASE%%/usr/lib/libOpenGL.so
		58	%%LINUX%%%%LINUXBASE%%/usr/lib/libOpenGL.so.0
		59	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
38	%%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%	60	%%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%
39	%%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.1	61	%%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.1
40	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%%	62	%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%%
Lines 51-53 Link Here
51	%%LINUX%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_trace.so.1	73	%%LINUX%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_trace.so.1
52	%%LINUX%%@exec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%	74	%%LINUX%%@exec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%
53	%%LINUX%%@unexec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%	75	%%LINUX%%@unexec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%
		76	%%LINUX%%@dir %%LINUXBASE%%/usr/lib/vdpau
		77	%%LINUX%%@dir %%LINUXBASE%%/usr/lib
		78	%%LINUX%%@dir %%LINUXBASE%%/usr
		79	%%LINUX%%@dir %%LINUXBASE%%
		80	%%LINUX%%@dir /compat

Return to bug 201340

Lines 1-14 Link Here

(-)x11/nvidia-driver/distinfo (-6 / +5 lines)
1	SHA256 (NVIDIA-FreeBSD-x86_64-346.96.tar.gz) = 89daaff29afe92d825ec8c00149a703b4eb234e4f16bbfb98673f077521bcff9	1	TIMESTAMP = 1468687296
2	SIZE (NVIDIA-FreeBSD-x86_64-346.96.tar.gz) = 58774970	2	SHA256 (NVIDIA-FreeBSD-x86_64-367.35.tar.gz) = b33057ce23ce1ae44ddd246a7d2d9e2b0aa2ed5a289d8a83e849249de81a1035
3	SHA256 (NVIDIA-FreeBSD-x86-346.96.tar.gz) = a27d7b79c053702bf6524b2c4725321fa557be18a585735e0b8122d884348c3e	3	SIZE (NVIDIA-FreeBSD-x86_64-367.35.tar.gz) = 59393955
4	SIZE (NVIDIA-FreeBSD-x86-346.96.tar.gz) = 58010757	4	SHA256 (NVIDIA-FreeBSD-x86-367.35.tar.gz) = 2edf78801213dea72ddd6c40acd860893623224166ad522fd47e202443cb6d50
		5	SIZE (NVIDIA-FreeBSD-x86-367.35.tar.gz) = 62636433
5	SHA256 (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = b67962a4433dd1fa86cde038bb244a547f5ed6c242febc348d618886b7715d09	6	SHA256 (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = b67962a4433dd1fa86cde038bb244a547f5ed6c242febc348d618886b7715d09
6	SIZE (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = 60536275	7	SIZE (NVIDIA-FreeBSD-x86_64-340.96.tar.gz) = 60536275
7	SHA256 (NVIDIA-FreeBSD-x86-340.96.tar.gz) = dda243ed9b36e29162b1c97b987b9ca82ef7fcff4635ac78443fdb06739ec22e	8	SHA256 (NVIDIA-FreeBSD-x86-340.96.tar.gz) = dda243ed9b36e29162b1c97b987b9ca82ef7fcff4635ac78443fdb06739ec22e
8	SIZE (NVIDIA-FreeBSD-x86-340.96.tar.gz) = 59678354	9	SIZE (NVIDIA-FreeBSD-x86-340.96.tar.gz) = 59678354
9	SHA256 (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a	10	SHA256 (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a
10	SIZE (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = 35812363	11	SIZE (NVIDIA-FreeBSD-x86_64-304.131.tar.gz) = 35812363
11	SHA256 (NVIDIA-FreeBSD-x86-304.131.tar.gz) = d9d350de797d0db58ed82d73569766d8e914b0410f0f9fc78aac098fdcd31027	12	SHA256 (NVIDIA-FreeBSD-x86-304.131.tar.gz) = d9d350de797d0db58ed82d73569766d8e914b0410f0f9fc78aac098fdcd31027
12	SIZE (NVIDIA-FreeBSD-x86-304.131.tar.gz) = 34782985	13	SIZE (NVIDIA-FreeBSD-x86-304.131.tar.gz) = 34782985
13	SHA256 (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b
14	SIZE (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 20038266

Removed Link Here

(-)x11/nvidia-driver/files/extra-patch-mk-nvidia.lib.mk (-13 lines)
1	--- mk/nvidia.lib.mk.orig 2013-08-16 10:53:30.000000000 +0200
2	+++ mk/nvidia.lib.mk 2014-01-27 16:55:39.000000000 +0100
3	@@ -46,8 +46,8 @@
4	.endif
5	.endif
6	.if defined(AUXLINK_TGT)
7	- @rm -f ${AUXLINK_LINK}
8	- @ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK}
9	+ @rm -f ${DESTDIR}${AUXLINK_LINK}
10	+ @ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK}
11	.endif
12	.if defined(STATICLIB_NAME)
13	@rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME}

Added Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (+20 lines)
1	--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2016-05-28 15:44:11 UTC
2	+++ src/nvidia-modeset/nvidia-modeset-freebsd.c
3	@@ -245,7 +245,7 @@ struct nvkms_ref_ptr {
4
5	struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)
6	{
7	- struct nvkms_ref_ptr ref_ptr = nvkms_alloc(sizeof(ref_ptr), NV_FALSE);
8	+ struct nvkms_ref_ptr ref_ptr = nvkms_alloc(sizeof(ref_ptr), NV_TRUE);
9	if (ref_ptr) {
10	mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);
11	// The ref_ptr owner counts as a reference on the ref_ptr itself.
12	@@ -792,7 +792,7 @@ static int nvkms_open(
13	nvkms_module.client_counter += 1;
14	sx_xunlock(&nvkms_module.lock);
15
16	- popen = nvkms_alloc(sizeof(*popen), NV_FALSE);
17	+ popen = nvkms_alloc(sizeof(*popen), NV_TRUE);
18	if (popen == NULL) {
19	return ENOMEM;
20	}

Added Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia_Makefile (+18 lines)
1	--- src/nvidia/Makefile.orig 2015-08-26 22:35:13 UTC
2	+++ src/nvidia/Makefile
3	@@ -26,6 +26,15 @@ NO_OBJ= true
4	stdarg.h:
5	@ln -s machine/stdarg.h stdarg.h
6
7	+SRCS+= opt_global.h
8	+.if ${MACHINE_ARCH} == "i386" && !defined(KERNBUILDDIR)
9	+PAE!= sed -n '/define NV_SUPPORT_PAE/p' nv-freebsd.h
10	+.if !empty(PAE)
11	+opt_global.h:
12	+ echo "#define PAE 1" > ${.TARGET}
13	+.endif
14	+.endif
15	+
16	*.c: stdarg.h
17
18	beforeinstall: ${KMOD}.ko

Added Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia_nv-freebsd.h (+14 lines)
1	--- src/nvidia/nv-freebsd.h.orig 2015-10-30 22:40:02 UTC
2	+++ src/nvidia/nv-freebsd.h
3	@@ -144,6 +144,11 @@ MALLOC_DECLARE(M_NVIDIA);
4	#endif
5
6	/*
7	+ * Enable/Disable support for PAE on i386.
8	+ */
9	+#undef NV_SUPPORT_PAE
10	+
11	+/*
12	* Enable/Disable support for ACPI Power Management.
13	*/
14

Added Link Here

(-)x11/nvidia-driver/files/patch-mk_nvidia.lib.mk (+13 lines)
1	--- mk/nvidia.lib.mk.orig 2015-08-24 03:56:22 UTC
2	+++ mk/nvidia.lib.mk
3	@@ -46,8 +46,8 @@ install: ${EXTRADEPS}
4	.endif
5	.endif
6	.if defined(AUXLINK_TGT)
7	- @rm -f ${AUXLINK_LINK}
8	- @ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK}
9	+ @rm -f ${DESTDIR}${AUXLINK_LINK}
10	+ @ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK}
11	.endif
12	.if defined(STATICLIB_NAME)
13	@rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME}