Update to 0.0.4.

3 files changed, 38 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7644f6c8d332..cbce2f454200 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Feb  3 21:41:25 UTC 2016
+# Sat Apr 16 06:57:45 UTC 2016
 pkgbase = openrct2
-	pkgdesc = Open source clone of RollerCoaster Tycoon 2
-	pkgver = 0.0.3.1
+	pkgdesc = Open source re-implementation of Roller Coaster Tycoon 2 (requires full copy of the game)
+	pkgver = 0.0.4
 	pkgrel = 1
 	url = https://github.com/OpenRCT2/OpenRCT2
 	install = openrct2.install
@@ -11,23 +11,28 @@ pkgbase = openrct2
 	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
 	options = !buildflags
-	source = https://github.com/OpenRCT2/OpenRCT2/archive/v0.0.3.1.tar.gz
-	source = https://github.com/OpenRCT2/openrct2.github.io/raw/797f5d6b1dbe1cad6a806350866318b7154fdc61/files/orctlibs.zip
-	source = openrct2
+	source = https://github.com/OpenRCT2/OpenRCT2/archive/v0.0.4.tar.gz
 	source = openrct2.desktop
-	sha256sums = 036f40d98fd444b08ed0d04f61e7f9f2a4175c5938830a78abb1582b2081f9ab
-	sha256sums = 31c5e19d9f794bd5f0e75f20c2b4c3c4664d736b0a4d50c8cde14a9a9007b62d
-	sha256sums = 2cead106464f257d64c74333280ee6bf4056167cc69840371e81a77e64858989
+	sha256sums = ebcbbf1de3ccb76168535308ec9045271fae6c730bca4929575277f98deb40ab
 	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
 
diff --git a/PKGBUILD b/PKGBUILD
index 49f6b86ccb03..b534960782d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,76 +1,44 @@
 # Maintainer: Graham Edgecombe <graham@grahamedgecombe.com>
 pkgname=openrct2
-pkgver=0.0.3.1
+pkgver=0.0.4
 pkgrel=1
-pkgdesc='Open source clone of RollerCoaster Tycoon 2'
+pkgdesc='Open source re-implementation of Roller Coaster Tycoon 2 (requires full
+         copy of the game)'
 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')
 options=('!buildflags')
 install=openrct2.install
-source=('https://github.com/OpenRCT2/OpenRCT2/archive/v0.0.3.1.tar.gz'
-        'https://github.com/OpenRCT2/openrct2.github.io/raw/797f5d6b1dbe1cad6a806350866318b7154fdc61/files/orctlibs.zip'
-        'openrct2'
+source=("https://github.com/OpenRCT2/OpenRCT2/archive/v$pkgver.tar.gz"
         'openrct2.desktop')
-sha256sums=('036f40d98fd444b08ed0d04f61e7f9f2a4175c5938830a78abb1582b2081f9ab'
-            '31c5e19d9f794bd5f0e75f20c2b4c3c4664d736b0a4d50c8cde14a9a9007b62d'
-            '2cead106464f257d64c74333280ee6bf4056167cc69840371e81a77e64858989'
+sha256sums=('ebcbbf1de3ccb76168535308ec9045271fae6c730bca4929575277f98deb40ab'
             'b916d4a9f56af82693ba21f43e09ababe9f132fd7c3b78efa1b4387ee1bc3a4d')
 
-if [ "$CARCH" = "i686" ]; then
-  depends+=('sdl2' 'sdl2_ttf' 'curl' 'jansson' 'speexdsp')
-else
-  depends+=('lib32-sdl2' 'lib32-sdl2_ttf' 'lib32-curl' 'lib32-jansson'
-            'lib32-speexdsp')
-  makedepends+=('gcc-multilib')
-fi
-
-prepare() {
-  cd "$srcdir/OpenRCT2-$pkgver"
-
-  # Copy local libraries into lib.
-  if [ ! -d lib ]; then
-    cp -r "$srcdir/local" lib
-  fi
-}
-
 build() {
   cd "$srcdir/OpenRCT2-$pkgver"
 
-  cmake -DCMAKE_BUILD_TYPE=Debug .
-  make
-
-  # openrct2 sprite build segfaults even if it finishes successfully, so we
-  # ignore its return code.
-  ./openrct2 sprite build data/g2.dat resources/g2 || true
+  mkdir -p build
+  cd build
+  cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr ..
+  make all g2
 }
 
 package() {
   cd "$srcdir/OpenRCT2-$pkgver"
 
   # Standard OpenRCT2 distribution files.
-  install -Dm755 openrct2 "$pkgdir/usr/share/openrct2/openrct2"
-  install -Dm644 openrct2.exe "$pkgdir/usr/share/openrct2/openrct2.exe"
-
-  install -Dm644 data/g2.dat "$pkgdir/usr/share/openrct2/data/g2.dat"
-
-  install -dm755 "$pkgdir/usr/share/openrct2/data/language"
-  install -m644 data/language/* "$pkgdir/usr/share/openrct2/data/language/"
-
-  install -dm755 "$pkgdir/usr/share/openrct2/data/title/openrct2"
-  install -m644 data/title/openrct2/* "$pkgdir/usr/share/openrct2/data/title/openrct2"
-
-  install -dm755 "$pkgdir/usr/share/openrct2/data/title/rct2"
-  install -m644 data/title/rct2/* "$pkgdir/usr/share/openrct2/data/title/rct2"
-
-  # Use root certificates from ArchLinux instead of the ones bundled with
-  # OpenRCT2.
-  ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir/usr/share/openrct2/curl-ca-bundle.crt"
+  pushd build
+  make DESTDIR="$pkgdir" install
+  popd
 
-  # ArchLinux-specific stuff (launcher, .desktop file and icon).
-  install -Dm755 "$srcdir/openrct2" "$pkgdir/usr/bin/openrct2"
+  # ArchLinux-specific stuff (.desktop file and icon).
   install -Dm644 "$srcdir/openrct2.desktop" "$pkgdir/usr/share/applications/openrct2.desktop"
   install -Dm644 resources/logo/icon_flag.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/openrct2.svg"
 }
diff --git a/openrct2 b/openrct2
deleted file mode 100755
index f98eeb694765..000000000000
--- a/openrct2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-cd /usr/share/openrct2
-exec ./openrct2 "$@"