From 1973c0c83d180757ab8ad36fdfa0c14390a30d6c Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Sun, 5 Jun 2022 19:17:32 +0200
Subject: [PATCH] mesa-demos: updated to 8.5.0

---
 mesa-demos/.signature |  6 +++---
 mesa-demos/Pkgfile    | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/mesa-demos/.signature b/mesa-demos/.signature
index bdf0763..c4ed6ad 100644
--- a/mesa-demos/.signature
+++ b/mesa-demos/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg-arm.pub
-RWSYHFoJug2wQqSX1vGuQd5TjF3AF8q1iXBzx3lpyRJvHz3sDaf5vJX184vUZXWYQeH4QFHSXqJbpX84puOlpHyh4R60TDUJLwE=
-SHA256 (Pkgfile) = 06ef0fc354df4ff2b1f1cad9ee70fee96c5f775abb29fe33b058a8392713cc62
+RWSYHFoJug2wQlpzMDbbFwpKF79Z+4++JakvHbm8T90Emv4JibmPd4evjMdrDwbGSNhlWImlo6T5gNmTQQnkQSft2/C3lTn33As=
+SHA256 (Pkgfile) = 9df9d5622e2f4bd1c6706d05e8c61e29e064a80d50e5c22343facb239271eaa6
 SHA256 (.footprint) = fda645d337a2cff02aabade85f5831069418b59e0e74de0e2bc9cd5fe562e314
-SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d
+SHA256 (mesa-demos-8.5.0.tar.bz2) = cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1
diff --git a/mesa-demos/Pkgfile b/mesa-demos/Pkgfile
index 730a636..f5a94f0 100644
--- a/mesa-demos/Pkgfile
+++ b/mesa-demos/Pkgfile
@@ -5,19 +5,21 @@
 # Depends on: glew glu
 
 name=mesa-demos
-version=8.4.0
+version=8.5.0
 release=1
-source=(https://mesa.freedesktop.org/archive/demos/$name-$version.tar.bz2)
+source=(https://archive.mesa3d.org/demos/$version/$name-$version.tar.bz2)
 
 build() {
-  cd $name-$version
-
-  ./configure --prefix=/usr
-
-  make -C src/xdemos/ glxinfo glxgears
-  make -C src/egl/eglut/
-  make -C src/egl/opengles2/ es2_info es2gears_x11
-
+  meson setup build $name-$version \
+    --prefix=/usr \
+    --buildtype=plain \
+    --wrap-mode nodownload \
+    -D b_lto=true \
+    -D b_pie=true \
+    -D osmesa=disabled
+  meson compile -C build -j ${JOBS:-1}
   install -d $PKG/usr/bin
-  install -m 0755 -t $PKG/usr/bin src/{egl/opengles2/{es2_info,es2gears_x11},xdemos/glx{gears,info}}
+#  install -m 0755 -t $PKG/usr/bin src/{egl/opengles2/{es2_info,es2gears_x11},xdemos/glx{gears,info}}
+install -m 0755 -t $PKG/usr/bin build/src/xdemos/glx{gears,info}
+install -m 0755 -t $PKG/usr/bin build/src/{egl/opengles2/{es2_info,es2gears_x11},xdemos/glx{gears,info}}
 }
-- 
2.26.2