From 48682815cebf8f5cdb7f20bb6000340b29139c42 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 17 Feb 2022 02:43:15 +0100
Subject: xorg-server: add libxcvt dep, switch to meson

---
 MOTD                       |  7 ++++++
 xorg/xorg-server/build     | 53 +++++++++++++++++-----------------------------
 xorg/xorg-server/checksums |  1 -
 xorg/xorg-server/depends   |  2 ++
 xorg/xorg-server/sources   |  1 -
 xorg/xorg-server/version   |  2 +-
 6 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/MOTD b/MOTD
index 90239ce5..073eae4d 100644
--- a/MOTD
+++ b/MOTD
@@ -5,6 +5,13 @@
 #### #### #    #### ###  #### # #  # ###  #  #
 ------------------------------------------------------------
 
+- 2022-02-17 :: Users who have 'xorg-server' should install
+  'libxcvt' package and switch to it using the alternative
+  system:
+
+        cpt bi libxcvt
+        cpt a | grep ^libxcvt | cpt a -
+
 - 2021-09-06 :: 'gzip' has been renamed to 'pigz'. You need
   to run the following to switch between packages:
 
diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index 73f77eea..2b7dfa07 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -2,41 +2,26 @@
 
 export DESTDIR="$1"
 
-(
-    cd xcvt
-
-    # This is a really small library that is probably only needed by
-    # xorg-server. We are going to build it statically.
-    clsed 's,shared_library,static_library,;/version/d' lib/meson.build
-
-    cl-meson \
-        . output
-
-    ninja -C output
-    ninja -C output install
-)
-
 patch -p1 < rootless_modesetting.patch
 
-export LIBXCVT_CFLAGS="-I$1/usr/include"
-export LIBXCVT_LIBS="-L$1/usr/lib -lxcvt"
-export PKG_CONFIG_PATH="$1/usr/lib/pkgconfig"
-
-./configure \
-    --prefix=/usr \
-    --localstatedir=/var \
-    --disable-shared \
-    --disable-systemd-logind \
-    --disable-unit-tests \
-    --enable-glx \
-    --enable-dri \
-    --enable-dri2 \
-    --enable-dri3 \
-    --enable-glamor \
-    --enable-xorg \
-    --with-systemd-daemon=off
-
-make
-make DESTDIR="$1" install
+cl-meson \
+    --auto-features=auto \
+    -Ddefault_font_path=/usr/share/fonts \
+    -Dsystemd_logind=false \
+    -Dxorg=true \
+    -Dglamor=true \
+    -Dglx=true \
+    -Ddri1=true \
+    -Ddri2=true \
+    -Ddri3=true \
+    -Dxdmcp=false \
+    -Dsecure-rpc=false \
+    -Dvendor_name="Carbs Linux" \
+    -Dvendor_name_short="carbs" \
+    -Dvendor_web="https://carbslinux.org" \
+    . output
+
+ninja -C output
+ninja -C output install
 
 rm -f "$1/usr/share/X11/xorg.conf.d/10-evdev.conf"
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
index d95d114a..b00b4188 100644
--- a/xorg/xorg-server/checksums
+++ b/xorg/xorg-server/checksums
@@ -1,4 +1,3 @@
 %BLAKE3
 d3dcbafd29330dda1a1170e2114a63bb219342ea1222e8172a8d22120baf785a  xorg-server-21.1.3.tar.xz
-54072682f8be432a0f73a867945d2dac166d84640ac04ae9e66a3a157da05e92  libxcvt-0.1.1.tar.xz
 c2e28cedb8528795b222d50b3d49bf833f5c56211dc34d830f3aa83665dbba8f  rootless_modesetting.patch
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
index b57d47d2..786ec1d2 100644
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@@ -13,9 +13,11 @@ libfontenc
 libpciaccess
 libressl
 libxcb
+libxcvt make
 libxkbfile
 libxshmfence
 mesa
+meson make
 pixman
 xkeyboard-config
 xtrans make
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
index 94c6ab46..a5491128 100644
--- a/xorg/xorg-server/sources
+++ b/xorg/xorg-server/sources
@@ -1,3 +1,2 @@
 https://www.x.org/releases/individual/xserver/xorg-server-21.1.3.tar.xz
-https://www.x.org/releases/individual/lib/libxcvt-0.1.1.tar.xz xcvt
 patches/rootless_modesetting.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
index a4696c05..16b811e6 100644
--- a/xorg/xorg-server/version
+++ b/xorg/xorg-server/version
@@ -1 +1 @@
-21.1.3 1
+21.1.3 2
-- 
cgit v1.2.3