From ca6edb7d91496b4d9acf0e28bf0d20a0c0408862 Mon Sep 17 00:00:00 2001
From: Nathan Angelacos <nangel@alpinelinux.org>
Date: Mon, 8 May 2017 08:45:18 -0400
Subject: Revert "Revert "sdlmame""

This reverts commit 6da583e444028373640463cd53d28d7f27286d5a.
---
 sdlmame/APKBUILD | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'sdlmame')

diff --git a/sdlmame/APKBUILD b/sdlmame/APKBUILD
index 3b23b98..13c2859 100644
--- a/sdlmame/APKBUILD
+++ b/sdlmame/APKBUILD
@@ -4,7 +4,7 @@ _pkgmaj=0
 _pkgmin=183
 pkgver=${_pkgmaj}.${_pkgmin}
 _pkgver=${_pkgmaj}${_pkgmin}
-pkgrel=0
+pkgrel=1
 pkgdesc="Vintage computer emulator with SDL support"
 arch=all
 url="http://mamedev.org/"
@@ -12,7 +12,7 @@ license="GPL2"
 #depends=""
 makedepends="alsa-lib libxinerama-dev qt5-qtbase-dev sdl2-dev sdl2_ttf-dev glu mesa-dev nasm python2 unzip"
 install=
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-extras"
 
 source="https://github.com/mamedev/mame/releases/download/mame${_pkgver}/mame${_pkgver}s.zip
 	0001-gcc-4-6.patch
@@ -57,31 +57,20 @@ package() {
 
 	cd "$builddir"
   
-	install -Dm755 mame "$pkgdir"/usr/lib/${pkgname}/${pkgname} || \
-	install -Dm755 mame64 "$pkgdir"/usr/lib/${pkgname}/${pkgname}
-
-  	install -m755 chdman "$pkgdir"/usr/lib/${pkgname}/chdman
-	install -m755 jedutil "$pkgdir"/usr/lib/${pkgname}/jedutil
-	install -m755 regrep "$pkgdir"/usr/lib/${pkgname}/regrep
-	install -m755 romcmp "$pkgdir"/usr/lib/${pkgname}/romcmp
-	#  install -m755 testkeys "$pkgdir"/usr/lib/${pkgname}/testkeys
-	install -m755 src2html "$pkgdir"/usr/lib/${pkgname}/src2html
-	install -m755 srcclean "$pkgdir"/usr/lib/${pkgname}/srcclean
-	install -m755 ldverify "$pkgdir"/usr/lib/${pkgname}/ldverify
-	install -m755 ldresample "$pkgdir"/usr/lib/${pkgname}/ldresample
+	install -Dm755 mame "$pkgdir"/usr/bin/${pkgname} || \
+	install -Dm755 mame64 "$pkgdir"/usr/bin/${pkgname}
 
-  	install -dm755 "$pkgdir"/usr/share/${pkgname}
-	for i in $pkgname chdman jedutil regrep romcmp testkeys src2html srcclean ldverify ldresample; do
-		ln -s /usr/lib/$pkgname/$i "$pkgdir"/usr/share/$pkgname/$i
+	for i in chdman jedutil regrep romcmp src2html srcclean ldverify ldresample; do
+  		install -m755 ${i} "$pkgdir"/usr/bin/${i}
 	done
 
+  	install -dm755 "$pkgdir"/usr/share/${pkgname}
+
 	# Install the extra bits
 	install -d "$pkgdir"/usr/share/${pkgname}/{artwork,ctrlr,hash,keymaps,shader}
 	install -d "$pkgdir"/usr/share/man/man1
 	install -d "$pkgdir"/usr/share/man/man6
-  	install -m644 src/osd/modules/opengl/shader/glsl*.*h "$pkgdir"/usr/share/${pkgname}/shader/
-	#  install -m644 src/osd/sdl/man/*.1* "$pkgdir"/usr/share/man/man1/
-	#  install -m644 src/osd/sdl/man/*.6* "$pkgdir"/usr/share/man/man6/
+  	# install -m644 src/osd/modules/opengl/shader/glsl*.*h "$pkgdir"/usr/share/${pkgname}/shader/
 
 	cp -a "$srcdir"/artwork/* "$pkgdir"/usr/share/${pkgname}/artwork/
 	install -m644 "$srcdir"/ctrlr/* "$pkgdir"/usr/share/${pkgname}/ctrlr/
@@ -107,6 +96,16 @@ package() {
 	cp -a docs "$pkgdir"/usr/share/doc/$pkgname
 }
 
+extras() {
+	depends="$pkgname"
+	pkgdesc="Extra utils for $pkgname"
+	mkdir -p "$subpkgdir"/usr/bin
+	cd "$pkgdir"
+	for i in chdman jedutil regrep romcmp src2html srcclean ldverify ldresample; do
+  		mv usr/bin/${i} "$subpkgdir"/usr/bin/
+	done
+}
+
 
 sha512sums="4ef43af2f887bc68372e7146ffc3ba0db476994651270ab841b5df823c7345be645c4e6e5a08184c70815abdbe6581c291d624bb51402cc8f4579247cfdf1daf  mame0183s.zip
 ad2f62d35947c8aadfacd7b6239cbb9f4d5e9c106de5499331afd61db136d04156e6775fa72a3323357fb999ac4b014ea9f03050bde4e93bf8e3ca291bf8f8e2  0001-gcc-4-6.patch
-- 
cgit v1.2.3