From 259fcc6e6fea36f1b2f52972edb555c8edc1894e Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Thu, 10 Oct 2019 22:45:08 +0530 Subject: [PATCH] main/apitrace: fix building package on aarch64/armhf (!676) current version merged was missing the zlib-dev and libpng-dev dependency which would make apitrace build internal copies of them, and that would fail due to missing patches for musl. add dependencies zlib-dev and libpng-dev --- main/apitrace/APKBUILD | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/main/apitrace/APKBUILD b/main/apitrace/APKBUILD index 7bf9a3522..be63dd9de 100644 --- a/main/apitrace/APKBUILD +++ b/main/apitrace/APKBUILD @@ -2,33 +2,38 @@ # Maintainer: Bhushan Shah pkgname=apitrace pkgver=8.0 -pkgrel=0 +pkgrel=1 _commit="81c73a74860a45cbc21da9925eb04e1edad646d5" pkgdesc="Tools for tracing OpenGL, Direct3D, and other graphics APIs" arch="all" url="http://apitrace.github.io/" license="MIT" -depends_dev="mesa-dev libx11-dev linux-headers" +depends_dev="mesa-dev zlib-dev libpng-dev libx11-dev linux-headers" makedepends="$depends_dev cmake python3" source="$pkgname-$_commit.tar.gz::https://github.com/apitrace/apitrace/archive/$_commit.tar.gz musl-fixes.patch" subpackages="$pkgname-doc" +options="!check" # Tests fail under QEMU builddir="$srcdir/$pkgname-$_commit" +prepare() { + default_prepare + mkdir "$builddir"/build +} + build() { - cmake \ + cd "$builddir"/build + cmake "$builddir" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib make } -check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - package() { + cd "$builddir"/build DESTDIR="$pkgdir" make install } + sha512sums="2c02106730e4c46c929dfa1b475691bbc72eaf232625276540ab46bbc80728f8b3d230c4297bdcbb11d8396490ed1f91ad592bb404c52fe2c63ef5840678eb32 apitrace-81c73a74860a45cbc21da9925eb04e1edad646d5.tar.gz a204b51654d9adc484657ec68da6f89cbcdc4dd3a810d024979dcbeacffa5867d3e5ce0b40fcdc9133b36e8927d2c7672ef5c3a40db3dee0813fe2766130e21b musl-fixes.patch"