commit f018389939dc1f774e0cae5d3c909fbfd941183d Author: Matt Housh <jaeger@morpheus.net> Date: Sat Oct 19 12:30:12 2019 -0500 xorg-server: patched for GL API version change from libglvnd diff --git a/xorg-server/.signature b/xorg-server/.signature index 2d1c53f2..ccd06556 100644 --- a/xorg-server/.signature +++ b/xorg-server/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndATkS4q8h1LBYpDFsGpDg7YNDGEOE6n2ZJwUsLwu1wdFfx0YwfvekoeiyVqUXyoT59JepffOKOIr5qTO+tBMAwg= -SHA256 (Pkgfile) = a3f7910aeb7dd09a5266d712881d04aee2014e205db3d1bace81a9a9c5531d4c +RWTSGWF5Q7TndAEKI6O8kmQ7CL3KV6MCl/Xipi9/AVTFqHNYzdIH3Bxtn3kxfIxV9q+BXPmQKC8MHFcqwV4oqlHzVC0XPU1Lrgw= +SHA256 (Pkgfile) = 23c1942207d0b5ad84d4a4b45b82befeabd6d0b9a0af27a2e13644576d92729a SHA256 (.footprint) = d159a275a4868001332954580ab4f70976c97a80334b157023935b36722e50cd SHA256 (xorg-server-1.20.5.tar.bz2) = a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d +SHA256 (xorg-server-gl-version.patch) = 00fc4c679358c61012083e5371213eedfb9e985fb639257714597ab8186fe6b9 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 1aa00616..b3c33dc0 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -6,11 +6,15 @@ name=xorg-server version=1.20.5 release=1 -source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.bz2) +source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.bz2 \ + $name-gl-version.patch) 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 new file mode 100644 index 00000000..1719ed11 --- /dev/null +++ b/xorg-server/xorg-server-gl-version.patch @@ -0,0 +1,42 @@ +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'), + ], + ) +