Update package version to 21.1.20

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
 }