From 1a27beb4a6fe337f8f06152bc0c5fff03ef8a5b5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 18 Apr 2019 02:38:23 +0000
Subject: user/xf86-video-nouveau: bump to 1.0.16

---
 user/xf86-video-nouveau/APKBUILD               | 14 ++++-------
 user/xf86-video-nouveau/dont-strcmp-null.patch | 33 --------------------------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 user/xf86-video-nouveau/dont-strcmp-null.patch

(limited to 'user/xf86-video-nouveau')

diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD
index dd6bd27cd..40c9b8f82 100644
--- a/user/xf86-video-nouveau/APKBUILD
+++ b/user/xf86-video-nouveau/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xf86-video-nouveau
-pkgver=1.0.15
-pkgrel=2
+pkgver=1.0.16
+pkgrel=0
 pkgdesc="Libre Nvidia video driver for X11"
 url="https://nouveau.freedesktop.org/"
 arch="all"
@@ -10,12 +10,9 @@ license="MIT"
 depends="mesa-dri-nouveau"
 makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev"
 subpackages="$pkgname-doc"
-source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2
-	dont-strcmp-null.patch
-	"
+source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -28,14 +25,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285  xf86-video-nouveau-1.0.15.tar.bz2
-4cd8b3b9996989a8c9302a5ba77aa9f794fde7559d9f131d5bb4b3174d68be85140834719384c22686b63c89242bdf09696c0c1a98b632f7e3a4f46522f49c3b  dont-strcmp-null.patch"
+sha512sums="41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0  xf86-video-nouveau-1.0.16.tar.bz2"
diff --git a/user/xf86-video-nouveau/dont-strcmp-null.patch b/user/xf86-video-nouveau/dont-strcmp-null.patch
deleted file mode 100644
index 23c4fd216..000000000
--- a/user/xf86-video-nouveau/dont-strcmp-null.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 69aecdd305defdd014bc92b82acc6000988511cf Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 13 Jun 2017 09:23:42 -0400
-Subject: modesetting: Validate the atom for enum properties
-
-The client could have said anything here, and if what they said doesn't
-actually name an atom NameForAtom() will return NULL, and strcmp() will
-be unhappy about that.
-
-[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc]
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/drmmode_display.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 2b71c9c..04a0b57 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -1081,7 +1081,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
- 			if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
- 				return FALSE;
- 			memcpy(&atom, value->data, 4);
--			name = NameForAtom(atom);
-+			if (!(name = NameForAtom(atom)))
-+				return FALSE;
- 
- 			/* search for matching name string, then set its value down */
- 			for (j = 0; j < p->mode_prop->count_enums; j++) {
--- 
-cgit v1.1
-
-- 
cgit v1.2.3-60-g2f50