Attachment #180292 for bug #217341

Lines 10-18 Link Here

(-)x11/nvidia-driver/Makefile (-2 / +2 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?= 375.26	13	DISTVERSION?= 375.39
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?= 1	15	PORTREVISION?= 0
16	CATEGORIES= x11	16	CATEGORIES= x11
17	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}	17	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	18	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}




TIMESTAMP = 1488045169
SHA256 (NVIDIA-FreeBSD-x86_64-375.39.tar.gz) = 0d58c450b3391cf28655f15505aaca8d011590efe5dd3ebc6a3212a9d7597b17
SIZE (NVIDIA-FreeBSD-x86_64-375.39.tar.gz) = 58308585
SHA256 (NVIDIA-FreeBSD-x86-375.39.tar.gz) = ca39ab55716516bbca62fc888ec786745a8df7f346e68703f54e1a42afad733e
SIZE (NVIDIA-FreeBSD-x86-375.39.tar.gz) = 59111267
SHA256 (NVIDIA-FreeBSD-x86_64-340.102.tar.gz) = 6d1108c2e8d1b25eb16cd8dc4eb221f2a20d2e4c39a515c0b5809fb407991f94
SIZE (NVIDIA-FreeBSD-x86_64-340.102.tar.gz) = 60862932
SHA256 (NVIDIA-FreeBSD-x86-340.102.tar.gz) = 7b4f66260a1ce6ce35b7a463f8e0ff68fec0f47202af9d243931647f3eeb1dc5
SIZE (NVIDIA-FreeBSD-x86-340.102.tar.gz) = 59991374
SHA256 (NVIDIA-FreeBSD-x86_64-304.135.tar.gz) = 0e415045b96bb272150d35d72c4a17c3d8e7b593dc7ffc577f6f25cc04f9de95
SIZE (NVIDIA-FreeBSD-x86_64-304.135.tar.gz) = 36144428
SHA256 (NVIDIA-FreeBSD-x86-304.135.tar.gz) = 3bcecc26c67588174bcee96b25f4f70265f463e4b3eb85d83363977acf3b6d33
SIZE (NVIDIA-FreeBSD-x86-304.135.tar.gz) = 35092250




     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;
     }

Lines 1-9 Link Here

(-)x11/nvidia-driver-304/Makefile (-2 / +2 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	DISTVERSION= 304.134	4	DISTVERSION= 304.135
5	# Explicitly set PORTREVISION as it can be overridden by the master port	5	# Explicitly set PORTREVISION as it can be overridden by the master port
6	PORTREVISION= 1	6	PORTREVISION= 0
7		7
8	MASTERDIR= ${.CURDIR}/../nvidia-driver	8	MASTERDIR= ${.CURDIR}/../nvidia-driver
9	PKGNAMESUFFIX= -304	9	PKGNAMESUFFIX= -304

Lines 1-9 Link Here

(-)x11/nvidia-driver-340/Makefile (-2 / +2 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	DISTVERSION= 340.101	4	DISTVERSION= 340.102
5	# Explicitly set PORTREVISION as it can be overridden by the master port	5	# Explicitly set PORTREVISION as it can be overridden by the master port
6	PORTREVISION= 1	6	PORTREVISION= 0
7		7
8	MASTERDIR= ${.CURDIR}/../nvidia-driver	8	MASTERDIR= ${.CURDIR}/../nvidia-driver
9	PKGNAMESUFFIX= -340	9	PKGNAMESUFFIX= -340

Return to bug 217341

Lines 1-13 Link Here

(-)x11/nvidia-driver/distinfo (-13 / +13 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1488045169
2	SHA256 (NVIDIA-FreeBSD-x86_64-375.26.tar.gz) = c7d32cb434f9a7e84903a1305d7577705f991fdb6eb4ab3ff79d41b2df82265d	2	SHA256 (NVIDIA-FreeBSD-x86_64-375.39.tar.gz) = 0d58c450b3391cf28655f15505aaca8d011590efe5dd3ebc6a3212a9d7597b17
3	SIZE (NVIDIA-FreeBSD-x86_64-375.26.tar.gz) = 58287080	3	SIZE (NVIDIA-FreeBSD-x86_64-375.39.tar.gz) = 58308585
4	SHA256 (NVIDIA-FreeBSD-x86-375.26.tar.gz) = 5249d01a21bb846a08975c4f3a90935b6dc8fd33ec8e5faa0d624ef15bcf2b88	4	SHA256 (NVIDIA-FreeBSD-x86-375.39.tar.gz) = ca39ab55716516bbca62fc888ec786745a8df7f346e68703f54e1a42afad733e
5	SIZE (NVIDIA-FreeBSD-x86-375.26.tar.gz) = 59091851	5	SIZE (NVIDIA-FreeBSD-x86-375.39.tar.gz) = 59111267
6	SHA256 (NVIDIA-FreeBSD-x86_64-340.101.tar.gz) = aa75da2de6656bf8c4b8cf73b9e330b21ebc5da6de509cf90aed8a571716b111	6	SHA256 (NVIDIA-FreeBSD-x86_64-340.102.tar.gz) = 6d1108c2e8d1b25eb16cd8dc4eb221f2a20d2e4c39a515c0b5809fb407991f94
7	SIZE (NVIDIA-FreeBSD-x86_64-340.101.tar.gz) = 60860185	7	SIZE (NVIDIA-FreeBSD-x86_64-340.102.tar.gz) = 60862932
8	SHA256 (NVIDIA-FreeBSD-x86-340.101.tar.gz) = f62038819eb4ba074e92ce8d26b6330ed3bc32d1c07bcc95f4e2964fa667e03b	8	SHA256 (NVIDIA-FreeBSD-x86-340.102.tar.gz) = 7b4f66260a1ce6ce35b7a463f8e0ff68fec0f47202af9d243931647f3eeb1dc5
9	SIZE (NVIDIA-FreeBSD-x86-340.101.tar.gz) = 59992166	9	SIZE (NVIDIA-FreeBSD-x86-340.102.tar.gz) = 59991374
10	SHA256 (NVIDIA-FreeBSD-x86_64-304.134.tar.gz) = 3eafced8f8095c7f1135feaadbfcc709bd7ab96bf755da52ed5ca05a473604f8	10	SHA256 (NVIDIA-FreeBSD-x86_64-304.135.tar.gz) = 0e415045b96bb272150d35d72c4a17c3d8e7b593dc7ffc577f6f25cc04f9de95
11	SIZE (NVIDIA-FreeBSD-x86_64-304.134.tar.gz) = 36148973	11	SIZE (NVIDIA-FreeBSD-x86_64-304.135.tar.gz) = 36144428
12	SHA256 (NVIDIA-FreeBSD-x86-304.134.tar.gz) = e7a164807c83ab0f1be98eb241e76db0ca481d24cd64563c44dfbd73b9067b0f	12	SHA256 (NVIDIA-FreeBSD-x86-304.135.tar.gz) = 3bcecc26c67588174bcee96b25f4f70265f463e4b3eb85d83363977acf3b6d33
13	SIZE (NVIDIA-FreeBSD-x86-304.134.tar.gz) = 35095790	13	SIZE (NVIDIA-FreeBSD-x86-304.135.tar.gz) = 35092250

Lines 9-20 Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (-9 lines)
9	if (ref_ptr) {	9	if (ref_ptr) {
10	mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);	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.	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	}