From adf312c1183b73ca139da5a1c101cf7643437457 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Sat, 1 Nov 2025 19:25:15 +0200
Subject: [PATCH] Update package version to 21.1.20

---
 pkg.info  | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 source.sh | 24 +++++-------------------
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/pkg.info b/pkg.info
index 770e0a7..593cf0e 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,9 +1,54 @@
 name: xorg-server
 description: The X.org X server
-version: 21.1.18
+version: 21.1.20
+revision: 1
 url: https://xorg.freedesktop.org/
 license: BSD-3-Clause,HPND,HPND-sell-variant,ICU,ISC,LicenseRef-Adobe-Display-PostScript,LicenseRef-DEC-3-Clause,LicenseRef-HPND-sell-MIT-disclaimer-xserver,MIT,MIT-open-group,NTP,SGI-B-2.0,SMLNJ,X11,X11-distribute-modifications-variant
 architecture: any
-depends: ["dbus","glibc","libdrm","elogind","libglvnd","libepoxy","libpciaccess","libtirpc","libxau","libxcvt","libxdmcp","libxfont2","libxshmfence","nettle","pixman","bash","xkeyboard-config","xf86-input-libinput","xorg-setxkbmap","xorg-xkbcomp"]
-make_depends: ["libx11","libxaw","libxi","libxmu","libxrender","libxres","libxtst","libxv","mesa","meson","xcb-util","xcb-util-image","xcb-util-keysyms","xcb-util-renderutil","xcb-util-wm","xorg-fonts-util","xorg-util-macros","xorgproto","xtrans"]
 type: source
+depends:
+  - dbus
+  - glibc
+  - libdrm
+  - elogind
+  - libglvnd
+  - libepoxy
+  - libpciaccess
+  - libtirpc
+  - libxau
+  - libxcvt
+  - libxdmcp
+  - libxfont2
+  - libxshmfence
+  - nettle
+  - pixman
+  - bash
+  - xkeyboard-config
+  - xf86-input-libinput
+  - xorg-setxkbmap
+  - xorg-xkbcomp
+make_depends:
+  - libx11
+  - libxaw
+  - libxi
+  - libxmu
+  - libxrender
+  - libxres
+  - libxtst
+  - libxv
+  - mesa
+  - meson
+  - xcb-util
+  - xcb-util-image
+  - xcb-util-keysyms
+  - xcb-util-renderutil
+  - xcb-util-wm
+  - xorg-fonts-util
+  - xorg-util-macros
+  - xorgproto
+  - xtrans
+downloads:
+  - url: https://www.x.org/archive/individual/xserver/xorg-server-${BPM_PKG_VERSION}.tar.xz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 7695bc61824b3a81b6bad2f78b05400ca015003de402d1b322117105b702e937
diff --git a/source.sh b/source.sh
index bf667e2..2d86ece 100644
--- a/source.sh
+++ b/source.sh
@@ -2,38 +2,24 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://www.x.org/pub/individual/xserver/xorg-server-${BPM_PKG_VERSION}.tar.xz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  mkdir build
-  cd build
-
-  meson setup  --prefix=/usr --libdir=/usr/lib --localstatedir=/var -Dglamor=true -Dxkb_output_dir=/var/lib/xkb .. 
-  ninja
+  meson setup --prefix=/usr --libdir=/usr/lib --localstatedir=/var -Dglamor=true -Dxkb_output_dir=/var/lib/xkb build
+  meson compile -C build
 }
 
 # The check function is executed in the source directory
 # This function is used to run tests to verify the package has been compiled correctly
 check() {
-  cd build
-  ninja test
+  meson test -C build --print-errorlogs
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  cd build
-  DESTDIR="$BPM_OUTPUT" ninja install
+  meson install -C build --destdir="$BPM_OUTPUT"
 
+  # Install package license
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/xorg-server/COPYING
 }