From cd2c1331bed4a51a581a304761474a840f427d51 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 26 Mar 2019 06:06:37 +0000
Subject: user/mesa-demos: fix conflict with user/bitmap

---
 user/mesa-demos/APKBUILD | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'user/mesa-demos')

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"
-- 
cgit v1.2.3-70-g09d2