* [ptxdist] [PATCH] mesalib: version bump 20.0.0 -> 20.0.1
@ 2020-03-12 12:52 Philipp Zabel
2020-03-27 9:52 ` [ptxdist] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2020-03-12 12:52 UTC (permalink / raw)
To: ptxdist
- Drop applied patch 5adcb0a62acc ("util: remove the dependency on kcmp.h").
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...util-remove-the-dependency-on-kcmp.h.patch | 35 -------------------
patches/mesa-20.0.0/series | 4 ---
rules/mesalib.make | 4 +--
3 files changed, 2 insertions(+), 41 deletions(-)
delete mode 100644 patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch
delete mode 100644 patches/mesa-20.0.0/series
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 a82f775e0261..000000000000
--- 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 7dc65e58bda5..000000000000
--- 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
diff --git a/rules/mesalib.make b/rules/mesalib.make
index df0e1aaf36d3..9a69594f3afe 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
#
# Paths and names
#
-MESALIB_VERSION := 20.0.0
-MESALIB_MD5 := 681229d992bbd6250a5be4f308708795
+MESALIB_VERSION := 20.0.1
+MESALIB_MD5 := 428ac511e4b05647a00b3778f1279da7
MESALIB := mesa-$(MESALIB_VERSION)
MESALIB_SUFFIX := tar.xz
MESALIB_URL := \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] mesalib: version bump 20.0.0 -> 20.0.1
2020-03-12 12:52 [ptxdist] [PATCH] mesalib: version bump 20.0.0 -> 20.0.1 Philipp Zabel
@ 2020-03-27 9:52 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2020-03-27 9:52 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied.
Michael
[sent from post-receive hook]
On Fri, 27 Mar 2020 10:52:17 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> - Drop applied patch 5adcb0a62acc ("util: remove the dependency on kcmp.h").
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> ...util-remove-the-dependency-on-kcmp.h.patch | 35 -------------------
> patches/mesa-20.0.0/series | 4 ---
> rules/mesalib.make | 4 +--
> 3 files changed, 2 insertions(+), 41 deletions(-)
> delete mode 100644 patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch
> delete mode 100644 patches/mesa-20.0.0/series
>
> 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 a82f775e0261..000000000000
> --- 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 7dc65e58bda5..000000000000
> --- 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
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index df0e1aaf36d3..9a69594f3afe 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
> #
> # Paths and names
> #
> -MESALIB_VERSION := 20.0.0
> -MESALIB_MD5 := 681229d992bbd6250a5be4f308708795
> +MESALIB_VERSION := 20.0.1
> +MESALIB_MD5 := 428ac511e4b05647a00b3778f1279da7
> MESALIB := mesa-$(MESALIB_VERSION)
> MESALIB_SUFFIX := tar.xz
> MESALIB_URL := \
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-27 9:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-12 12:52 [ptxdist] [PATCH] mesalib: version bump 20.0.0 -> 20.0.1 Philipp Zabel
2020-03-27 9:52 ` [ptxdist] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox