diff options
| author | Treeve Jelbert | 2018-04-03 09:13:12 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2018-04-03 09:18:16 +0200 |
| commit | 89bf2d496cd90bca901c570864fc15b8dd595747 (patch) | |
| tree | b2fd5d8ee2ae89be9ebe5371c1957acbb9dba92f /xorg/xserver | |
| parent | 9631eab9012992372a0712b2f611197c1cdf4227 (diff) | |
xserver: => 1.19.99.903
Diffstat (limited to 'xorg/xserver')
| -rwxr-xr-x | xorg/xserver/BUILD | 1 | ||||
| -rwxr-xr-x | xorg/xserver/CONFIGURE | 1 | ||||
| -rwxr-xr-x | xorg/xserver/DETAILS | 2 | ||||
| -rw-r--r-- | xorg/xserver/HISTORY | 6 | ||||
| -rwxr-xr-x | xorg/xserver/PRE_BUILD | 3 | ||||
| -rw-r--r-- | xorg/xserver/xwin-config.h.meson.in | 24 |
6 files changed, 10 insertions, 27 deletions
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD index 3d218657ba..6cfa4e4f9d 100755 --- a/xorg/xserver/BUILD +++ b/xorg/xserver/BUILD @@ -5,6 +5,7 @@ OPTS+=" xorg=$XSERVER_XORG \ xvfb=$XSERVER_XVFB \ xephyr=$XSERVER_XEPHYR \ dmx=$XSERVER_DMX \ + glamor=$XSERVER_GLAMOR \ module_dir=lib/xorg/modules \ log_dir=${INSTALL_ROOT}/var/log \ xkb_bin_dir=$INSTALL_ROOT/usr/bin \ diff --git a/xorg/xserver/CONFIGURE b/xorg/xserver/CONFIGURE index 84be84631e..b04ebf442a 100755 --- a/xorg/xserver/CONFIGURE +++ b/xorg/xserver/CONFIGURE @@ -11,3 +11,4 @@ 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 diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS index e538d70ed4..fc1e59963a 100755 --- a/xorg/xserver/DETAILS +++ b/xorg/xserver/DETAILS @@ -1,7 +1,7 @@ source $GRIMOIRE/MESON_FUNCTIONS SPELL=xserver SPELLX=xorg-server - VERSION=1.19.99.902 + VERSION=1.19.99.903 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 740fb0717c..8dff878332 100644 --- a/xorg/xserver/HISTORY +++ b/xorg/xserver/HISTORY @@ -1,3 +1,9 @@ +2018-04-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.19.99.903 + * xwin-config.h.meson.in: deleted + * PRE_BUILD: adjust + * BUILD CONFIGURE: enable glamor + 2018-03-30 Pavel Vinogradov <public@sourcemage.org> * BUILD: fixed modules and logs directories * DEPENDS: libxres is optional diff --git a/xorg/xserver/PRE_BUILD b/xorg/xserver/PRE_BUILD index 2af57c51b7..922c0ab256 100755 --- a/xorg/xserver/PRE_BUILD +++ b/xorg/xserver/PRE_BUILD @@ -1,4 +1,3 @@ default_pre_build && cd $SOURCE_DIRECTORY && -apply_patch_dir patches && -cp $SPELL_DIRECTORY/xwin-config.h.meson.in include +apply_patch_dir patches diff --git a/xorg/xserver/xwin-config.h.meson.in b/xorg/xserver/xwin-config.h.meson.in deleted file mode 100644 index 993227398b..0000000000 --- a/xorg/xserver/xwin-config.h.meson.in +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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 |