new pkgbuild

2 files changed, 117 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cecf483c909c..21b7131a6b1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -44,13 +44,21 @@ pkgbase = mesa-aco
 	makedepends = lib32-libxrandr
 	makedepends = lib32-llvm
 	makedepends = lib32-gtk3
+	makedepends = lua
+	makedepends = polly
+	makedepends = gcc
+	makedepends = gcc-libs
+	makedepends = lib32-gcc-libs
+	makedepends = ncurses
+	makedepends = lib32-ncurses
+	makedepends = libarchive
 	source = https://archive.mesa3d.org/mesa-20.2.3.tar.xz
 	source = LICENSE
 	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = mesa-aco
-	pkgdesc = Mesa stable release. ACO enable by default. More options are enable than the standard mesa package.
+	pkgdesc = Mesa stable release. ACO enable by default. More options are enable than the standard mesa package. (64-bit)
 	depends = libdrm
 	depends = libelf
 	depends = libglvnd
diff --git a/PKGBUILD b/PKGBUILD
index a81428c7c039..61fd7efb8aa8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ license=('MIT')
 makedepends=("bison" "flex" "valgrind" "meson" "ninja" "git" "ninjas2" "clang" "libxvmc" "python" "python-appdirs" "python-mako" "python-evdev" "elfutils"
              "glslang" "libva" "libepoxy" "libxv" "libvdpau" "libx11" "libxml2" "libxrandr" "llvm" "libconfig" "gtk3" "wayland-protocols" "xorgproto" "lib32-flex"
              "lib32-clang" "lib32-libxvmc" "lib32-elfutils" "lib32-libva" "lib32-libepoxy" "lib32-libxv" "lib32-libvdpau" "lib32-libx11" "lib32-libxml2"
-             "lib32-libxrandr" "lib32-llvm" "lib32-gtk3")
+             "lib32-libxrandr" "lib32-llvm" "lib32-gtk3" "lua" "polly" "gcc" "gcc-libs" "lib32-gcc-libs" "ncurses" "lib32-ncurses" "libarchive")
 source=("https://archive.mesa3d.org/mesa-${pkgver}.tar.xz"
         "LICENSE")
 md5sums=("SKIP"
@@ -32,32 +32,22 @@ prepare(){
   done
 }
 
-package_mesa-aco(){
-  pkgdesc="Mesa stable release. ACO enable by default. More options are enable than the standard mesa package."
-  depends=("libdrm" "libelf" "libglvnd" "libomxil-bellagio" "libunwind" "libxdamage" "libxxf86vm" "llvm-libs" "lm_sensors" "wayland" "zstd" "libxshmfence"
-           "libclc" "expat" "vulkan-icd-loader")
-  conflicts=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco-rc" "mesa-llvm" "mesa-llvm-rc"
-             "mesa-git")
-  replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco-rc" "mesa-llvm" "mesa-llvm-rc"
-            "mesa-git")
-  provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" "opencl-driver"
-            "mesa-libgl")
-
+build(){
   cd mesa-${pkgver}
 
+export CC="gcc"
+export CXX="g++"
+
   # remove build dir if there is one
-  msg2 "remove build dir if there is one"
-  if dir build; then
-  rm -rf build
+  if dir build_64; then
+    rm -rf -v build_64
   fi
 
   # create build dir
-  msg2 "Create build dir"
-  mkdir build
+  mkdir -p -v build_64
 
   # build with meson
-  msg2 "Build with meson"
-  meson build \
+  meson build_64/ \
   -D b_ndebug=true \
   -D b_lto=true \
   -D buildtype=plain \
@@ -71,7 +61,7 @@ package_mesa-aco(){
   -Dgallium-extra-hud=true \
   -Dgallium-vdpau=enabled \
   -Dgallium-xvmc=enabled \
-  -Dgallium-omx=auto \
+  -Dgallium-omx=bellagio \
   -Dgallium-va=enabled \
   -Dgallium-xa=enabled \
   -Dgallium-nine=true \
@@ -103,22 +93,101 @@ package_mesa-aco(){
   -Dglx-direct=true \
   -Dzstd=enabled
 
+export CC="gcc -m32"
+export CXX="g++ -m32"
+export PKG_CONFIG=/usr/bin/i686-pc-linux-gnu-pkg-config
+cat >crossfile.ini <<END
+[binaries]
+llvm-config = '/usr/bin/llvm-config32'
+END
+
+    # remove build dir if there is one
+    if dir build_32; then
+      rm -rf -v build_32
+    fi
+
+    # create build dir
+    mkdir -p -v build_32
+
+    # build with meson
+    meson build_32/ \
+    --native-file crossfile.ini \
+    --libdir=/usr/lib32 \
+    -D b_ndebug=true \
+    -D b_lto=true \
+    -D buildtype=plain \
+    --wrap-mode=nofallback \
+    -D sysconfdir=/etc \
+    -Dprefix=/usr \
+    -Dplatforms=x11,wayland \
+    -Ddri3=enabled \
+    -Ddri-drviers=i915,i965,r100,r200,nouveau \
+    -Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink,freedreno,v3d,vc4,etnaviv,tegra,kmsro \
+    -Dgallium-extra-hud=true \
+    -Dgallium-vdpau=enabled \
+    -Dgallium-xvmc=enabled \
+    -Dgallium-omx=disabled \
+    -Dgallium-va=enabled \
+    -Dgallium-xa=enabled \
+    -Dgallium-nine=true \
+    -Dgallium-opencl=icd \
+    -Dopencl-spirv=false \
+    -Dvulkan-drivers=amd,intel \
+    -Dshader-cache=enabled \
+    -Dvulkan-overlay-layer=true \
+    -Dvulkan-device-select-layer=true \
+    -Dshared-glapi=enabled \
+    -Dgles1=enabled \
+    -Dgles2=enabled \
+    -Dopengl=true \
+    -Dgbm=enabled \
+    -Dglx=dri \
+    -Degl=enabled \
+    -Dglvnd=true \
+    -Dllvm=enabled \
+    -Dshared-llvm=disabled \
+    -Dvalgrind=disabled \
+    -Dlibunwind=enabled \
+    -Dlmsensors=enabled \
+    -Dselinux=false \
+    -Dosmesa=gallium \
+    -Dswr-arches=avx,avx2,knl,skx \
+    -Dshared-swr=true \
+    -Dpower8=enabled \
+    -Dxlib-lease=enabled \
+    -Dglx-direct=true \
+    -Dzstd=enabled
+}
+
+check(){
+  meson test -C mesa-${pkgver}/build_64/
+  meson test -C mesa-${pkgver}/build_32/
+}
+
+package_mesa-aco(){
+  pkgdesc="Mesa stable release. ACO enable by default. More options are enable than the standard mesa package. (64-bit)"
+  depends=("libdrm" "libelf" "libglvnd" "libomxil-bellagio" "libunwind" "libxdamage" "libxxf86vm" "llvm-libs" "lm_sensors" "wayland" "zstd" "libxshmfence"
+           "libclc" "expat" "vulkan-icd-loader")
+  conflicts=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco-rc" "mesa-llvm" "mesa-llvm-rc"
+             "mesa-git")
+  replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "mesa-aco-rc" "mesa-llvm" "mesa-llvm-rc"
+            "mesa-git")
+  provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" "opencl-driver"
+            "mesa-libgl")
+
   # compiling mesa and installing to "$pkgdir"
-  msg2 "Compiling mesa and installing to ${pkgdir}"
-  DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C build/ install
+  DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C mesa-${pkgver}/build_64/ install
 
   # remove script file from /usr/bin
-  msg2 "Remove ${pkgdir}/usr/bin/mesa-overlay-control.py"
   rm "${pkgdir}/usr/bin/mesa-overlay-control.py"
-  msg2 "Remove ${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/bin"
+  rm -rf -v "${pkgdir}/usr/bin"
 
   # indirect rendering
   ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
   # installing license
   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
-  cp "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
+  cp -v "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
 }
 
 package_lib32-mesa-aco(){
@@ -132,102 +201,28 @@ package_lib32-mesa-aco(){
    provides=("lib32-mesa" "lib32-opencl-mesa" "lib32-vulkan-intel" "lib32-vulkan-radeon" "lib32-vulkan-driver" "lib32-vulkan-mesa-layer" "lib32-libva-mesa-driver"
              "lib32-mesa-vdpau" "lib32-opengl-driver" "lib32-opencl-driver" "lib32-mesa-libgl")
 
-export CC="gcc -m32"
-export CXX="g++ -m32"
-export PKG_CONFIG=/usr/bin/i686-pc-linux-gnu-pkg-config
-cat >crossfile.ini <<END
-[binaries]
-llvm-config = '/usr/bin/llvm-config32'
-END
-
-  cd mesa-${pkgver}
-
-  # remove build dir if there is one
-  msg2 "remove build dir if there is one"
-  if dir build; then
-  rm -rf build
-  fi
-
-  # create build dir
-  msg2 "Create build dir"
-  mkdir build
-
-  # build with meson
-  msg2 "Build with meson"
-  meson build \
-  --native-file ../crossfile.ini \
-  --libdir=/usr/lib32 \
-  -D b_ndebug=true \
-  -D b_lto=true \
-  -D buildtype=plain \
-  --wrap-mode=nofallback \
-  -D sysconfdir=/etc \
-  -Dprefix=/usr \
-  -Dplatforms=x11,wayland \
-  -Ddri3=enabled \
-  -Ddri-drviers=i915,i965,r100,r200,nouveau \
-  -Dgallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,zink,freedreno,v3d,vc4,etnaviv,tegra,kmsro \
-  -Dgallium-extra-hud=true \
-  -Dgallium-vdpau=enabled \
-  -Dgallium-xvmc=enabled \
-  -Dgallium-omx=auto \
-  -Dgallium-va=enabled \
-  -Dgallium-xa=enabled \
-  -Dgallium-nine=true \
-  -Dgallium-opencl=icd \
-  -Dopencl-spirv=false \
-  -Dvulkan-drivers=amd,intel \
-  -Dshader-cache=enabled \
-  -Dvulkan-overlay-layer=true \
-  -Dvulkan-device-select-layer=true \
-  -Dshared-glapi=enabled \
-  -Dgles1=enabled \
-  -Dgles2=enabled \
-  -Dopengl=true \
-  -Dgbm=enabled \
-  -Dglx=dri \
-  -Degl=enabled \
-  -Dglvnd=true \
-  -Dllvm=enabled \
-  -Dshared-llvm=disabled \
-  -Dvalgrind=disabled \
-  -Dlibunwind=enabled \
-  -Dlmsensors=enabled \
-  -Dselinux=false \
-  -Dosmesa=gallium \
-  -Dswr-arches=avx,avx2,knl,skx \
-  -Dshared-swr=true \
-  -Dpower8=enabled \
-  -Dxlib-lease=enabled \
-  -Dglx-direct=true \
-  -Dzstd=enabled
-
   # compiling mesa and installing to "$pkgdir"
-  msg2 "Compiling mesa and installing to ${pkgdir}"
-  DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C build/ install
+  DESTDIR="${pkgdir}" ninja $NINJAFLAGS -C mesa-${pkgver}/build_32/ install
 
   #Remove files provided by standard mesa build
-  msg2 "Remove files provided by standard mesa build"
-  rm -rf "$pkgdir"/etc
-  rm -rf "$pkgdir"/usr/include
-  rm -rf "$pkgdir"/usr/share/glvnd
-  rm -rf "$pkgdir"/usr/share/drirc.d
-  rm -rf "$pkgdir"/usr/share/freedreno
-  rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d
-  rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
-  rm -rf "$pkgdir"/usr/share/vulkan/implicit_layer.d
-  rm -rf "$pkgdir"/usr/share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
+  rm -rf -v "$pkgdir"/etc
+  rm -rf -v "$pkgdir"/usr/include
+  rm -rf -v "$pkgdir"/usr/share/glvnd
+  rm -rf -v "$pkgdir"/usr/share/drirc.d
+  rm -rf -v "$pkgdir"/usr/share/freedreno
+  rm -rf -v "$pkgdir"/usr/share/vulkan/explicit_layer.d
+  rm -rf -v "$pkgdir"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json
+  rm -rf -v "$pkgdir"/usr/share/vulkan/implicit_layer.d
+  rm -rf -v "$pkgdir"/usr/share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
 
   # remove script file from /usr/bin
-  msg2 "Remove ${pkgdir}/usr/bin/mesa-overlay-control.py"
-  rm "${pkgdir}/usr/bin/mesa-overlay-control.py"
-  msg2 "Remove ${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/bin"
+  rm -v "${pkgdir}/usr/bin/mesa-overlay-control.py"
+  rm -rf -v "${pkgdir}/usr/bin"
 
   # indirect rendering
   ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
 
   # installing license
   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
-  cp "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
+  cp -v "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}-${pkgver}/
 }