aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xxorg/xorg-server/build24
-rw-r--r--xorg/xorg-server/checksums1
-rw-r--r--xorg/xorg-server/depends1
-rw-r--r--xorg/xorg-server/sources1
4 files changed, 25 insertions, 2 deletions
diff --git a/xorg/xorg-server/build b/xorg/xorg-server/build
index 159e34fc..f1240691 100755
--- a/xorg/xorg-server/build
+++ b/xorg/xorg-server/build
@@ -2,9 +2,31 @@
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 \
+ --disable-shared \
--disable-systemd-logind \
--disable-xwayland \
--disable-unit-tests \
@@ -14,7 +36,7 @@ patch -p1 < rootless_modesetting.patch
--enable-dri3 \
--enable-glamor \
--enable-xorg \
- --with-sha1=libcrypto \
+ --with-sha1=libsha1 \
--with-systemd-daemon=off
make
diff --git a/xorg/xorg-server/checksums b/xorg/xorg-server/checksums
index 770323de..4a1ddf42 100644
--- a/xorg/xorg-server/checksums
+++ b/xorg/xorg-server/checksums
@@ -1,2 +1,3 @@
d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 xorg-server-1.20.8.tar.bz2
+336e6fa240cb0052c9620b2031cebe207f5bf5c7e8320c489402554b5652027e libsha1-0.3.tar.xz
c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129 rootless_modesetting.patch
diff --git a/xorg/xorg-server/depends b/xorg/xorg-server/depends
index b57d47d2..b2a4c330 100644
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@@ -11,7 +11,6 @@ libdrm
libepoxy
libfontenc
libpciaccess
-libressl
libxcb
libxkbfile
libxshmfence
diff --git a/xorg/xorg-server/sources b/xorg/xorg-server/sources
index dc1878a9..241e0151 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.8.tar.bz2
+https://dl.carbslinux.org/distfiles/libsha1-0.3.tar.xz libsha1
patches/rootless_modesetting.patch