Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (eec6401fb99b3550fa431393a5aeef956beb095f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (eec6401fb99b3550fa431393a5aeef956beb095f)
  • Date: Wed, 17 Feb 2021 19:53:22 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 1 +
xorg/xserver/BUILD | 10 ++++------
xorg/xserver/CONFIGURE | 11 ++---------
xorg/xserver/DETAILS | 2 +-
xorg/xserver/HISTORY | 5 +++++
xorg/xserver/PRE_SUB_DEPENDS | 5 -----
xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS | 5 -----
xorg/xserver/REPAIR^all^SUB_DEPENDS | 6 ------
xorg/xserver/SUB_DEPENDS | 6 ------
xorg/xwayland/DEPENDS | 30 ++++++++++++++++++++++++++++++
xorg/xwayland/DETAILS | 18 ++++++++++++++++++
xorg/xwayland/HISTORY | 7 +++++++
xorg/xwayland/PREPARE | 3 +++
13 files changed, 71 insertions(+), 38 deletions(-)

New commits:
commit eec6401fb99b3550fa431393a5aeef956beb095f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xserver - remove xwayland stuff

commit 3dee6143aa6a18d4ba70cad7cef8db6697d65f3d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xwayland: => 21.0.99.901

diff --git a/ChangeLog b/ChangeLog
index 9dc850e..b014e8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
disman-0.521.0
kdisplay-5.21.0
kwinft-5.21.0
+ * xorg/xwayland: added, was part of xserver

2021-02-15 Ismael Luceno <ismael AT sourcemage.org>
* python-pypi/svg2tikz: new spell, Tools for converting SVG to
TikZ/PGF
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index 86a7a64..ebe50c7 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -1,16 +1,14 @@
#message CFLAGS=$CFLAGS
OPTS+=" xorg=$XSERVER_XORG \
- xwayland=$XSERVER_WAYLAND \
+ xwayland=false \
xnest=$XSERVER_XNEST \
xvfb=$XSERVER_XVFB \
+ xselinux=${XSERVER_SELINUX} \
xephyr=$XSERVER_XEPHYR \
dmx=$XSERVER_DMX \
glamor=$XSERVER_GLAMOR \
listen_tcp=$XSERVER_TCP \
log_dir=${INSTALL_ROOT}/var/log \
- xkb_bin_dir=$INSTALL_ROOT/usr/bin \
- os_vendor='SourceMage'"
+ xkb_bin_dir=$INSTALL_ROOT/usr/bin" &&
PREFIX=/usr &&
-check_tmp_noexec /tmp &&
-default_build &&
-check_tmp_noexec /tmp
+default_build
diff --git a/xorg/xserver/CONFIGURE b/xorg/xserver/CONFIGURE
index b23e367..06383d7 100755
--- a/xorg/xserver/CONFIGURE
+++ b/xorg/xserver/CONFIGURE
@@ -1,4 +1,5 @@
persistent_remove XORG_SERVER_OPTS
+persistent_remove XSERVER_WAYLAND
#config_query XORG_XINITRC_XSESSION
\
# "install a .desktop file that calls the user's .xinitrc?"
n &&
#config_query_list XSERVER_SHA1 "Choose SHA1 implementation:" \
@@ -6,18 +7,10 @@ persistent_remove XORG_SERVER_OPTS
# libgcrypt \
# SSL
config_query_option XSERVER_XORG "Build Xorg server?" y true false
-if [[ ${XSERVER_XORG} == 'true' ]]; then
- # Have the default at least working to get input devices with any setup,
- # getting out of X11 is tricky when that is broken.
- config_query_option XSERVER_SUID_ROOT \
- "Set Xorg suid root (possibly needed for multiple sessions with some
drivers)?" n true false
- config_query_option XSERVER_SGID_INPUT \
- "Set Xorg sgid input (for input devices when not suid root or session
magic)?" y true false
-fi
-config_query_option XSERVER_WAYLAND "Build XWayland server?" y true false
config_query_option XSERVER_XNEST "Build XNest nested X server?" n true
false
config_query_option XSERVER_XVFB "Build Xvfb server?" n true false
config_query_option XSERVER_XEPHYR "Build Xephyr nested X server?" n true
false
config_query_option XSERVER_DMX "Build DMX nested X server?" n true false
config_query_option XSERVER_GLAMOR "build Glamor" y true false
config_query_option XSERVER_TCP "listen on TCP" n true false
+config_query_option XSERVER_SELINUX "Build XSELINUX" n true false
diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS
index 8a47145..119a511 100755
--- a/xorg/xserver/DETAILS
+++ b/xorg/xserver/DETAILS
@@ -2,7 +2,7 @@ source $GRIMOIRE/MESON_FUNCTIONS
SPELL=xserver
SPELLX=xorg-server
VERSION=1.20.10
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELLX-$VERSION.tar.bz2

SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 264f0e4..ed1c6de 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,8 @@
+2021-02-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD CONFIGURE: delete xwayland stuff,; now a separate spell
+ * *SUB*: deleted
+ * DETAILS: PATCHLEVEL++
+
2020-12-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Added systemd and tie dbus to it
* DETAILS: PATCHLEVEL++
diff --git a/xorg/xserver/PRE_SUB_DEPENDS b/xorg/xserver/PRE_SUB_DEPENDS
deleted file mode 100755
index 8f2b364..0000000
--- a/xorg/xserver/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- XWAYLAND) [[ "${XSERVER_WAYLAND}" == "true" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
b/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
deleted file mode 100755
index 8f2b364..0000000
--- a/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- XWAYLAND) [[ "${XSERVER_WAYLAND}" == "true" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xserver/REPAIR^all^SUB_DEPENDS
b/xorg/xserver/REPAIR^all^SUB_DEPENDS
deleted file mode 100755
index 81101ee..0000000
--- a/xorg/xserver/REPAIR^all^SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}"
&&
- XSERVER_WAYLAND="true" ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xserver/SUB_DEPENDS b/xorg/xserver/SUB_DEPENDS
deleted file mode 100755
index 81101ee..0000000
--- a/xorg/xserver/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}"
&&
- XSERVER_WAYLAND="true" ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xwayland/DEPENDS b/xorg/xwayland/DEPENDS
new file mode 100755
index 0000000..8ee5e53
--- /dev/null
+++ b/xorg/xwayland/DEPENDS
@@ -0,0 +1,30 @@
+depends meson &&
+depends ninja-build-system &&
+
+depends font-util &&
+depends libxcb &&
+
+depends mesa &&
+depends pixman &&
+#depends dbus &&
+depends libdrm &&
+depends libepoxy &&
+depends nettle &&
+
+# Xorg stuff
+depends libxau &&
+depends libxdmcp &&
+depends libxext &&
+depends libxfont2 &&
+depends libxshmfence &&
+depends libxkbfile &&
+
+depends xkbcomp &&
+depends xtrans &&
+
+depends wayland &&
+depends wayland-protocols &&
+depends xorgproto &&
+
+optional_depends libbsd '' '' 'BSD type features' &&
+optional_depends libtirpc secure-rpc={true,false} 'secure rpc'
diff --git a/xorg/xwayland/DETAILS b/xorg/xwayland/DETAILS
new file mode 100755
index 0000000..1d6eb8f
--- /dev/null
+++ b/xorg/xwayland/DETAILS
@@ -0,0 +1,18 @@
+source $GRIMOIRE/MESON_FUNCTIONS
+ SPELL=xwayland
+ VERSION=21.0.99.901
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
SOURCE_URL=https://xorg.freedesktop.org/archive/individual/xserver/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=xorg.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ WEB_SITE=https://xorg.freedesktop.org
+ ENTERED=20201221
+ LICENSE[0]=XCL
+ SHORT="X servers XWayland)"
+cat << EOF
+Wayland based X server.
+Was part of xserver
+EOF
diff --git a/xorg/xwayland/HISTORY b/xorg/xwayland/HISTORY
new file mode 100644
index 0000000..61e2646
--- /dev/null
+++ b/xorg/xwayland/HISTORY
@@ -0,0 +1,7 @@
+2021-02-17 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: add gpg checking
+ * DETAILS : version 21.0.99.901
+
+2020-12-21 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version master (git)
+ provides Xwayland server; was part of xserver
diff --git a/xorg/xwayland/PREPARE b/xorg/xwayland/PREPARE
new file mode 100755
index 0000000..4231239
--- /dev/null
+++ b/xorg/xwayland/PREPARE
@@ -0,0 +1,3 @@
+if is_depends_enabled xserver wayland;then
+ cast -c xserver
+fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (eec6401fb99b3550fa431393a5aeef956beb095f), Treeve Jelbert, 02/17/2021

Archive powered by MHonArc 2.6.24.

Top of Page