From 12e1ceb79496cf23073e1f7b2e0cd9b322b77054 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 23 Dec 2021 16:06:21 -0800
Subject: wayland: Update to 1.20.0

---
 pkg/wayland/README.md |  8 +-------
 pkg/wayland/config.h  | 40 +++++++++++++---------------------------
 pkg/wayland/gen.lua   |  4 ++--
 pkg/wayland/src       |  2 +-
 pkg/wayland/ver       |  2 +-
 5 files changed, 18 insertions(+), 38 deletions(-)

(limited to 'pkg')

diff --git a/pkg/wayland/README.md b/pkg/wayland/README.md
index 61f3f6d8..124f9696 100644
--- a/pkg/wayland/README.md
+++ b/pkg/wayland/README.md
@@ -3,10 +3,4 @@
 ## config.h
 Generated with
 
-	./configure \
-		--disable-documentation \
-		--disable-dtd-validation \
-		FFI_CFLAGS=-I/src/oasis/out/pkg/libffi/include \
-		FFI_LIBS=/src/oasis/out/pkg/libffi/libffi.a \
-		EXPAT_CFLAGS=-I/src/oasis/out/pkg/expat/include \
-		EXPAT_LIBS=/src/oasis/out/pkg/expat/libexpat.a
+	meson -Ddocumentation=false build
diff --git a/pkg/wayland/config.h b/pkg/wayland/config.h
index 85a19c76..c14e8d4d 100644
--- a/pkg/wayland/config.h
+++ b/pkg/wayland/config.h
@@ -1,28 +1,14 @@
-#define HAVE_ACCEPT4 1
-#define HAVE_DLFCN_H 1
-#define HAVE_INTTYPES_H 1
-/* #undef HAVE_LIBXML */
-#define HAVE_MEMFD_CREATE 1
-#define HAVE_MKOSTEMP 1
-#define HAVE_POSIX_FALLOCATE 1
-#define HAVE_PRCTL 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDIO_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRNDUP 1
-#define HAVE_SYS_PRCTL_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_UNISTD_H 1
-#define LT_OBJDIR ".libs/"
+#define HAVE_ACCEPT4
+#define HAVE_BROKEN_MSG_CMSG_CLOEXEC 0
+#define HAVE_MEMFD_CREATE
+#define HAVE_MKOSTEMP
+#define HAVE_MREMAP
+#define HAVE_POSIX_FALLOCATE
+#define HAVE_PRCTL
+#define HAVE_STRNDUP
+#define HAVE_SYS_PRCTL_H
+#undef HAVE_SYS_PROCCTL_H
+#undef HAVE_SYS_UCRED_H
+#define HAVE_XUCRED_CR_PID 0
 #define PACKAGE "wayland"
-#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/wayland/wayland/issues/"
-#define PACKAGE_NAME "wayland"
-#define PACKAGE_STRING "wayland 1.19.0"
-#define PACKAGE_TARNAME "wayland"
-#define PACKAGE_URL "https://wayland.freedesktop.org/"
-#define PACKAGE_VERSION "1.19.0"
-#define STDC_HEADERS 1
-#define VERSION "1.19.0"
+#define PACKAGE_VERSION "1.20.0"
diff --git a/pkg/wayland/gen.lua b/pkg/wayland/gen.lua
index 5444c22e..b3b9a7c7 100644
--- a/pkg/wayland/gen.lua
+++ b/pkg/wayland/gen.lua
@@ -10,9 +10,9 @@ cflags{
 build('sed', '$outdir/include/wayland-version.h', '$srcdir/src/wayland-version.h.in', {
 	expr={
 		'-e s,@WAYLAND_VERSION_MAJOR@,1,',
-		'-e s,@WAYLAND_VERSION_MINOR@,17,',
+		'-e s,@WAYLAND_VERSION_MINOR@,20,',
 		'-e s,@WAYLAND_VERSION_MICRO@,0,',
-		'-e s,@WAYLAND_VERSION@,1.17.0,',
+		'-e s,@WAYLAND_VERSION@,1.20.0,',
 	},
 })
 
diff --git a/pkg/wayland/src b/pkg/wayland/src
index e60398b1..75c1a93e 160000
--- a/pkg/wayland/src
+++ b/pkg/wayland/src
@@ -1 +1 @@
-Subproject commit e60398b1755bfcdf09f040d3769131fe0d9762fc
+Subproject commit 75c1a93e2067220fa06208f20f8f096bb463ec08
diff --git a/pkg/wayland/ver b/pkg/wayland/ver
index e4283ccd..641dfa67 100644
--- a/pkg/wayland/ver
+++ b/pkg/wayland/ver
@@ -1 +1 @@
-1.19.0 r1
+1.20.0 r0
-- 
cgit v1.2.3