From edaa0ee16d2b28e0b4f8553632a849a6702e5832 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Thu, 28 Oct 2021 18:47:25 +0200
Subject: xorg-server: bump to 21.1.0

---
 xorg/xorg-server/build     | 23 +++++++++++++++++++++++
 xorg/xorg-server/checksums |  6 ++++--
 xorg/xorg-server/sources   |  3 ++-
 xorg/xorg-server/version   |  2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'xorg')

diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index a518c9e2..bfee9e39 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -1,7 +1,27 @@
 #!/bin/sh -e
 
+export DESTDIR=$PWD/tmp
+
+(
+    cd xcvt
+
+    # Make it a static library
+    clsed 's,shared_library,static_library,' lib/meson.build
+
+    cl-meson \
+        . output
+
+    ninja -C output
+    ninja -C output install
+)
+
 patch -p1 < rootless_modesetting.patch
 
+export LIBXCVT_CFLAGS="-I$DESTDIR/usr/include"
+export LIBXCVT_LIBS="-L$DESTDIR/usr/lib -lxcvt"
+export PKG_CONFIG_PATH="$DESTDIR/usr/lib/pkgconfig"
+export DESTDIR=$1
+
 ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -20,3 +40,6 @@ make
 make DESTDIR="$1" install
 
 rm -f "$1/usr/share/X11/xorg.conf.d/10-evdev.conf"
+
+clman tmp/usr/share/man/man1/cvt.1
+clinst -Dm755
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
index 0b4f8690..bd577956 100644
--- a/xorg/xorg-server/checksums
+++ b/xorg/xorg-server/checksums
@@ -1,2 +1,4 @@
-40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300  xorg-server-1.20.13.tar.xz
-c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129  rootless_modesetting.patch
+%BLAKE3
+3ae144a7322788b4f55f3c86b92edf3e051172ae7f3944d26fe7458c7a9e1e4e  xorg-server-21.1.0.tar.xz
+d6fcfcf8d82d0641fb1581d924041a2d5992f9fe0343f3c48b784b3463c7e07b  libxcvt-0.1.0.tar.xz
+c2e28cedb8528795b222d50b3d49bf833f5c56211dc34d830f3aa83665dbba8f  rootless_modesetting.patch
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
index 041c31fd..cc67370e 100644
--- a/xorg/xorg-server/sources
+++ b/xorg/xorg-server/sources
@@ -1,2 +1,3 @@
-https://www.x.org/releases/individual/xserver/xorg-server-1.20.13.tar.xz
+https://www.x.org/releases/individual/xserver/xorg-server-21.1.0.tar.xz
+https://www.x.org/releases/individual/lib/libxcvt-0.1.0.tar.xz xcvt
 patches/rootless_modesetting.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
index 987823fa..ebcbd8e2 100644
--- a/xorg/xorg-server/version
+++ b/xorg/xorg-server/version
@@ -1 +1 @@
-1.20.13 1
+21.1.0 1
-- 
cgit v1.2.3