summaryrefslogtreecommitdiffstats
path: root/xorg/xserver
diff options
context:
space:
mode:
authorPavel Vinogradov2018-03-30 18:34:21 -0400
committerPavel Vinogradov2018-03-30 18:34:21 -0400
commitf0415b83d6a0b6f25774082ee1f2060685dba96c (patch)
treee22585b373b8381ff8fab88726a2f850a9e39851 /xorg/xserver
parent9ffded2426de9fd17815a58fefac95a054cdf5a9 (diff)
xorg/xserver: made libxres optional + fixed modules and logs locations
Diffstat (limited to 'xorg/xserver')
-rwxr-xr-xxorg/xserver/BUILD2
-rwxr-xr-xxorg/xserver/DEPENDS2
-rw-r--r--xorg/xserver/HISTORY4
3 files changed, 7 insertions, 1 deletions
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index a77b2da2fc..3d218657ba 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -5,6 +5,8 @@ OPTS+=" xorg=$XSERVER_XORG \
xvfb=$XSERVER_XVFB \
xephyr=$XSERVER_XEPHYR \
dmx=$XSERVER_DMX \
+ module_dir=lib/xorg/modules \
+ log_dir=${INSTALL_ROOT}/var/log \
xkb_bin_dir=$INSTALL_ROOT/usr/bin \
os_vendor='SourceMage'"
PREFIX=/opt/xorg &&
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS
index d6a3067f70..49c769e5fd 100755
--- a/xorg/xserver/DEPENDS
+++ b/xorg/xserver/DEPENDS
@@ -19,7 +19,6 @@ depends libxdmcp &&
depends libxext &&
depends libxfont2 &&
depends libxshmfence &&
-depends libxres &&
depends libxkbfile &&
depends xkbcomp &&
@@ -57,6 +56,7 @@ optional_depends libbsd '' '' 'BSD type features' &&
optional_depends libtirpc 'secure-rpc=true' 'secure-rpc=false' 'secure rpc' &&
+optional_depends libxres 'xres=true' 'xres=false' 'XRes extension' &&
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'
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 86dbf5837f..740fb0717c 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,7 @@
+2018-03-30 Pavel Vinogradov <public@sourcemage.org>
+ * BUILD: fixed modules and logs directories
+ * DEPENDS: libxres is optional
+
2018-03-29 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.19.99.902
* DEPENDS: tweak