rlvm: update

6 files changed, 38 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11b6f838209e..13d06b4ad6a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rlvm
 	pkgdesc = RealLive clone for Linux and OSX
 	pkgver = 0.14
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.rlvm.net/
 	arch = x86_64
 	license = GPL
@@ -19,15 +19,18 @@ pkgbase = rlvm
 	depends = guichan
 	depends = gtk2
 	source = https://github.com/eglaysher/rlvm/archive/release-0.14.tar.gz
+	source = https://github.com/eglaysher/rlvm/commit/373a3db1c4d3c9a4b9eb60b8bca60fa58d1687f9.patch
+	source = https://github.com/eglaysher/rlvm/commit/668863d2222b962ee8e7d9829e972ef05c990302.patch
+	source = https://github.com/eglaysher/rlvm/commit/fb627bad9129080d2070845bcebe0d7eed9a5243.patch
 	source = https://github.com/eglaysher/rlvm/commit/97c808194c56ba58cabdc4730270797909b7652d.patch
-	source = luabind.patch
-	source = freetype.patch
-	source = iostream.patch
+	source = https://github.com/eglaysher/rlvm/commit/573f47fc9ddf58fdd7f4cedcec4997673e812be8.patch
+	source = memory.patch
 	sha256sums = 6d1717540b8db8aca1480ebafae3354b24e3122a77dd2ee81f4b964c7b10dcc0
+	sha256sums = 00101444e8d5dc7e7bcadf0469ef98281394d3d72dca0ef00a4be084b1eb3028
+	sha256sums = 84e97116bdb5f78bf81fdcaa4602978671e6c6e672002577eeeaaf1eeeb07dee
+	sha256sums = a949dc649fac6cdff44ddf7f76480de82035b979b4bf8d959ae07ab648c5589d
 	sha256sums = 8d2e8acf8bcb1f8fd5c78373dbea29036ccee1947a31ea99ae92af72b8ca84fd
-	sha256sums = 2c17ce6af4a2e176e64a2fb10add59b8d7372677fed86f949a2ea3b702f2a54d
-	sha256sums = d8977832b099a00e51f161ce97d7fa0524888f0bad7e1b6100f71f8458f16ceb
-	sha256sums = 80ee25081846981e27dcd802760a86429e9580a793bd1523e39ba99a5609c739
+	sha256sums = 388f9113f229863e679c000dd5820d35f0e9de52de38a1aa041794493d7ebc3c
+	sha256sums = f291ccfd7481c42db5c4b5484d8345790e4e9955d3fc86bd68af6f6d0586914b
 
 pkgname = rlvm
-
diff --git a/PKGBUILD b/PKGBUILD
index e352e8ad55e7..cb3c9971b7b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jon Bergli Heier <snakebite@jvnv.net>
 pkgname=rlvm
 pkgver=0.14
-pkgrel=3
+pkgrel=4
 pkgdesc="RealLive clone for Linux and OSX"
 arch=('x86_64')
 url="http://www.rlvm.net/"
@@ -11,22 +11,29 @@ depends=('boost-libs>=1.46' 'glew' 'libmad' 'libogg' 'libvorbis' 'libpng'
          'sdl_mixer' 'sdl_image' 'sdl_ttf' 'guichan' 'gtk2')
 makedepends=('scons' 'boost')
 source=("https://github.com/eglaysher/rlvm/archive/release-$pkgver.tar.gz"
+        "https://github.com/eglaysher/rlvm/commit/373a3db1c4d3c9a4b9eb60b8bca60fa58d1687f9.patch"
+        "https://github.com/eglaysher/rlvm/commit/668863d2222b962ee8e7d9829e972ef05c990302.patch"
+        "https://github.com/eglaysher/rlvm/commit/fb627bad9129080d2070845bcebe0d7eed9a5243.patch"
         "https://github.com/eglaysher/rlvm/commit/97c808194c56ba58cabdc4730270797909b7652d.patch"
-        "luabind.patch"
-        "freetype.patch"
-        "iostream.patch")
+        "https://github.com/eglaysher/rlvm/commit/573f47fc9ddf58fdd7f4cedcec4997673e812be8.patch"
+        "memory.patch")
 sha256sums=('6d1717540b8db8aca1480ebafae3354b24e3122a77dd2ee81f4b964c7b10dcc0'
+            '00101444e8d5dc7e7bcadf0469ef98281394d3d72dca0ef00a4be084b1eb3028'
+            '84e97116bdb5f78bf81fdcaa4602978671e6c6e672002577eeeaaf1eeeb07dee'
+            'a949dc649fac6cdff44ddf7f76480de82035b979b4bf8d959ae07ab648c5589d'
             '8d2e8acf8bcb1f8fd5c78373dbea29036ccee1947a31ea99ae92af72b8ca84fd'
-            '2c17ce6af4a2e176e64a2fb10add59b8d7372677fed86f949a2ea3b702f2a54d'
-            'd8977832b099a00e51f161ce97d7fa0524888f0bad7e1b6100f71f8458f16ceb'
-            '80ee25081846981e27dcd802760a86429e9580a793bd1523e39ba99a5609c739')
+            '388f9113f229863e679c000dd5820d35f0e9de52de38a1aa041794493d7ebc3c'
+            'f291ccfd7481c42db5c4b5484d8345790e4e9955d3fc86bd68af6f6d0586914b')
 
 prepare() {
   cd "$srcdir/$pkgname-release-$pkgver"
+
+  patch -Np1 -i "$srcdir/373a3db1c4d3c9a4b9eb60b8bca60fa58d1687f9.patch"
+  patch -Np1 -i "$srcdir/668863d2222b962ee8e7d9829e972ef05c990302.patch"
+  patch -Np1 -i "$srcdir/fb627bad9129080d2070845bcebe0d7eed9a5243.patch"
   patch -Np1 -i "$srcdir/97c808194c56ba58cabdc4730270797909b7652d.patch"
-  patch -Np1 -i "$srcdir/luabind.patch"
-  patch -Np1 -i "$srcdir/freetype.patch"
-  patch -Np1 -i "$srcdir/iostream.patch"
+  patch -Np1 -i "$srcdir/573f47fc9ddf58fdd7f4cedcec4997673e812be8.patch"
+  patch -Np1 -i "$srcdir/memory.patch"
 }
 
 build() {
diff --git a/freetype.patch b/freetype.patch
deleted file mode 100644
index fab7872aa637..000000000000
--- a/freetype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -284,7 +284,7 @@
- 
- # Get the configuration from sdl and freetype
- env.ParseConfig("sdl-config --cflags")
--env.ParseConfig("freetype-config --cflags --libs")
-+env.ParseConfig("pkg-config --cflags freetype2")
- 
- env = config.Finish()
- 
diff --git a/iostream.patch b/iostream.patch
deleted file mode 100644
index 8ef2abb573e1..000000000000
--- a/iostream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/systems/base/gan_graphics_object_data.cc
-+++ b/src/systems/base/gan_graphics_object_data.cc
-@@ -36,6 +36,7 @@
- 
- #include <boost/serialization/export.hpp>
- #include <boost/filesystem/fstream.hpp>
-+#include <iostream>
- #include <string>
- #include <vector>
- 
---- a/src/systems/base/graphics_object.cc
-+++ b/src/systems/base/graphics_object.cc
-@@ -35,6 +35,7 @@
- #include <boost/serialization/scoped_ptr.hpp>
- #include <boost/serialization/shared_ptr.hpp>
- 
-+#include <iostream>
- #include <algorithm>
- #include <numeric>
- #include <sstream>
diff --git a/luabind.patch b/luabind.patch
deleted file mode 100644
index a8e402220f24..000000000000
--- a/luabind.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/vendor/luabind/include/luabind/object.hpp
-+++ b/vendor/luabind/include/luabind/object.hpp
-@@ -544,6 +544,7 @@
-       handle m_key;
-   };
- 
-+#if BOOST_VERSION < 105700
- // Needed because of some strange ADL issues.
- 
- #define LUABIND_OPERATOR_ADL_WKND(op) \
-@@ -565,6 +566,7 @@
-   LUABIND_OPERATOR_ADL_WKND(!=)
- 
- #undef LUABIND_OPERATOR_ADL_WKND
-+#endif
-  
- } // namespace detail
- 
diff --git a/memory.patch b/memory.patch
new file mode 100644
index 000000000000..964f45ac45ae
--- /dev/null
+++ b/memory.patch
@@ -0,0 +1,10 @@
+--- a/src/systems/base/system.h
++++ b/src/systems/base/system.h
+@@ -33,6 +33,7 @@
+ #include <boost/filesystem/path.hpp>
+ 
+ #include <map>
++#include <memory>
+ #include <sstream>
+ #include <string>
+ #include <utility>