summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2020-03-12 13:52:03 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-03-20 13:26:55 +0100
commit36b98fe76d03ff04299d3589f6d9bff49200817a (patch)
tree9787bb78f378f7b7344dbb922fb37ed3381a5d64 /patches
parent1320d971dc69ed5460d697a634f0b36fdc260a52 (diff)
downloadptxdist-36b98fe76d03ff04299d3589f6d9bff49200817a.tar.gz
ptxdist-36b98fe76d03ff04299d3589f6d9bff49200817a.tar.xz
mesalib: version bump 20.0.0 -> 20.0.1
- Drop applied patch 5adcb0a62acc ("util: remove the dependency on kcmp.h"). Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Message-Id: <20200312125203.7986-1-p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch35
-rw-r--r--patches/mesa-20.0.0/series4
2 files changed, 0 insertions, 39 deletions
diff --git a/patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch b/patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch
deleted file mode 100644
index a82f775e0..000000000
--- a/patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
-Date: Tue, 18 Feb 2020 16:12:23 -0500
-Subject: [PATCH] util: remove the dependency on kcmp.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: f76cbc7901f7 "util: Add os_same_file_description helper"
-
-Acked-by: Eric Engestrom <eric@engestrom.ch>
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
-Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3860>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3860>
----
- src/util/os_file.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/os_file.c b/src/util/os_file.c
-index b502ff4b0ef8..128fe872db1f 100644
---- a/src/util/os_file.c
-+++ b/src/util/os_file.c
-@@ -34,11 +34,12 @@ os_file_create_unique(const char *filename, int filemode)
- #if defined(__linux__)
-
- #include <fcntl.h>
--#include <linux/kcmp.h>
- #include <sys/stat.h>
- #include <sys/syscall.h>
- #include <unistd.h>
-
-+/* copied from <linux/kcmp.h> */
-+#define KCMP_FILE 0
-
- static ssize_t
- readN(int fd, char *buf, size_t len)
diff --git a/patches/mesa-20.0.0/series b/patches/mesa-20.0.0/series
deleted file mode 100644
index 7dc65e58b..000000000
--- a/patches/mesa-20.0.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-util-remove-the-dependency-on-kcmp.h.patch
-# 9bb1192b642c5f676918f9eb3bd298c7 - git-ptx-patches magic