summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Teibes2015-12-31 15:38:41 +0100
committerCarsten Teibes2015-12-31 15:38:41 +0100
commit961b312f8fab049f3e32531c290605c3c4d9b5e7 (patch)
treeb71bd821cda11c1e1044c887d990022b072ed5b7
parentb1c1fd29d980327a9d57ebab35566fb60f9efdca (diff)
downloadaur-961b312f8fab049f3e32531c290605c3c4d9b5e7.tar.gz
[upd] Use sdl2 [fix] Install widescreen tilemap
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--cannonball.sh5
3 files changed, 15 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71f569215224..f9de002cefb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cannonball-git
pkgdesc = Enhanced OutRun Engine (development version)
- pkgver = 0.22.r3.g9b5ed35
+ pkgver = 0.3.r9.g412576c
pkgrel = 1
url = http://reassembler.blogspot.de/
install = cannonball.install
@@ -11,7 +11,7 @@ pkgbase = cannonball-git
makedepends = cmake
makedepends = boost
makedepends = chrpath
- depends = sdl
+ depends = sdl2
depends = gcc-libs
depends = bash
provides = cannonball
@@ -19,7 +19,7 @@ pkgbase = cannonball-git
source = cannonball::git+https://github.com/djyt/cannonball.git
source = cannonball.sh
sha256sums = SKIP
- sha256sums = 3400daeb32033967e2e6a8202ab38943786f8b9d61b662e77d4caaeb47d89277
+ sha256sums = 2cb4472728b9e3657b40fa4202944d4c0736e3b7287cbeb5fc4d622de4d477c0
pkgname = cannonball-git
diff --git a/PKGBUILD b/PKGBUILD
index e79cee56e478..48e634605843 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
pkgname=cannonball-git
-pkgver=0.22.r3.g9b5ed35
+pkgver=0.3.r9.g412576c
pkgrel=1
pkgdesc='Enhanced OutRun Engine (development version)'
arch=('i686' 'x86_64')
url="http://reassembler.blogspot.de/"
license=('custom')
-depends=('sdl' 'gcc-libs' 'bash')
+depends=('sdl2' 'gcc-libs' 'bash')
makedepends=('git' 'cmake' 'boost' 'chrpath')
conflicts=("${pkgname%-*}")
provides=("${pkgname%-*}")
@@ -15,7 +15,7 @@ install=${pkgname%-*}.install
source=(${pkgname%-*}::"git+https://github.com/djyt/cannonball.git"
"${pkgname%-*}.sh")
sha256sums=('SKIP'
- '3400daeb32033967e2e6a8202ab38943786f8b9d61b662e77d4caaeb47d89277')
+ '2cb4472728b9e3657b40fa4202944d4c0736e3b7287cbeb5fc4d622de4d477c0')
pkgver() {
cd ${pkgname%-*}
@@ -31,7 +31,7 @@ prepare() {
build() {
cd ${pkgname%-*}/build
- cmake ../cmake -DTARGET=debian
+ cmake ../cmake -DTARGET=sdl2
make
}
@@ -45,6 +45,9 @@ package() {
chrpath -d "$pkgdir"/usr/lib/${pkgname%-*}/${pkgname%-*}
# config
install -Dm644 build/config.xml "$pkgdir"/usr/share/${pkgname%-*}/config.xml
+ # widescreen tilemap data
+ install -d "$pkgdir"/usr/share/${pkgname%-*}/res
+ install -m644 res/*.bin "$pkgdir"/usr/share/${pkgname%-*}/res
# doc + license
install -Dm644 roms/roms.txt "$pkgdir"/usr/share/doc/$pkgname/roms.txt
install -Dm644 docs/license.txt "$pkgdir"/usr/share/licenses/$pkgname/license.txt
diff --git a/cannonball.sh b/cannonball.sh
index 1ecb35ad8c27..be794d72b291 100644
--- a/cannonball.sh
+++ b/cannonball.sh
@@ -9,5 +9,10 @@ if [ ! -f ~/.cannonball/config.xml ]; then
cp /usr/share/cannonball/config.xml ~/.cannonball
fi
+# widescreen tilemaps
+if [ ! -h ~/.cannonball/res ]; then
+ ln -s /usr/share/cannonball/res ~/.cannonball
+fi
+
# run the game
cd ~/.cannonball && exec /usr/lib/cannonball/cannonball "$@"