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

[Jan Steffens]

    Date: Tuesday, May 3, 2022 @ 21:46:02
  Author: heftig
Revision: 1192431

8.4.0-8: debug on, clean up

Modified:
  lib32-mesa-demos/trunk/PKGBUILD

----------+
 PKGBUILD |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-03 21:43:34 UTC (rev 1192430)
+++ PKGBUILD	2022-05-03 21:46:02 UTC (rev 1192431)
@@ -5,24 +5,25 @@
 pkgbase=lib32-mesa-demos
 pkgname=('lib32-mesa-demos' 'lib32-mesa-utils')
 pkgver=8.4.0
-pkgrel=3
+pkgrel=8
 arch=(x86_64)
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-makedepends=(gcc-multilib 'lib32-mesa' 'lib32-freetype2' 'lib32-freeglut' 'lib32-glew')
-source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-$pkgver.tar.bz2{,.sig}
+makedepends=('lib32-mesa' 'lib32-freetype2' 'lib32-glew' 'lib32-freeglut')
+options=('debug')
+source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-${pkgver}.tar.bz2{,.sig}
         'LICENSE')
 sha512sums=('b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957'
             'SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
 validpgpkeys=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
- 
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  cd "${srcdir}/mesa-demos-${pkgver}"
+  cd mesa-demos-${pkgver}
   ./configure --prefix=/usr \
     --disable-gles1 \
     --with-system-data-files=/usr/share/mesa-demos
@@ -32,15 +33,16 @@
 
 package_lib32-mesa-demos() {
   pkgdesc="Mesa demos (32-bit)"
-  depends=('lib32-glew' 'lib32-freeglut' mesa-demos)
+  depends=('lib32-libgl' 'lib32-glew' 'lib32-freeglut' 'mesa-demos')
   install=mesa-demos.install
 
-  cd "${srcdir}/mesa-demos-${pkgver}"
+  cd mesa-demos-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # remove utils
-  rm ${pkgdir}/usr/bin/{glxinfo,glxgears,eglinfo}
+  rm "${pkgdir}"/usr/bin/{glxinfo,glxgears,eglinfo}
 
+  local i
   for i in "$pkgdir/usr/bin/"*; do
     mv "$i" "$i"32
   done
@@ -47,23 +49,22 @@
 
   rm -r "$pkgdir/usr/share/mesa-demos"
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
 package_lib32-mesa-utils() {
-  pkgdesc="essential Mesa utilities (32-bit)"
+  pkgdesc="Essential Mesa utilities (32-bit)"
   depends=('lib32-libgl')
   provides=('glxinfo32' 'glxgears32' 'eglinfo32')
 
-  cd "${srcdir}/mesa-demos-${pkgver}"
+  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/"
 
+  local i
   for i in "$pkgdir/usr/bin/"*; do
     mv "$i" "$i"32
   done
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
 }