mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] weston: version bump 8.0.0 -> 9.0.0
@ 2020-09-15 17:31 Philipp Zabel
  2020-10-06  8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2020-09-15 17:31 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...include-sys-mman.h-in-os-compatibili.patch | 33 ----------
 ...-the-seal-logic-behind-HAVE_MEMFD_CR.patch | 60 -------------------
 patches/weston-8.0.0/series                   |  5 --
 rules/weston.in                               |  4 ++
 rules/weston.make                             |  8 ++-
 5 files changed, 9 insertions(+), 101 deletions(-)
 delete mode 100644 patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
 delete mode 100644 patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
 delete mode 100644 patches/weston-8.0.0/series

diff --git a/patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch b/patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
deleted file mode 100644
index 1486121e7190..000000000000
--- a/patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Sat, 1 Feb 2020 20:02:29 -0700
-Subject: [PATCH] unconditionally include sys/mman.h in os-compatibility.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’?
-  map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0);
-                         ^~~~~~~~~
-                         LOCK_READ
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
----
- shared/os-compatibility.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
-index 5e1ce4793cec..041c929f83e5 100644
---- a/shared/os-compatibility.c
-+++ b/shared/os-compatibility.c
-@@ -34,10 +34,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <libweston/zalloc.h>
--
--#ifdef HAVE_MEMFD_CREATE
- #include <sys/mman.h>
--#endif
- 
- #include "os-compatibility.h"
- 
diff --git a/patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch b/patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
deleted file mode 100644
index 82d25b00d29e..000000000000
--- a/patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Sebastian Wick <sebastian@sebastianwick.net>
-Date: Wed, 5 Feb 2020 10:27:23 +0100
-Subject: [PATCH] shared: guard all the seal logic behind HAVE_MEMFD_CREATE
-
-The initial version of os_ro_anonymous_file missed two guards around the
-seal logic which leads to a compilation error on older systems.
-
-Also make the check for a read-only file symmetric in
-os_ro_anonymous_file_get_fd and os_ro_anonymous_file_put_fd.
-
-Signed-off-by: Sebastian Wick <sebastian@sebastianwick.net>
----
- shared/os-compatibility.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
-index 041c929f83e5..2e12b7cc3626 100644
---- a/shared/os-compatibility.c
-+++ b/shared/os-compatibility.c
-@@ -340,6 +340,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
- 	void *src, *dst;
- 	int seals, fd;
- 
-+#ifdef HAVE_MEMFD_CREATE
- 	seals = fcntl(file->fd, F_GET_SEALS);
- 
- 	/* file was sealed for read-only and we don't have to support MAP_SHARED
-@@ -348,6 +349,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
- 	if (seals != -1 && mapmode == RO_ANONYMOUS_FILE_MAPMODE_PRIVATE &&
- 	    (seals & READONLY_SEALS) == READONLY_SEALS)
- 		return file->fd;
-+#endif
- 
- 	/* for all other cases we create a new anonymous file that can be mapped
- 	 * with MAP_SHARED and copy the contents to it and return that instead
-@@ -388,17 +390,18 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
- int
- os_ro_anonymous_file_put_fd(int fd)
- {
-+#ifdef HAVE_MEMFD_CREATE
- 	int seals = fcntl(fd, F_GET_SEALS);
- 	if (seals == -1 && errno != EINVAL)
- 		return -1;
- 
--	/* If the fd cannot be sealed seals is -1 at this point
--	 * or the file can be sealed but has not been sealed for writing.
--	 * In both cases we created a new anonymous file that we have to
--	 * close.
-+	/* The only case in which we do NOT have to close the file is when the file
-+	 * was sealed for read-only
- 	 */
--	if (seals == -1 || !(seals & F_SEAL_WRITE))
--		close(fd);
-+	if (seals != -1 && (seals & READONLY_SEALS) == READONLY_SEALS)
-+		return 0;
-+#endif
- 
-+	close(fd);
- 	return 0;
- }
diff --git a/patches/weston-8.0.0/series b/patches/weston-8.0.0/series
deleted file mode 100644
index ed045c3f9a22..000000000000
--- a/patches/weston-8.0.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
-0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
-# bb3fbf767cc2393f046e3c397089bedb  - git-ptx-patches magic
diff --git a/rules/weston.in b/rules/weston.in
index 5979471ab5d4..d5c60d59f5d7 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -115,6 +115,10 @@ config WESTON_IVISHELL_EXAMPLE
 	  application, a few demo clients and the weston.ini configuration for
 	  the IVI-Shell.
 
+config WESTON_SHELL_KIOSK
+	bool
+	prompt "kiosk shell"
+
 config WESTON_PIPEWIRE
 	bool
 	prompt "pipewire plugin"
diff --git a/rules/weston.make b/rules/weston.make
index 6ac059f6a627..89d10fedf6e2 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 8.0.0
-LIBWESTON_MAJOR := 8
-WESTON_MD5	:= 53e4810d852df0601d01fd986a5b22b3
+WESTON_VERSION	:= 9.0.0
+LIBWESTON_MAJOR := 9
+WESTON_MD5	:= b406da0fe9139fd39653238fde22a6cf
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.xz
 WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -59,8 +59,10 @@ WESTON_CONF_OPT		:= \
 	-Dshell-desktop=true \
 	-Dshell-fullscreen=true \
 	-Dshell-ivi=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL) \
+	-Dshell-kiosk=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_KIOSK) \
 	-Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
 	-Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
+	-Dtest-gl-renderer=false \
 	-Dtest-junit-xml=false \
 	-Dtools=calibrator,debug,info,terminal,touch-calibrator \
 	-Dwcap-decode=$(call ptx/truefalse,PTXCONF_WESTON_WCAP_TOOLS) \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-06  8:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-15 17:31 [ptxdist] [PATCH] weston: version bump 8.0.0 -> 9.0.0 Philipp Zabel
2020-10-06  8:18 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox