From cf4ded32819ad2797fc0f97577c2b5ea31c48d87 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Mon, 1 Nov 2021 10:22:46 +0100
Subject: xorg-server: install libxcvt

---
 xorg/xorg-server/build   | 12 ++++++------
 xorg/xorg-server/version |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xorg')

diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index a45dc211..086d0c6b 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -1,12 +1,12 @@
 #!/bin/sh -e
 
-export xcvt=$PWD/tmp
+export DESTDIR=$1
 
 (
-    export DESTDIR=$xcvt
     cd xcvt
 
-    # Make it a static library, so we don't need it.
+    # 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,' lib/meson.build
 
     cl-meson \
@@ -18,9 +18,9 @@ export xcvt=$PWD/tmp
 
 patch -p1 < rootless_modesetting.patch
 
-export LIBXCVT_CFLAGS="-I$xcvt/usr/include"
-export LIBXCVT_LIBS="-L$xcvt/usr/lib -lxcvt"
-export PKG_CONFIG_PATH="$xcvt/usr/lib/pkgconfig"
+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 \
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
index ebcbd8e2..5c7b3001 100644
--- a/xorg/xorg-server/version
+++ b/xorg/xorg-server/version
@@ -1 +1 @@
-21.1.0 1
+21.1.0 2
-- 
cgit v1.2.3