[upd] 0.22→0.3

3 files changed, 60 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61da8537bc6c..1caee24e8fa4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cannonball
 	pkgdesc = Enhanced OutRun Engine
-	pkgver = 0.22
-	pkgrel = 2
+	pkgver = 0.3
+	pkgrel = 1
 	url = http://reassembler.blogspot.de/
 	install = cannonball.install
 	arch = i686
@@ -9,13 +9,14 @@ pkgbase = cannonball
 	license = custom
 	makedepends = cmake
 	makedepends = boost
-	makedepends = chrpath
 	depends = sdl
 	depends = gcc-libs
 	depends = bash
-	source = cannonball-0.22.tar.gz::https://github.com/djyt/cannonball/archive/v0.22.tar.gz
+	source = cannonball-0.3.tar.gz::https://github.com/djyt/cannonball/archive/v0.3.tar.gz
+	source = cannonball-fixes.patch
 	source = cannonball.sh
-	sha256sums = c3624bca9e7ef72eb3fcbfef22549231a7d124f470160efa5a449443a844e0c7
+	sha256sums = 572b983b5490f1131d502e573d59e87ff841d5baa608b40482c198686818a476
+	sha256sums = 6e8c5788b00c2c89b9e61729cac47bd47d577c72109bdac2b255af29df1c525e
 	sha256sums = 3400daeb32033967e2e6a8202ab38943786f8b9d61b662e77d4caaeb47d89277
 
 pkgname = cannonball
diff --git a/PKGBUILD b/PKGBUILD
index 67358278bd75..cd73720e8514 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,28 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=cannonball
-pkgver=0.22
-pkgrel=2
+pkgver=0.3
+pkgrel=1
 pkgdesc='Enhanced OutRun Engine'
 arch=('i686' 'x86_64')
 url="http://reassembler.blogspot.de/"
 license=('custom')
 depends=('sdl' 'gcc-libs' 'bash')
-makedepends=('cmake' 'boost' 'chrpath')
+makedepends=('cmake' 'boost')
 install=$pkgname.install
 source=($pkgname-$pkgver.tar.gz::"https://github.com/djyt/cannonball/archive/v$pkgver.tar.gz"
+        "$pkgname-fixes.patch"
         "$pkgname.sh")
-sha256sums=('c3624bca9e7ef72eb3fcbfef22549231a7d124f470160efa5a449443a844e0c7'
+sha256sums=('572b983b5490f1131d502e573d59e87ff841d5baa608b40482c198686818a476'
+            '6e8c5788b00c2c89b9e61729cac47bd47d577c72109bdac2b255af29df1c525e'
             '3400daeb32033967e2e6a8202ab38943786f8b9d61b662e77d4caaeb47d89277')
 
 prepare() {
   cd $pkgname-$pkgver
+
+  # fix for new boost api, also a missing include
+  patch -Np1 < ../$pkgname-fixes.patch
+
   rm -rf build
   mkdir build
 }
@@ -24,7 +30,7 @@ prepare() {
 build() {
   cd $pkgname-$pkgver/build
 
-  cmake ../cmake -DTARGET=debian
+  cmake ../cmake -DTARGET=debian -DCMAKE_SKIP_BUILD_RPATH=TRUE
   make
 }
 
@@ -34,8 +40,6 @@ package() {
   # launcher + binary
   install -Dm755 ../$pkgname.sh "$pkgdir"/usr/bin/$pkgname
   install -Dm755 build/$pkgname "$pkgdir"/usr/lib/$pkgname/$pkgname
-  # remove rpath
-  chrpath -d "$pkgdir"/usr/lib/$pkgname/$pkgname
   # config
   install -Dm644 build/config.xml "$pkgdir"/usr/share/$pkgname/config.xml
   # doc + license
diff --git a/cannonball-fixes.patch b/cannonball-fixes.patch
new file mode 100644
index 000000000000..1978aae9f7da
--- /dev/null
+++ b/cannonball-fixes.patch
@@ -0,0 +1,43 @@
+diff -Naur cannonball-0.3.orig/src/main/frontend/config.cpp cannonball-0.3/src/main/frontend/config.cpp
+--- cannonball-0.3.orig/src/main/frontend/config.cpp	2014-11-11 22:46:58.000000000 +0100
++++ cannonball-0.3/src/main/frontend/config.cpp	2015-03-14 22:11:36.872872895 +0100
+@@ -239,7 +239,7 @@
+ 
+ 
+     // Tab space 1
+-    boost::property_tree::xml_writer_settings<char> settings('\t', 1);
++    boost::property_tree::xml_writer_settings<std::string> settings = boost::property_tree::xml_writer_make_settings<std::string> ('\t', 1);
+ 
+     try
+     {
+@@ -310,8 +310,8 @@
+     }
+     
+     // Tab space 1
+-    boost::property_tree::xml_writer_settings<char> settings('\t', 1);
+-    
++    boost::property_tree::xml_writer_settings<std::string> settings = boost::property_tree::xml_writer_make_settings<std::string> ('\t', 1);    
++
+     try
+     {
+         write_xml(engine.jap ? filename + "_jap.xml" : filename + ".xml", pt, std::locale(), settings);
+@@ -366,7 +366,7 @@
+     }
+ 
+     // Tab space 1
+-    boost::property_tree::xml_writer_settings<char> settings('\t', 1);
++    boost::property_tree::xml_writer_settings<std::string> settings = boost::property_tree::xml_writer_make_settings<std::string> ('\t', 1);
+     
+     try
+     {
+diff -Naur cannonball-0.3.orig/src/main/hwvideo/hwtiles.cpp cannonball-0.3/src/main/hwvideo/hwtiles.cpp
+--- cannonball-0.3.orig/src/main/hwvideo/hwtiles.cpp	2014-11-11 22:46:58.000000000 +0100
++++ cannonball-0.3/src/main/hwvideo/hwtiles.cpp	2015-03-14 21:29:08.000364828 +0100
+@@ -2,6 +2,7 @@
+ #include "romloader.hpp"
+ #include "hwvideo/hwtiles.hpp"
+ #include "frontend/config.hpp"
++#include <cstring>
+ 
+ /***************************************************************************
+     Video Emulation: OutRun Tilemap Hardware.