commit 7993447bd6c63c83474bedbc188052a12d4f6e40 Author: Juergen Daubert <jue@jue.li> Date: Sat Nov 23 11:59:13 2019 +0100 xorg-server: update to 1.20.6 diff --git a/xorg-server/.signature b/xorg-server/.signature index ccd06556..fa9d65ad 100644 --- a/xorg-server/.signature +++ b/xorg-server/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndAEKI6O8kmQ7CL3KV6MCl/Xipi9/AVTFqHNYzdIH3Bxtn3kxfIxV9q+BXPmQKC8MHFcqwV4oqlHzVC0XPU1Lrgw= -SHA256 (Pkgfile) = 23c1942207d0b5ad84d4a4b45b82befeabd6d0b9a0af27a2e13644576d92729a +RWTSGWF5Q7TndKHSehE4whWCDy5hTHO6A+CByFpzRdd4vAW4fXJ+NA+hYsg+AjcLzG4BcaO7ruoUcI8GrLO8YGAxMmIKb4BPwQU= +SHA256 (Pkgfile) = fe4d7ada29d6108f446876a07a6398c168afa88733d02a6826696c828dfc2507 SHA256 (.footprint) = d159a275a4868001332954580ab4f70976c97a80334b157023935b36722e50cd -SHA256 (xorg-server-1.20.5.tar.bz2) = a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d -SHA256 (xorg-server-gl-version.patch) = 00fc4c679358c61012083e5371213eedfb9e985fb639257714597ab8186fe6b9 +SHA256 (xorg-server-1.20.6.tar.bz2) = 6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index b3c33dc0..d5d89f99 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -4,17 +4,13 @@ # Depends on: libepoxy xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxkbfile xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms name=xorg-server -version=1.20.5 +version=1.20.6 release=1 -source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.bz2 \ - $name-gl-version.patch) +source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/$name-gl-version.patch - autoreconf -if - ./configure --prefix=/usr \ --localstatedir=/var \ --with-fontrootdir=/usr/share/fonts/X11 \ diff --git a/xorg-server/xorg-server-gl-version.patch b/xorg-server/xorg-server-gl-version.patch deleted file mode 100644 index 1719ed11..00000000 --- a/xorg-server/xorg-server-gl-version.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urN xorg-server-1.20.5.orig/configure.ac xorg-server-1.20.5/configure.ac ---- xorg-server-1.20.5.orig/configure.ac 2019-05-30 13:27:34.000000000 -0500 -+++ xorg-server-1.20.5/configure.ac 2019-10-19 10:11:52.537383809 -0500 -@@ -765,7 +765,7 @@ - LIBDRM="libdrm >= 2.4.89" - LIBEGL="egl" - LIBGBM="gbm >= 10.2.0" --LIBGL="gl >= 7.1.0" -+LIBGL="gl >= 1.2" - LIBXEXT="xext >= 1.0.99.4" - LIBXFONT="xfont2 >= 2.0.0" - LIBXI="xi >= 1.2.99.1" -@@ -1116,7 +1116,7 @@ - yes,yes | auto,yes) - AC_DEFINE(DRI2, 1, [Build DRI2 extension]) - DRI2=yes -- LIBGL="gl >= 9.2.0" -+ LIBGL="gl >= 1.2" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO" - ;; - esac -diff -urN xorg-server-1.20.5.orig/glx/meson.build xorg-server-1.20.5/glx/meson.build ---- xorg-server-1.20.5.orig/glx/meson.build 2019-05-30 13:27:34.000000000 -0500 -+++ xorg-server-1.20.5/glx/meson.build 2019-10-19 10:12:12.145594808 -0500 -@@ -39,7 +39,7 @@ - common_dep, - dl_dep, - dependency('glproto', version: '>= 1.4.17'), -- dependency('gl', version: '>= 9.2.0'), -+ dependency('gl', version: '>= 1.2'), - ], - c_args: [ - glx_align64, -@@ -74,7 +74,7 @@ - common_dep, - dl_dep, - dependency('glproto', version: '>= 1.4.17'), -- dependency('gl', version: '>= 9.2.0'), -+ dependency('gl', version: '>= 1.2'), - ], - ) -