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

---
 xorg/xorg-server/build | 53 ++++++++++++++++++--------------------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

(limited to 'xorg/xorg-server/build')

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"
-- 
cgit v1.2.3