Update to 0.0.3.

5 files changed, 95 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08e88e3c52d3..c36078cbacbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,33 @@
 pkgbase = openrct2
 	pkgdesc = Open source clone of RollerCoaster Tycoon 2
-	pkgver = 0.0.2
-	pkgrel = 3
-	url = https://github.com/IntelOrca/OpenRCT2
+	pkgver = 0.0.3
+	pkgrel = 1
+	url = https://github.com/OpenRCT2/OpenRCT2
 	install = openrct2.install
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = GPL3
-	depends = wine
+	makedepends = git
+	makedepends = cmake
+	makedepends = gcc-multilib
 	depends = gtk-update-icon-cache
 	depends = desktop-file-utils
-	noextract = OpenRCT2-0.0.2.zip
-	source = https://github.com/OpenRCT2/OpenRCT2/releases/download/v0.0.2/OpenRCT2-0.0.2.zip
-	source = https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v0.0.2/resources/logo/icon_flag.svg
+	depends = lib32-sdl2
+	depends = lib32-sdl2_ttf
+	depends = lib32-curl
+	depends = lib32-jansson
+	depends = lib32-speexdsp
+	provides = openrct2
+	conflicts = openrct2
+	options = !buildflags
+	source = https://github.com/OpenRCT2/OpenRCT2/archive/v0.0.3.tar.gz
+	source = https://openrct.net/launcher/libs/orctlibs.zip
 	source = openrct2
 	source = openrct2.desktop
-	md5sums = 393038bf20e00cb72532cacfe905f7a6
-	md5sums = 699a31f7b0e7ab825445b5a05fd2c39e
-	md5sums = b750eaf997a27e981232b21a68fa868e
-	md5sums = 035a407b940492c584c72f4f59f1bd69
+	sha256sums = 50a55a2ab48a4df26a32d17ee9c72e7310eba6537ed839ee81de2220afe79d80
+	sha256sums = 0a7b5ea46e9cb4b19000b69690eae0b75929752f7db192c78bd7ffb61d696835
+	sha256sums = 2cead106464f257d64c74333280ee6bf4056167cc69840371e81a77e64858989
+	sha256sums = b916d4a9f56af82693ba21f43e09ababe9f132fd7c3b78efa1b4387ee1bc3a4d
 
 pkgname = openrct2
 
diff --git a/.gitignore b/.gitignore
index 00846f6fbf03..ae5f1ea1358b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@
 *.tar.xz.sig
 *.src.tar.gz
 *.zip
-*.svg
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f2ee7900c61e..53036f56acbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,78 @@
 # Maintainer: Graham Edgecombe <graham@grahamedgecombe.com>
 pkgname=openrct2
-pkgver=0.0.2
-pkgrel=3
+pkgver=0.0.3
+pkgrel=1
 pkgdesc='Open source clone of RollerCoaster Tycoon 2'
-arch=('any')
-url='https://github.com/IntelOrca/OpenRCT2'
+arch=('i686' 'x86_64')
+url='https://github.com/OpenRCT2/OpenRCT2'
 license=('GPL3')
-depends=('wine' 'gtk-update-icon-cache' 'desktop-file-utils')
+depends=('gtk-update-icon-cache' 'desktop-file-utils')
+makedepends=('git' 'cmake')
+conflicts=('openrct2')
+provides=('openrct2')
+options=('!buildflags')
 install=openrct2.install
-source=("https://github.com/OpenRCT2/OpenRCT2/releases/download/v${pkgver}/OpenRCT2-${pkgver}.zip"
-        "https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${pkgver}/resources/logo/icon_flag.svg"
+source=('https://github.com/OpenRCT2/OpenRCT2/archive/v0.0.3.tar.gz'
+        'https://openrct.net/launcher/libs/orctlibs.zip'
         'openrct2'
         'openrct2.desktop')
-noextract=(OpenRCT2-${pkgver}.zip)
-md5sums=('393038bf20e00cb72532cacfe905f7a6'
-         '699a31f7b0e7ab825445b5a05fd2c39e'
-         'b750eaf997a27e981232b21a68fa868e'
-         '035a407b940492c584c72f4f59f1bd69')
+sha256sums=('50a55a2ab48a4df26a32d17ee9c72e7310eba6537ed839ee81de2220afe79d80'
+            '0a7b5ea46e9cb4b19000b69690eae0b75929752f7db192c78bd7ffb61d696835'
+            '2cead106464f257d64c74333280ee6bf4056167cc69840371e81a77e64858989'
+            '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
+}
 
 package() {
-  cd "$srcdir"
+  cd "$srcdir/OpenRCT2-$pkgver"
 
   # Standard OpenRCT2 distribution files.
-  install -dm755 "$pkgdir/usr/share/openrct2"
-  unzip -d "$pkgdir/usr/share/openrct2" "OpenRCT2-${pkgver}.zip"
+  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"
 
-  # Linux is case sensitive!
-  mv "$pkgdir/usr/share/openrct2/"{Data,data}
-  mv "$pkgdir/usr/share/openrct2/data/"{Language,language}
+  install -dm755 "$pkgdir/usr/share/openrct2/data/language"
+  install -m644 data/language/* "$pkgdir/usr/share/openrct2/data/language/"
 
-  # Move documentation to /usr/share/doc/openrct2/.
-  install -d "$pkgdir/usr/share/doc/openrct2"
-  mv "$pkgdir/usr/share/openrct2/"*.txt "$pkgdir/usr/share/doc/openrct2"
+  install -dm755 "$pkgdir/usr/share/openrct2/data/title/openrct2"
+  install -m644 data/title/openrct2/* "$pkgdir/usr/share/openrct2/data/title/openrct2"
 
-  # changelog.txt needs to be symlinked as the executable reads it.
-  ln -sf /usr/share/doc/openrct2/changelog.txt "$pkgdir/usr/share/openrct2/changelog.txt"
+  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"
 
   # ArchLinux-specific stuff (launcher, .desktop file and icon).
-  install -Dm755 openrct2 "$pkgdir/usr/bin/openrct2"
-  install -Dm644 openrct2.desktop "$pkgdir/usr/share/applications/openrct2.desktop"
-  install -Dm644 icon_flag.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/openrct2.svg"
+  install -Dm755 "$srcdir/openrct2" "$pkgdir/usr/bin/openrct2"
+  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
index 6e9e634571d2..f98eeb694765 100755
--- a/openrct2
+++ b/openrct2
@@ -1,3 +1,3 @@
 #!/bin/sh -e
 cd /usr/share/openrct2
-exec wine openrct2.exe "$@"
+exec ./openrct2 "$@"
diff --git a/openrct2.install b/openrct2.install
index 4d853ea8ee72..56608b7998fc 100644
--- a/openrct2.install
+++ b/openrct2.install
@@ -6,8 +6,20 @@ _update_caches() {
 post_install() {
   _update_caches
   cat <<EOF
-For OpenRCT2 to run you must install a retail copy of RollerCoaster Tycoon 2
-with Wine.
+For OpenRCT2 to run you must install the assets from a retail copy of
+RollerCoaster Tycoon 2. See the following page for more information on
+installing a retail copy of the game on Linux:
+
+  https://github.com/OpenRCT2/OpenRCT2/wiki/Installation-on-Linux
+
+Once installed, set the game_path directive in the [general] section of
+\$XDG_CONFIG_HOME/OpenRCT2/config.ini (typically ~/.config/OpenRCT2/config.ini)
+to point to the location of the retail installation.
+
+For example:
+
+  [general]
+  game_path = "/path/to/RCT2"
 EOF
 }