summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej2019-02-16 13:15:51 +0100
committerAndrej2019-02-16 13:15:51 +0100
commitd69cfc43ff4b9fdd6eb804f5a6e941a6503c87a9 (patch)
tree3c707bd0e3c3f4a040ef5efe3843f3a805393f96
parent80fef0871111fdebfa29644d75f04e63b89b5a0e (diff)
downloadaur-glbinding-git.tar.gz
Fix KHR header collision with mesa
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea9f3a992276..bc6a8c1699ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,8 +9,9 @@ pkgbase = glbinding-git
checkdepends = gmock
makedepends = cmake
makedepends = git
- depends = libgl
depends = glfw
+ depends = libgl
+ depends = mesa
conflicts = glbinding
source = glbinding-git::git+https://github.com/cginternals/glbinding.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1b938c03c2c0..68d348b7bb09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64')
url="http://www.glbinding.org/"
license=('MIT')
-depends=('libgl' 'glfw')
+depends=('glfw' 'libgl' 'mesa')
makedepends=('cmake' 'git')
checkdepends=('gmock')
conflicts=('glbinding')
@@ -29,7 +29,6 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DOPTION_BUILD_TESTS=0 \
- -DOPTION_BUILD_GPU_TESTS=0 \
"../$pkgname"
make
@@ -40,7 +39,6 @@ check() {
cmake -Wno-dev \
-DOPTION_BUILD_TESTS=1 \
- -DOPTION_BUILD_GPU_TESTS=1 \
"../$pkgname"
make
@@ -48,11 +46,13 @@ check() {
}
package() {
- (cd build && make DESTDIR="$pkgdir" install)
+ export DESTDIR="$pkgdir"
+ make -C build install
install -D -m644 "$pkgname"/LICENSE "${pkgdir}/usr/share/licenses/${_name}/LICENSE"
# conflict with mesa-demos
mv -v "${pkgdir}/usr/bin/glinfo" "${pkgdir}/usr/bin/glinfo-glb"
+ rm -vr "${pkgdir}/usr/include/KHR"
}