summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Weigelt, metux IT consult <info@metux.net>2024-05-14 12:10:05 +0200
committerEnrico Weigelt, metux IT consult <info@metux.net>2024-05-14 12:22:46 +0200
commit44e8272002e04c8a3b93eaef49e2fb3b505a3c4e (patch)
tree8ac9abefdc631efb71e14008c47b49c32ce22097
parent8df03a7aa524b4b5fea47786726a278498974572 (diff)
bump minimal xorg version to 1.18
1.18 was released a decade ago, so it seems reasonable stop supporting older ones. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
-rw-r--r--.gitlab-ci.yml27
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 746c8d5..87d166d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,37 +77,12 @@ xserver-1.20-clang:
CC: clang
XSERVER_VERSION: "1.20"
-xserver-1.13:
+xserver-1.18:
extends: .default_build
script:
- ./autogen.sh --disable-glamor
- make -j$(nproc) check V=1
variables:
- XSERVER_VERSION: "1.13"
-
-xserver-1.14:
- extends: xserver-1.13
- variables:
- XSERVER_VERSION: "1.14"
-
-xserver-1.15:
- extends: xserver-1.14
- variables:
- XSERVER_VERSION: "1.15"
-
-xserver-1.16:
- extends: .default_build
- variables:
- XSERVER_VERSION: "1.16"
-
-xserver-1.17:
- extends: .default_build
- variables:
- XSERVER_VERSION: "1.17"
-
-xserver-1.18:
- extends: .default_build
- variables:
XSERVER_VERSION: "1.18"
xserver-1.18-clang:
diff --git a/configure.ac b/configure.ac
index fc6d98b..192c7b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu >= 2.4.76])
PKG_CHECK_MODULES(GBM, [gbm])
# Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.13 xproto fontsproto xf86driproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18 xproto fontsproto xf86driproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")