diff options
| author | Graham Edgecombe | 2015-12-31 14:14:35 +0000 |
|---|---|---|
| committer | Graham Edgecombe | 2015-12-31 14:14:35 +0000 |
| commit | 7fa154f709faed1cad36a8b0a152f6e2145ae411 (patch) | |
| tree | da9a0cd87325b3f345fe4227463d3f7286cd5692 | |
| parent | 45b5da750835bfa8c25e22e0abce9d959bf3b09f (diff) | |
| download | aur-7fa154f709faed1cad36a8b0a152f6e2145ae411.tar.gz | |
Use {make,}depends_{i686,x86_64} arrays instead of testing $CARCH.
| -rw-r--r-- | .SRCINFO | 25 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
2 files changed, 21 insertions, 17 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Thu Dec 31 14:10:36 UTC 2015 +# Thu Dec 31 14:13:53 UTC 2015 pkgbase = openrct2-git pkgdesc = Open source clone of RollerCoaster Tycoon 2 pkgver = r5504.8d3da0d @@ -11,16 +11,8 @@ pkgbase = openrct2-git license = GPL3 makedepends = git makedepends = cmake - makedepends = gcc-multilib depends = gtk-update-icon-cache depends = desktop-file-utils - depends = lib32-sdl2 - depends = lib32-sdl2_ttf - depends = lib32-curl - depends = lib32-jansson - depends = lib32-speexdsp - depends = lib32-fontconfig - depends = lib32-libpng provides = openrct2 conflicts = openrct2 options = !buildflags @@ -30,6 +22,21 @@ pkgbase = openrct2-git sha256sums = SKIP sha256sums = 0a7b5ea46e9cb4b19000b69690eae0b75929752f7db192c78bd7ffb61d696835 sha256sums = b916d4a9f56af82693ba21f43e09ababe9f132fd7c3b78efa1b4387ee1bc3a4d + depends_i686 = sdl2 + depends_i686 = sdl2_ttf + depends_i686 = curl + depends_i686 = jansson + depends_i686 = speexdsp + depends_i686 = fontconfig + depends_i686 = libpng + depends_x86_64 = lib32-sdl2 + depends_x86_64 = lib32-sdl2_ttf + depends_x86_64 = lib32-curl + depends_x86_64 = lib32-jansson + depends_x86_64 = lib32-speexdsp + depends_x86_64 = lib32-fontconfig + depends_x86_64 = lib32-libpng + makedepends_x86_64 = gcc-multilib pkgname = openrct2-git @@ -7,7 +7,12 @@ arch=('i686' 'x86_64') url='https://github.com/OpenRCT2/OpenRCT2' license=('GPL3') depends=('gtk-update-icon-cache' 'desktop-file-utils') +depends_i686=('sdl2' 'sdl2_ttf' 'curl' 'jansson' 'speexdsp' 'fontconfig' + 'libpng') +depends_x86_64=('lib32-sdl2' 'lib32-sdl2_ttf' 'lib32-curl' 'lib32-jansson' + 'lib32-speexdsp' 'lib32-fontconfig' 'lib32-libpng') makedepends=('git' 'cmake') +makedepends_x86_64=('gcc-multilib') conflicts=('openrct2') provides=('openrct2') options=('!buildflags') @@ -19,14 +24,6 @@ sha256sums=('SKIP' '0a7b5ea46e9cb4b19000b69690eae0b75929752f7db192c78bd7ffb61d696835' 'b916d4a9f56af82693ba21f43e09ababe9f132fd7c3b78efa1b4387ee1bc3a4d') -if [ "$CARCH" = "i686" ]; then - depends+=('sdl2' 'sdl2_ttf' 'curl' 'jansson' 'speexdsp' 'fontconfig' 'libpng') -else - depends+=('lib32-sdl2' 'lib32-sdl2_ttf' 'lib32-curl' 'lib32-jansson' - 'lib32-speexdsp' 'lib32-fontconfig' 'lib32-libpng') - makedepends+=('gcc-multilib') -fi - pkgver() { cd "$srcdir/$pkgname" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" |