From ad35341e5f603b7034cdac881a1313efdb0c5a39 Mon Sep 17 00:00:00 2001
From: Isaac David <isacdaavid@isacdaavid.info>
Date: Mon, 5 Jun 2017 01:09:22 -0500
Subject: libre/mesa: (minor) use makepkg's native idiom for
 architecture-specific arrays

as documented in `man 5 PKGBUILD`
---
 libre/mesa/PKGBUILD | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'libre/mesa/PKGBUILD')

diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index 2d8667a4f..10be7dd1a 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -5,10 +5,11 @@ pkgname=("${pkgbase}")
 pkgver=17.1.0
 pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
-makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
+makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
              'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors')
-[ "$CARCH" != "armv7h" ] && makedepends+=('libclc' 'libunwind')
+makedepends_x86_64=('libclc' 'libunwind')
+makedepends_i686=("${makedepends_x86_64[@]}")
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
@@ -100,9 +101,10 @@ build() {
 
 package_mesa() {
   pkgdesc="A free implementation of the OpenGL specification, without nonfree software recommendations in drirc"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' 
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
            'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'lm_sensors' 'libglvnd')
-  [ "$CARCH" != "armv7h" ] && depends+=('libunwind')
+  depends_x86_64=('libunwind')
+  depends_i686=("${depends_x86_64[@]}")
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'mesa-vdpau: for accelerated video playback'
               'libva-mesa-driver: for accelerated video playback')
@@ -112,14 +114,14 @@ package_mesa() {
 
   install -m755 -d ${pkgdir}/etc
   cp -v ${srcdir}/drirc ${pkgdir}/etc
-  
+
   install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d
   cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
   cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
-   
+
   cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/
@@ -133,7 +135,7 @@ package_mesa() {
 
   cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
   cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-  
+
   # remove vulkan headers
   rm -rf ${pkgdir}/usr/include/vulkan
 
-- 
cgit v1.2.3