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

Andreas Radke andyrtr at gemini.archlinux.org
Mon May 30 18:35:28 UTC 2022


    Date: Monday, May 30, 2022 @ 18:35:27
  Author: andyrtr
Revision: 447194

upgpkg: mesa-demos 8.5.0-1: upstream update 8.5.0

Modified:
  mesa-demos/trunk/PKGBUILD

----------+
 PKGBUILD |   47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-30 18:34:16 UTC (rev 447193)
+++ PKGBUILD	2022-05-30 18:35:27 UTC (rev 447194)
@@ -2,44 +2,51 @@
 
 pkgbase=mesa-demos
 pkgname=('mesa-demos' 'mesa-utils')
-pkgver=8.4.0
-pkgrel=8
+pkgver=8.5.0
+pkgrel=1
 arch=('x86_64')
 url="https://www.mesa3d.org/"
 license=('custom')
-makedepends=('mesa' 'freetype2' 'glew' 'freeglut')
+makedepends=('meson' 'mesa' 'freetype2' 'glu' 'freeglut' '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=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
+validpgpkeys=('FF4CF638C624C3CF21ED2CF227EF763A2AA39F96') # Erik Faye-Lund <erik.faye-lund at collabora.com>
 
 build() {
-  cd mesa-demos-${pkgver}
-  ./configure --prefix=/usr \
-    --disable-gles1 \
-    --with-system-data-files=/usr/share/mesa-demos
 
-  make
+  arch-meson mesa-demos-$pkgver build \
+    -D gles1=disabled \
+    -D with-system-data-files=true
+
+  # Print config
+  meson configure build
+
+  meson compile -C build
 }
 
+check() {
+  meson test -C build --print-errorlogs
+}
+
 package_mesa-demos() {
   pkgdesc="Mesa demos"
-  depends=('libgl' 'glew' 'freeglut')
+  depends=('libgl' 'glu' 'freeglut')
   install=mesa-demos.install
 
-  cd mesa-demos-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" meson install -C build
 
   # add missing egl files
-  install -m 0755 src/egl/opengl/{eglgears_wayland,eglgears_x11,eglkms,egltri_wayland,egltri_x11,peglgears,xeglgears,xeglthreads} "${pkgdir}/usr/bin/"
+  install -m 0755 build/src/egl/opengl/{eglgears_wayland,eglgears_x11,eglkms,egltri_wayland,egltri_x11,peglgears,xeglgears,xeglthreads} "${pkgdir}/usr/bin/"
 
   # remove utils
   rm "${pkgdir}"/usr/bin/{glxinfo,glxgears,eglinfo}
 
-  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm 0644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
 package_mesa-utils() {
@@ -47,9 +54,9 @@
   depends=('libgl')
   provides=('glxinfo' 'glxgears' 'eglinfo')
 
-  cd mesa-demos-${pkgver}
-  install -Dm 0755 src/egl/opengl/eglinfo -t "${pkgdir}/usr/bin/"
-  install -Dm 0755 src/xdemos/{glxinfo,glxgears} -t "${pkgdir}/usr/bin/"
 
-  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm 0755 build/src/egl/opengl/eglinfo -t "${pkgdir}/usr/bin/"
+  install -Dm 0755 build/src/xdemos/{glxinfo,glxgears} -t "${pkgdir}/usr/bin/"
+
+  install -Dm 0644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
 }



More information about the arch-commits mailing list