From 0ff2d3f1bfaaaf75a7fdf847084ebb93b2f78903 Mon Sep 17 00:00:00 2001 From: Carsten Teibes Date: Wed, 8 Jan 2014 22:39:48 +0100 Subject: [PATCH] Cleanup --- .SRCINFO | 10 +++------- PKGBUILD | 42 +++++++++++++++++------------------------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7d7b9b8266f4..1137d2aa0a86 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,25 +1,21 @@ pkgbase = gngeo - pkgdesc = A portable command-line NeoGeo Emulator. + pkgdesc = A portable command-line NeoGeo Emulator pkgver = 0.8 pkgrel = 8 url = http://gngeo.googlecode.com install = gngeo.install arch = i686 arch = x86_64 - license = GPL custom + license = custom GPL makedepends = nasm + makedepends = glu depends = zlib depends = sdl depends = libgl source = http://gngeo.googlecode.com/files/gngeo-0.8.tar.gz source = 4dec1ccfb85d.patch - source = gngeo.install - md5sums = 21055885694e9f6cdbaa20be069a4258 - md5sums = cfa16491e9e5185afec9342be49d55d1 - md5sums = a35dae77928afe13275a7f2728cb1519 sha256sums = 4955a36a978accbc13cc9d58be3dbbed8864f27c34446b2fea879ee27fd7c4b6 sha256sums = 8666f2cf6d2a21ddf4d44e5106f9ae60a73820789a6ad3fec09befadb7105901 - sha256sums = 4937a0eb60edd810f35805ed9838413061d1841e426ecc2b71336478d3139892 pkgname = gngeo diff --git a/PKGBUILD b/PKGBUILD index b403a74fdd25..678321e0703f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,60 +1,52 @@ -# Maintainer: carstene1ns +# Maintainer: carstene1ns # Contributor: josephgbr # Contributor: robb_force pkgname=gngeo pkgver=0.8 pkgrel=8 -pkgdesc="A portable command-line NeoGeo Emulator." +pkgdesc="A portable command-line NeoGeo Emulator" url="http://gngeo.googlecode.com" -license="GPL custom" +license=('custom GPL') arch=('i686' 'x86_64') -install="$pkgname.install" -source=("$url/files/$pkgname-$pkgver.tar.gz" - "4dec1ccfb85d.patch" - "$pkgname.install") +install=$pkgname.install depends=('zlib' 'sdl' 'libgl') -makedepends=('nasm') -md5sums=('21055885694e9f6cdbaa20be069a4258' - 'cfa16491e9e5185afec9342be49d55d1' - 'a35dae77928afe13275a7f2728cb1519') -sha256sums=('4955a36a978accbc13cc9d58be3dbbed8864f27c34446b2fea879ee27fd7c4b6' - '8666f2cf6d2a21ddf4d44e5106f9ae60a73820789a6ad3fec09befadb7105901' - '4937a0eb60edd810f35805ed9838413061d1841e426ecc2b71336478d3139892') - +makedepends=('nasm' 'glu') if [ "$CARCH" == "x86_64" ]; then depends=('lib32-zlib' 'lib32-sdl' 'lib32-libgl') - makedepends=('nasm' 'gcc-multilib') + makedepends=('nasm' 'gcc-multilib' 'lib32-glu') fi +source=("$url/files/$pkgname-$pkgver.tar.gz" "4dec1ccfb85d.patch") +sha256sums=('4955a36a978accbc13cc9d58be3dbbed8864f27c34446b2fea879ee27fd7c4b6' + '8666f2cf6d2a21ddf4d44e5106f9ae60a73820789a6ad3fec09befadb7105901') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # fixes unknown reference error - patch -p2 -i "$srcdir/4dec1ccfb85d.patch" + patch -Np2 < ../4dec1ccfb85d.patch # change path - sed 's#games/lib#share#' -i sample_gngeorc + sed 's|games/lib|share|' -i sample_gngeorc if [ "$CARCH" == "i686" ]; then ./configure --prefix=/usr --mandir=/usr/share/man elif [ "$CARCH" == "x86_64" ]; then # fix path for lib32 - sed 's#/usr/lib/libGL.so#/usr/lib32/libGL.so#' -i sample_gngeorc + sed 's|/usr/lib/libGL.so|/usr/lib32/libGL.so|' -i sample_gngeorc # force 32 bit build ./configure --prefix=/usr --mandir=/usr/share/man \ CC='gcc -m32' SDL_CONFIG='/usr/bin/sdl-config-32' fi - # force single threaded build make -j1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir/" install - install -Dm644 sample_gngeorc "$pkgdir/usr/share/$pkgname/sample_gngeorc" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 sample_gngeorc "$pkgdir"/usr/share/$pkgname/sample_gngeorc + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING }