[arch-commits] Commit in lib32-mesa-demos/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, June 11, 2022 @ 09:26:49
  Author: arojas
Revision: 1232200

Update to 8.5.0

Modified:
  lib32-mesa-demos/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-11 09:13:32 UTC (rev 1232199)
+++ PKGBUILD	2022-06-11 09:26:49 UTC (rev 1232200)
@@ -4,19 +4,20 @@
 
 pkgbase=lib32-mesa-demos
 pkgname=('lib32-mesa-demos' 'lib32-mesa-utils')
-pkgver=8.4.0
-pkgrel=8
+pkgver=8.5.0
+pkgrel=1
 arch=(x86_64)
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-makedepends=('lib32-mesa' 'lib32-freetype2' 'lib32-glew' 'lib32-freeglut')
+makedepends=('lib32-mesa' 'lib32-freetype2' 'lib32-glew' 'lib32-freeglut' 'meson' 'wayland-protocols')
 options=('debug')
-source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-${pkgver}.tar.bz2{,.sig}
+source=(https://archive.mesa3d.org/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2{,.sig}
         'LICENSE')
-sha512sums=('b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957'
+sha512sums=('df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8'
             'SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
 validpgpkeys=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
+validpgpkeys+=('FF4CF638C624C3CF21ED2CF227EF763A2AA39F96') # Erik Faye-Lund <erik.faye-lund at collabora.com>
 
 build() {
   export CC="gcc -m32"
@@ -23,12 +24,14 @@
   export CXX="g++ -m32"
   export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  cd mesa-demos-${pkgver}
-  ./configure --prefix=/usr \
-    --disable-gles1 \
-    --with-system-data-files=/usr/share/mesa-demos
+  arch-meson mesa-demos-$pkgver build \
+    -D gles1=disabled \
+    -D with-system-data-files=true
 
-  make
+  # Print config
+  meson configure build
+
+  meson compile -C build
 }
 
 package_lib32-mesa-demos() {
@@ -36,8 +39,7 @@
   depends=('lib32-libgl' 'lib32-glew' 'lib32-freeglut' 'mesa-demos')
   install=mesa-demos.install
 
-  cd mesa-demos-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" meson install -C build
 
   # remove utils
   rm "${pkgdir}"/usr/bin/{glxinfo,glxgears,eglinfo}
@@ -49,7 +51,7 @@
 
   rm -r "$pkgdir/usr/share/mesa-demos"
 
-  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm 0644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
 package_lib32-mesa-utils() {
@@ -57,7 +59,7 @@
   depends=('lib32-libgl')
   provides=('glxinfo32' 'glxgears32' 'eglinfo32')
 
-  cd mesa-demos-${pkgver}
+  cd build
   install -Dm 0755 src/egl/opengl/eglinfo -t "${pkgdir}/usr/bin/"
   install -Dm 0755 src/xdemos/{glxinfo,glxgears} -t "${pkgdir}/usr/bin/"