Skip to Content.
Sympa Menu

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

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 (3108ac2a67374ae5ea591a5fcdc248a557dc6d92)
  • Date: Wed, 28 Feb 2018 21:00:06 +0000

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

ChangeLog | 4
MESON_FUNCTIONS | 3
xorg/xserver/BUILD | 12 +
xorg/xserver/CONFIGURE | 13 +
xorg/xserver/CONFLICTS | 3
xorg/xserver/DEPENDS | 81
++++++++++
xorg/xserver/DETAILS | 30 +++
xorg/xserver/HISTORY | 13 +
xorg/xserver/PRE_BUILD | 4
xorg/xserver/PROVIDES | 2
xorg/xserver/TODO | 4
xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch | 24 ++
xorg/xserver/patches/0002-install-config-files.patch | 71
++++++++
xorg/xserver/patches/0003-automake-fixes-for-smgl.patch | 25 +++
xorg/xserver/xwin-config.h.meson.in | 24 ++
15 files changed, 312 insertions(+), 1 deletion(-)

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

tweak MESON_FUNCTIONS

commit 82e77a4f448401dff33b301eb4a8435b1abc2732
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xserver-1.19.99.901

diff --git a/ChangeLog b/ChangeLog
index 87dfb27..8b4ce95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * xorg/xserver: exerimental meson based build of xorg-server
+ * MESON_FUNCTIONS: tweak
+
2018-02-28 Ismael Luceno <ismael AT sourcemage.org>
* graphics/grafx2: new spell, bitmap paint program inspired by
Deluxe Paint and Brilliance
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index ea2ac89..ca69368 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -1,9 +1,10 @@
# special functions for projects shich use meson build system
+PREFIX=${PREFIX:-/usr}
meson_build () {
MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}"
# export LANG=$LC_ALL
cd $SOURCE_DIRECTORY
- SCRIPT="meson --prefix ${INSTALL_ROOT}/usr --buildtype ${MESON_BUILD_TYPE}
\
+ SCRIPT="meson --prefix ${INSTALL_ROOT}/$PREFIX --buildtype
${MESON_BUILD_TYPE} \
--default-library shared --libdir lib"
for LL in $OPTS; do
SCRIPT+=" -D$LL"
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
new file mode 100755
index 0000000..481e806
--- /dev/null
+++ b/xorg/xserver/BUILD
@@ -0,0 +1,12 @@
+#message CFLAGS=$CFLAGS
+OPTS+=" xorg=$XSERVER_XORG \
+ xwayland=$XSERVER_WAYLAND \
+ xnest=$XSERVER_XNEST \
+ xvfb=$XSERVER_XVFB \
+ xephyr=$XSERVER_XEPHYR \
+ dmx=$XSERVER_DMX \
+ xkb_bin_dir=$INSTALL_ROOT/usr/bin \
+ os_vendor='SourceMage'"
+PREFIX=/opt/xorg &&
+#PREFIX=/usr &&
+default_build
diff --git a/xorg/xserver/CONFIGURE b/xorg/xserver/CONFIGURE
new file mode 100755
index 0000000..84be846
--- /dev/null
+++ b/xorg/xserver/CONFIGURE
@@ -0,0 +1,13 @@
+persistent_remove XORG_SERVER_OPTS
+#config_query XORG_XINITRC_XSESSION
\
+# "install a .desktop file that calls the user's .xinitrc?"
n &&
+#config_query_list XSERVER_SHA1 "Choose SHA1 implementation:" \
+# nettle
+# libgcrypt \
+# SSL
+config_query_option XSERVER_XORG "Build Xorg server?" y true false
+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
diff --git a/xorg/xserver/CONFLICTS b/xorg/xserver/CONFLICTS
new file mode 100644
index 0000000..39994f5
--- /dev/null
+++ b/xorg/xserver/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts glamor y &&
+conflicts xf86-video-modesetting y &&
+conflicts xorg-server n
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS
new file mode 100755
index 0000000..c69ca6e
--- /dev/null
+++ b/xorg/xserver/DEPENDS
@@ -0,0 +1,81 @@
+depends xorgproto &&
+depends meson &&
+depends ninja-build-system &&
+
+depends font-util &&
+depends libxcb &&
+
+depends AWK &&
+depends eudev &&
+depends MESA &&
+depends pixman &&
+depends dbus &&
+depends libdrm &&
+depends libepoxy &&
+depends nettle &&
+
+depends libpciaccess &&
+depends libxdmcp &&
+depends libxext &&
+depends libxfont2 &&
+depends libxshmfence &&
+depends libxkbfile &&
+
+depends xkbcomp &&
+depends xtrans &&
+
+if [[ "$XSERVER_XNEST" == true ]] || [[ "$XSERVER_XEPHYR" == true ]];then
+ depends libx11
+ depends libxau
+fi &&
+
+if [[ "$XSERVER_DMX" == true ]];then
+ depends libdmx &&
+ depends libxaw &&
+ depends libxmu &&
+ depends libxpm &&
+ depends libxt
+fi &&
+
+if [[ "$XSERVER_XEPHYR" == true ]];then
+ depends xcb-util &&
+ depends xcb-util-image &&
+ depends xcb-util-wm &&
+ depends xcb-util-keysyms &&
+ depends xcb-util-renderutil
+fi &&
+
+if [[ "$XSERVER_WAYLAND" == true ]];then
+ depends wayland &&
+ depends wayland-protocols
+fi &&
+
+#optional_depends elogind '' '' ''
+
+optional_depends libbsd '' '' 'BSD type features' &&
+
+#optional_depends libtirpc 'secure-rpc=true' 'secure-rpc=false' 'secure rpc'
&&
+
+optional_depends libxv 'xv=true' 'xv=false' 'Xv extension' &&
+if is_depends_enabled $SPELL libxv;then
+ optional_depends libxvmc 'xvmc=true' 'xvmc=false' 'XvMC extension'
+fi &&
+
+#optional_depends '' '' ''
+#depends libice
+#depends libxrender
+#depends libxrandr
+
+message 'choose an input driver' &&
+message 'if these drivers are not suitable, choose from the xorg-drivers
section' &&
+
+suggest_depends xf86-input-libinput '' '' 'modern input drivers' &&
+suggest_depends xf86-input-evdev '' '' 'less modern input drivers' &&
+suggest_depends xf86-input-synaptics '' '' 'less modern input drivers' &&
+
+message 'choose an video driver' &&
+message 'video drivers not needed if only using wayland' &&
+suggest_depends xf86-video-amdgpu '' '' 'hardware accelerated AMD drivers' &&
+suggest_depends xf86-video-ati '' '' 'less modern ATI/AMD drivers' &&
+suggest_depends xf86-video-intel '' '' 'modern Intel drivers' &&
+suggest_depends xf86-video-nouveau '' '' 'modern NVidia drivers'
diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS
new file mode 100755
index 0000000..183dc3d
--- /dev/null
+++ b/xorg/xserver/DETAILS
@@ -0,0 +1,30 @@
+source $GRIMOIRE/MESON_FUNCTIONS
+ SPELL=xserver
+ SPELLX=xorg-server
+ VERSION=1.19.99.901
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+
SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=xorg.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE=https://xorg.freedesktop.org/
+ ENTERED=20180228
+ LICENSE[0]=XCL
+ SECURITY_PATCH=11
+ PATCHLEVEL=1
+ SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)"
+cat << EOF
+X servers (including Xorg, Xwayland, Xvfb, Xnest & Xdmx), the core of the X
+Window System.
+
+The X server accepts requests from client applications to create windows,
+which are (normally rectangular) "virtual screens" that the client program
+can draw into.
+
+Windows are then composed on the actual screen by the X server
+(or by a separate composite manager) as directed by the window manager,
+which usually communicates with the user via graphical controls such as
buttons
+and draggable titlebars and borders.
+EOF
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
new file mode 100644
index 0000000..f18bdf6
--- /dev/null
+++ b/xorg/xserver/HISTORY
@@ -0,0 +1,13 @@
+2018-02-28 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version 1.19.99.901
+ this spell is still WIP. it currently installs to /opt/xorg and
misses
+ *.pc files, so other software (drivers) cannot find stuff.
+ otherwise is appears to install the same files as the xorg-server
spell
+ the overall build process is much faster
+ I have been building against mesa-18.x
+ * PRE_BUILD patches: added, SourceMage specific patches
+ * xwin-config.h.meson.in: add missing file
+
+2017-09-30 Treeve Jelbert <treeve AT sourcemage.org
+ * DETAILS: version master (git)
+ an experimental rewrite of xorg-server using the meson build system
diff --git a/xorg/xserver/PRE_BUILD b/xorg/xserver/PRE_BUILD
new file mode 100755
index 0000000..2af57c5
--- /dev/null
+++ b/xorg/xserver/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&
+cp $SPELL_DIRECTORY/xwin-config.h.meson.in include
diff --git a/xorg/xserver/PROVIDES b/xorg/xserver/PROVIDES
new file mode 100755
index 0000000..f43e807
--- /dev/null
+++ b/xorg/xserver/PROVIDES
@@ -0,0 +1,2 @@
+X11-SERVER
+XSERVER
diff --git a/xorg/xserver/TODO b/xorg/xserver/TODO
new file mode 100644
index 0000000..e88f9b2
--- /dev/null
+++ b/xorg/xserver/TODO
@@ -0,0 +1,4 @@
+need pkgcong stuff
+need xorg-server.h
+need various config files
+
diff --git a/xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch
b/xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch
new file mode 100644
index 0000000..ec25c28
--- /dev/null
+++ b/xorg/xserver/patches/0001-put-extensions-in-.mesa-subdir.patch
@@ -0,0 +1,24 @@
+From 14f039a7c6bcb8e240845ff035a92bbd9e5e5a0b Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Thu, 5 Oct 2017 08:41:49 +0200
+Subject: [PATCH 1/3] put extensions in .mesa subdir
+
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d232..453f3de 100644
+--- a/hw/xfree86/dixmods/meson.build
++++ b/hw/xfree86/dixmods/meson.build
+@@ -52,6 +52,6 @@ if build_glx
+ link_with: e,
+
+ install: true,
+- install_dir: join_paths(module_dir, 'extensions')
++ install_dir: join_paths(module_dir, 'extensions/.mesa')
+ )
+ endif
+--
+2.16.1
+
diff --git a/xorg/xserver/patches/0002-install-config-files.patch
b/xorg/xserver/patches/0002-install-config-files.patch
new file mode 100644
index 0000000..089026c
--- /dev/null
+++ b/xorg/xserver/patches/0002-install-config-files.patch
@@ -0,0 +1,71 @@
+From 510014d537d95de656af781590aab30e7d8763c5 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Wed, 1 Nov 2017 12:20:42 +0100
+Subject: [PATCH 2/3] install config files
+
+---
+ include/meson.build | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/include/meson.build b/include/meson.build
+index 00ec057..cf53c82 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -207,7 +207,9 @@ conf_data.set_quoted('BUILDERADDR',
get_option('builder_addr'))
+ conf_data.set_quoted('BUILDERSTRING', get_option('builder_string'))
+
+ configure_file(output : 'dix-config.h',
+- configuration : conf_data)
++ configuration : conf_data,
++ install_dir: xorgsdkdir
++)
+
+
+
+@@ -218,7 +220,9 @@ version_data.set_quoted('VENDOR_NAME_SHORT',
get_option('vendor_name_short'))
+ version_data.set_quoted('VENDOR_WEB', get_option('vendor_web'))
+ version_data.set_quoted('VENDOR_MAN_VERSION', 'Version
@0@.@1@.@2@'.format(major, minor, patch))
+ configure_file(output : 'version-config.h',
+- configuration : version_data)
++ configuration : version_data,
++ install_dir: xorgsdkdir
++)
+
+ xkb_data = configuration_data()
+
+@@ -232,7 +236,9 @@ xkb_data.set_quoted('XKB_DFLT_OPTIONS',
get_option('xkb_default_options'))
+ xkb_data.set_quoted('XKM_OUTPUT_DIR', xkb_output_dir)
+
+ configure_file(output : 'xkb-config.h',
+- configuration : xkb_data)
++ configuration : xkb_data,
++ install_dir: xorgsdkdir
++)
+
+ xorg_data = configuration_data()
+
+@@ -277,7 +283,9 @@ endif
+
+ configure_file(output : 'xorg-config.h',
+ input : 'xorg-config.h.meson.in',
+- configuration : xorg_data)
++ configuration : xorg_data,
++ install_dir: xorgsdkdir
++)
+
+ xwin_data = configuration_data()
+ xwin_data.set_quoted('DEFAULT_LOGDIR', log_dir)
+@@ -291,7 +299,9 @@ xwin_data.set10('CYGMULTIWINDOW_DEBUG', enable_debugging)
+
+ configure_file(output : 'xwin-config.h',
+ input : 'xwin-config.h.meson.in',
+- configuration : xwin_data)
++ configuration : xwin_data,
++ install_dir: xorgsdkdir
++)
+
+ if build_xorg
+ install_data(
+--
+2.16.1
+
diff --git a/xorg/xserver/patches/0003-automake-fixes-for-smgl.patch
b/xorg/xserver/patches/0003-automake-fixes-for-smgl.patch
new file mode 100644
index 0000000..25d407c
--- /dev/null
+++ b/xorg/xserver/patches/0003-automake-fixes-for-smgl.patch
@@ -0,0 +1,25 @@
+From 20d214cddfc9b5ed4a64e8d3a5610256813b0f00 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 9 Feb 2018 14:04:21 +0100
+Subject: [PATCH 3/3] automake fixes for smgl
+
+---
+ hw/xfree86/dixmods/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
+index 856659f..e156043 100644
+--- a/hw/xfree86/dixmods/Makefile.am
++++ b/hw/xfree86/dixmods/Makefile.am
+@@ -8,7 +8,7 @@ module_LTLIBRARIES = libfb.la \
+ libwfb.la \
+ libshadow.la
+
+-extsmoduledir = $(moduledir)/extensions
++extsmoduledir = $(moduledir)/extensions/.mesa
+ extsmodule_LTLIBRARIES = $(GLXMODS)
+
+ AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
+--
+2.16.1
+
diff --git a/xorg/xserver/xwin-config.h.meson.in
b/xorg/xserver/xwin-config.h.meson.in
new file mode 100644
index 0000000..9932273
--- /dev/null
+++ b/xorg/xserver/xwin-config.h.meson.in
@@ -0,0 +1,24 @@
+/*
+ * xwin-config.h.in
+ *
+ * This file has all defines used in the xwin ddx
+ *
+ */
+#include <dix-config.h>
+
+/* Winsock networking */
+#mesondefine HAS_WINSOCK
+
+/* Cygwin has /dev/windows for signaling new win32 messages */
+#mesondefine HAS_DEVWINDOWS
+
+/* Switch on debug messages */
+#mesondefine CYGDEBUG
+#mesondefine CYGWINDOWING_DEBUG
+#mesondefine CYGMULTIWINDOW_DEBUG
+
+/* Default log location */
+#mesondefine DEFAULT_LOGDIR
+
+/* Whether we should re-locate the root to where the executable lives */
+#mesondefine RELOCATE_PROJECTROOT



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3108ac2a67374ae5ea591a5fcdc248a557dc6d92), Treeve Jelbert, 02/28/2018

Archive powered by MHonArc 2.6.24.

Top of Page