From 0c68454776b703f5d433377b8a9d614c3ddcf780 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Sun, 11 Jul 2021 10:48:39 +0300
Subject: xorg-server: bump to 1.20.12

---
 xorg/xorg-server/build     | 21 ---------------------
 xorg/xorg-server/checksums |  3 +--
 xorg/xorg-server/depends   |  1 +
 xorg/xorg-server/sources   |  3 +--
 xorg/xorg-server/version   |  2 +-
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index ea1fc543..a518c9e2 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -2,26 +2,6 @@
 
 patch -p1 < rootless_modesetting.patch
 
-
-(
-    # Instead of requiring libressl for the sha1 library, we
-    # are statically installing this small implementation so
-    # that we don't require an external library.
-    cd libsha1
-
-    ./configure \
-        --prefix=/usr \
-        --disable-shared
-
-    make
-    make DESTDIR="$PWD/tmp" install
-)
-
-export LDFLAGS="$LDFLAGS -L$PWD/libsha1/tmp/usr/lib"
-export CFLAGS="$CFLAGS -I$PWD/libsha1/tmp/usr/include"
-export LIBSHA1_CFLAGS="-L$PWD/libsha1/tmp/usr/lib -I$PWD/libsha1/tmp/usr/include"
-export LIBSHA1_LIBS="$PWD/libsha1/tmp/usr/lib/libsha1.a"
-
 ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -34,7 +14,6 @@ export LIBSHA1_LIBS="$PWD/libsha1/tmp/usr/lib/libsha1.a"
     --enable-dri3 \
     --enable-glamor \
     --enable-xorg \
-    --with-sha1=libsha1 \
     --with-systemd-daemon=off
 
 make
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
index 664c25d0..46952a46 100644
--- a/xorg/xorg-server/checksums
+++ b/xorg/xorg-server/checksums
@@ -1,3 +1,2 @@
-914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49  xorg-server-1.20.11.tar.bz2
-336e6fa240cb0052c9620b2031cebe207f5bf5c7e8320c489402554b5652027e  libsha1-0.3.tar.xz
+336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac  xorg-server-1.20.12.tar.xz
 c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129  rootless_modesetting.patch
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
index b2a4c330..b57d47d2 100644
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@@ -11,6 +11,7 @@ libdrm
 libepoxy
 libfontenc
 libpciaccess
+libressl
 libxcb
 libxkbfile
 libxshmfence
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
index aa67fc2f..9ba7185a 100644
--- a/xorg/xorg-server/sources
+++ b/xorg/xorg-server/sources
@@ -1,3 +1,2 @@
-https://www.x.org/releases/individual/xserver/xorg-server-1.20.11.tar.bz2
-https://dl.carbslinux.org/distfiles/libsha1-0.3.tar.xz libsha1
+https://www.x.org/releases/individual/xserver/xorg-server-1.20.12.tar.xz
 patches/rootless_modesetting.patch
diff --git a/xorg/xorg-server/version b/xorg/xorg-server/version
index 48f6f7d0..41dc5b41 100644
--- a/xorg/xorg-server/version
+++ b/xorg/xorg-server/version
@@ -1 +1 @@
-1.20.11 1
+1.20.12 1
-- 
cgit v1.2.3