From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 30 Aug 2022 11:10:20 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oSxGG-001Xf9-Np for lore@lore.pengutronix.de; Tue, 30 Aug 2022 11:10:20 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oSxGF-0002jW-EA; Tue, 30 Aug 2022 11:10:19 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oSxFW-000287-JE; Tue, 30 Aug 2022 11:09:34 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oSxFV-002pq2-Pk; Tue, 30 Aug 2022 11:09:33 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oSxFU-003sxV-Vs; Tue, 30 Aug 2022 11:09:32 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 30 Aug 2022 11:09:32 +0200 Message-Id: <20220830090932.924660-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220811104551.1545447-2-l.stach@pengutronix.de> References: <20220811104551.1545447-2-l.stach@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] xwayland: split out of xorg-server, update to 22.1.3 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lucas Stach Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 393077a765a41ce18b32fe01ea18a96c7ee65cc2. Michael [sent from post-receive hook] On Tue, 30 Aug 2022 11:09:32 +0200, Lucas Stach wrote: > Separate XWayland out of the xorg-server package into a new xwayland > package and update to version 22.1.3. > > Signed-off-by: Philipp Zabel > Signed-off-by: Lucas Stach > Message-Id: <20220811104551.1545447-2-l.stach@pengutronix.de> > [mol: don't duplicate XORG_FONT_DIRS definition] > Signed-off-by: Michael Olbrich > > diff --git a/rules/weston.in b/rules/weston.in > index ca2e06a53201..550eda4b19aa 100644 > --- a/rules/weston.in > +++ b/rules/weston.in > @@ -23,11 +23,11 @@ menuconfig WESTON > select MESALIB_GLES2 if WESTON_GL > select CAIRO_GLES2 if WESTON_GL > select CAIRO_EGL if WESTON_GL > + select XORG if WESTON_XWAYLAND > select CAIRO_XCB if WESTON_XWAYLAND > select LIBXCB if WESTON_XWAYLAND > select XORG_LIB_XCURSOR if WESTON_XWAYLAND > - select XORG_SERVER if WESTON_XWAYLAND && RUNTIME > - select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME > + select XWAYLAND if WESTON_XWAYLAND && RUNTIME > select SEATD if WESTON_SEATD > select SYSTEMD if WESTON_SYSTEMD > select SYSTEMD_LOGIND if WESTON_SYSTEMD_LOGIND > diff --git a/rules/xorg-server.in b/rules/xorg-server.in > index 5632991c32b3..030b3a72de4b 100644 > --- a/rules/xorg-server.in > +++ b/rules/xorg-server.in > @@ -62,11 +62,6 @@ menuconfig XORG_SERVER > # xorg ddx > select LIBPCIACCESS if XORG_SERVER_XORG > > - # xwayland ddx > - select WAYLAND if XORG_SERVER_XWAYLAND > - select LIBDRM if XORG_SERVER_XWAYLAND > - select LIBEPOXY if XORG_SERVER_XWAYLAND > - > # glamor module > select LIBEPOXY if XORG_SERVER_GLAMOR > select MESALIB if XORG_SERVER_GLAMOR > @@ -168,12 +163,6 @@ config XORG_SERVER_XNEST > An X server working on a running X server. Disadvantage is Xnest > supports only features the running X server itself supports. > > -config XORG_SERVER_XWAYLAND > - bool > - select XORG_SERVER_EXT_COMPOSITE > - select XORG_SERVER_EXT_DRI3 > - prompt "Xwayland server" > - > config XORG_SERVER_XWIN > bool > depends on BROKEN > diff --git a/rules/xorg-server.make b/rules/xorg-server.make > index 0a2d4436f5e2..15049f5ea29e 100644 > --- a/rules/xorg-server.make > +++ b/rules/xorg-server.make > @@ -88,7 +88,7 @@ XORG_SERVER_CONF_OPT = \ > -Dxv=$(call ptx/truefalse, PTXCONF_XORG_SERVER_EXT_XV) \ > -Dxvfb=$(call ptx/truefalse, PTXCONF_XORG_SERVER_XVFB) \ > -Dxvmc=$(call ptx/truefalse, PTXCONF_XORG_SERVER_EXT_XVMC) \ > - -Dxwayland=$(call ptx/truefalse, PTXCONF_XORG_SERVER_XWAYLAND) \ > + -Dxwayland=false \ > -Dxwayland_eglstream=false \ > -Dxwin=$(call ptx/truefalse, PTXCONF_XORG_SERVER_XWIN) > > @@ -127,10 +127,6 @@ ifdef PTXCONF_XORG_SERVER_XNEST > @$(call install_copy, xorg-server, 0, 0, 0755, -, \ > $(XORG_PREFIX)/bin/Xnest) > endif > -ifdef PTXCONF_XORG_SERVER_XWAYLAND > - @$(call install_copy, xorg-server, 0, 0, 0755, -, \ > - $(XORG_PREFIX)/bin/Xwayland) > -endif > ifdef PTXCONF_XORG_SERVER_XWIN > @$(call install_copy, xorg-server, 0, 0, 0755, -, \ > $(XORG_PREFIX)/bin/Xwin) > diff --git a/rules/xwayland.in b/rules/xwayland.in > new file mode 100644 > index 000000000000..d756b4ab1c5c > --- /dev/null > +++ b/rules/xwayland.in > @@ -0,0 +1,75 @@ > +## SECTION=multimedia_xorg > + > +menuconfig XWAYLAND > + tristate > + prompt "XWayland" > + select HOST_MESON > + select LIBC_M > + select LIBDRM > + select LIBEPOXY > + select LIBXCVT > + select NETTLE > + select PIXMAN > + select WAYLAND > + select XORGPROTO > + select XORG_LIB_FONTENC > + select XORG_LIB_XAU > + select XORG_LIB_XEXT > + select XORG_LIB_XFONT2 > + select XORG_LIB_XKBFILE > + select XORG_LIB_XSHMFENCE > + select XORG_LIB_XTRANS > + select MESALIB if XWAYLAND_GLAMOR > + select MESALIB_GBM if XWAYLAND_GLAMOR > + select XORG_LIB_XV if XWAYLAND_EXT_XV > + select XORG_LIB_XRES if XWAYLAND_EXT_XRES > + select XORG_APP_XKBCOMP if RUNTIME > + > +if XWAYLAND > + > +menu "xwayland extensions" > + > +config XWAYLAND_EXT_GLX > + bool > + prompt "glx extension" > + default y > + help > + Support for the GLX extension allowing clients to set up > + a OpenGL context on a X display when not using EGL. > + > +config XWAYLAND_EXT_SHM > + bool > + prompt "shm extension" > + default y > + help > + Support for MIT Shared Memory > + > +config XWAYLAND_EXT_XRES > + bool > + prompt "xres extension" > + default y > + help > + The X-Resource extension allows a client to query the X server about > + its usage of various resources. > + > +config XWAYLAND_EXT_XV > + bool > + prompt "xv extension" > + default y > + help > + The Xv extension provides support for video adaptors attached to an X > + display. It takes the approach that a display may have one or more > + video adaptors, each of which has one or more ports through which > + independent video streams pass > + > +config XWAYLAND_GLAMOR > + bool > + prompt "glamor module" > + help > + The glamor module is an open-source 2D graphics common driver > + for the X Window System as implemented by X.org. It supports a > + variety of graphics chipsets which have EGL/GBM/OpenGL 2.1 support. > + > +endmenu > + > +endif > diff --git a/rules/xwayland.make b/rules/xwayland.make > new file mode 100644 > index 000000000000..2cb82fd4b9b2 > --- /dev/null > +++ b/rules/xwayland.make > @@ -0,0 +1,99 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2021 Philipp Zabel > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_XWAYLAND) += xwayland > + > +# > +# Paths and names > +# > +XWAYLAND_VERSION := 22.1.3 > +XWAYLAND_MD5 := 83849961283e8cea32be6740914822e5 > +XWAYLAND := xwayland-$(XWAYLAND_VERSION) > +XWAYLAND_SUFFIX := tar.xz > +XWAYLAND_URL := $(call ptx/mirror, XORG, individual/xserver/$(XWAYLAND).$(XWAYLAND_SUFFIX)) > +XWAYLAND_SOURCE := $(SRCDIR)/$(XWAYLAND).$(XWAYLAND_SUFFIX) > +XWAYLAND_DIR := $(BUILDDIR)/$(XWAYLAND) > +XWAYLAND_LICENSE := MIT > +XWAYLAND_LICENSE_FILES := \ > + file://COPYING;md5=5df87950af51ac2c5822094553ea1880 > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +# > +# meson > +# > +XWAYLAND_CONF_TOOL := meson > +XWAYLAND_CONF_OPT := \ > + $(CROSS_MESON_USR) \ > + -Dbuilder_addr=ptxdist@pengutronix.de \ > + -Dbuilder_string=PTXdist \ > + -Ddefault_font_path=$(subst $(space),$(comma),$(addprefix $(XORG_FONTDIR)/,$(XORG_FONT_DIRS))) \ > + -Ddpms=false \ > + -Ddri3=true \ > + -Ddtrace=false \ > + -Dglamor=$(call ptx/truefalse, PTXCONF_XWAYLAND_GLAMOR) \ > + -Dglx=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_GLX) \ > + -Dinput_thread=auto \ > + -Dipv6=$(call ptx/truefalse, PTXCONF_GLOBAL_IPV6) \ > + -Dlibunwind=false \ > + -Dlisten_local=true \ > + -Dlisten_tcp=false \ > + -Dlisten_unix=true \ > + -Dmitshm=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_SHM) \ > + -Dscreensaver=false \ > + -Dsecure-rpc=false \ > + -Dsha1=libnettle \ > + -Dvendor_name=PTXdist \ > + -Dvendor_name_short=PTXdist \ > + -Dvendor_web=https://www.ptxdist.org/ \ > + -Dxace=false \ > + -Dxcsecurity=false \ > + -Dxdm-auth-1=false \ > + -Dxdmcp=false \ > + -Dxf86bigfont=false \ > + -Dxinerama=false \ > + -Dxkb_bin_dir=/usr/bin \ > + -Dxkb_default_layout=us \ > + -Dxkb_default_model=pc105 \ > + -Dxkb_default_options= \ > + -Dxkb_default_rules=evdev \ > + -Dxkb_default_variant= \ > + -Dxkb_dir=/usr/share/X11/xkb \ > + -Dxkb_output_dir= \ > + -Dxres=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_XRES) \ > + -Dxselinux=false \ > + -Dxv=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_XV) \ > + -Dxvfb=false \ > + -Dxwayland-path= \ > + -Dxwayland_eglstream=false > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/xwayland.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, xwayland) > + @$(call install_fixup, xwayland,PRIORITY,optional) > + @$(call install_fixup, xwayland,SECTION,base) > + @$(call install_fixup, xwayland,AUTHOR,"Philipp Zabel ") > + @$(call install_fixup, xwayland,DESCRIPTION,missing) > + > + @$(call install_copy, xwayland, 0, 0, 0755, -, $(XORG_PREFIX)/bin/Xwayland) > + > + @$(call install_finish, xwayland) > + > + @$(call touch) > + > +# vim: syntax=make