summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-26 06:06:37 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-26 06:06:37 +0000
commitcd2c1331bed4a51a581a304761474a840f427d51 (patch)
treeaa4120f8dd315a0e2ddf0092d563f5e45321edd7
parent2424e8db409fa45d2b714f7ff6fa68e0f73f3ca2 (diff)
downloadpackages-cd2c1331bed4a51a581a304761474a840f427d51.tar.gz
packages-cd2c1331bed4a51a581a304761474a840f427d51.tar.bz2
packages-cd2c1331bed4a51a581a304761474a840f427d51.tar.xz
packages-cd2c1331bed4a51a581a304761474a840f427d51.zip
user/mesa-demos: fix conflict with user/bitmap
-rw-r--r--user/mesa-demos/APKBUILD4
1 files changed, 3 insertions, 1 deletions
diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD
index f89083ae4..d1c172828 100644
--- a/user/mesa-demos/APKBUILD
+++ b/user/mesa-demos/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=mesa-demos
pkgver=8.4.0
-pkgrel=0
+pkgrel=1
pkgdesc="Mesa demos and utils"
url="http://mesa3d.org"
arch="all"
@@ -25,6 +25,8 @@ build() {
package() {
cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
+ # conflicts with X11 bitmap tool
+ mv "$pkgdir"/usr/bin/bitmap "$pkgdir"/usr/bin/bitmap-demo
}
sha512sums="b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2"