voglperf: add split with voglperf32 and voglperf64

This way the files of the package don't depend on the architecture.

2 files changed, 59 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64cd48e6570f..bce76f86f534 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = voglperf
 	pkgdesc = benchmarking tool for OpenGL games (frame info, logs, steam support)
 	pkgver = 0.2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/ValveSoftware/voglperf
 	arch = x86_64
 	arch = i686
@@ -9,8 +9,19 @@ pkgbase = voglperf
 	license = BSD
 	makedepends = cmake
 	depends = ncurses
-	source = https://github.com/ValveSoftware/voglperf/archive/0.2.tar.gz
+	conflicts = voglperf
+	replaces = voglperf
+	source = https://github.com/ValveSoftware/voglperf32/archive/0.2.tar.gz
 	sha256sums = c91ab58aaa69d84312ce67090252f28a104952d4335595bbc728e357bf2ad545
 
-pkgname = voglperf
+pkgname = voglperf32
+	arch = x86_64
+	arch = i686
+	depends = lib32-ncurses
+	depends = lib32-gcc-libs
+
+pkgname = voglperf64
+	arch = x86_64
+	depends = ncurses
+	depends = gcc-libs-multilib
 
diff --git a/PKGBUILD b/PKGBUILD
index 65c88651b084..6d985c8b1248 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
-pkgname=voglperf
+pkgbase=voglperf
+pkgname=('voglperf32' 'voglperf64')
 pkgver=0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="benchmarking tool for OpenGL games (frame info, logs, steam support)"
 arch=('x86_64' 'i686')
 url="https://github.com/ValveSoftware/voglperf"
@@ -9,17 +10,25 @@ license=('custom:MIT', 'BSD')
 depends=('ncurses')
 makedepends=('cmake')
 if [ "$CARCH" = "x86_64" ]; then
-	depends+=('lib32-ncurses' 'gcc-libs-multilib')
-	makedepends+=('gcc-multilib')
+	makedepends+=('gcc-multilib' 'lib32-ncurses')
 fi
+conflicts=('voglperf')
+replaces=('voglperf')
 source=(https://github.com/ValveSoftware/$pkgname/archive/$pkgver.tar.gz)
 sha256sums=('c91ab58aaa69d84312ce67090252f28a104952d4335595bbc728e357bf2ad545')
 
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i -e 's|./libvoglperf32.so|/usr/lib32/libvoglperf.so|' \
-		-e 's|./libvoglperf64|/usr/lib/libvoglperf.so|' \
-		src/voglperfrun.cpp
+	cd "$srcdir/$pkgbase-$pkgver"
+	if [ "$CARCH" = "x86_64" ]; then
+		sed -i -e 's|./libvoglperf32.so|/usr/lib32/libvoglperf.so|' \
+			-e 's|./libvoglperf64|/usr/lib/libvoglperf.so|' \
+			src/voglperfrun.cpp
+	else
+		# does the 32 bit version need the 64 bit library?
+		# if so, this wouldn't work
+		sed -i -e 's|./libvoglperf32.so|/usr/lib/libvoglperf.so|' \
+			src/voglperfrun.cpp
+	fi
 	# ncurses provides libtinfo functionality
 	# we don't split ncurses into an extra libtinfo on Arch
 	# fixed in voglperf > 0.2 (8ea79efa85b8970295ae834eb2e41c00ba18df82)
@@ -27,7 +36,7 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgbase-$pkgver"
 	if [ "$CARCH" = "x86_64" ]; then
 		make voglperf64 voglperf32
 	else
@@ -35,20 +44,38 @@ build() {
 	fi
 }
 
-package() {
-	cd "$srcdir/$pkgname-$pkgver/bin"
+package_voglperf32() {
+	arch=('x86_64' 'i686')
+	if [ "$CARCH" = "i686" ]; then
+		depends=('ncurses')
+	else
+		depends=('lib32-ncurses' 'lib32-gcc-libs')
+	fi
+	cd "$srcdir/$pkgbase-$pkgver/bin"
 	install -D voglperfrun32 "$pkgdir/usr/bin/voglperfrun32"
-	install -Dm644 libvoglperf32.so "$pkgdir/usr/lib32/libvoglperf.so"
 	if [ "$CARCH" = "x86_64" ]; then
-		install -D voglperfrun64 "$pkgdir/usr/bin/voglperfrun64"
-		install -Dm644 libvoglperf64.so "$pkgdir/usr/lib/libvoglperf.so"
-		ln -s "/usr/bin/voglperfrun64" "$pkgdir/usr/bin/voglperfrun"
+		install -Dm644 libvoglperf32.so \
+			"$pkgdir/usr/lib32/libvoglperf.so"
 	else
-		ln -s "/usr/bin/voglperfrun32" "$pkgdir/usr/bin/voglperfrun"
+		install -Dm644 libvoglperf32.so \
+			"$pkgdir/usr/lib/libvoglperf.so"
 	fi
 
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgbase-$pkgver"
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	cd "$srcdir/$pkgbase-$pkgver/src/webby"
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/webby/LICENSE"
+}
+
+package_voglperf64() {
+	arch=('x86_64')
+	depends=('ncurses' 'gcc-libs-multilib')
+	cd "$srcdir/$pkgbase-$pkgver/bin"
+	install -D voglperfrun64 "$pkgdir/usr/bin/voglperfrun64"
+	install -Dm644 libvoglperf64.so "$pkgdir/usr/lib/libvoglperf.so"
+
+	cd "$srcdir/$pkgbase-$pkgver"
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	cd "$srcdir/$pkgname-$pkgver/src/webby"
+	cd "$srcdir/$pkgbase-$pkgver/src/webby"
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/webby/LICENSE"
 }