rlvm: Fix build

5 files changed, 82 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 126cbe5673be..11b6f838209e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = rlvm
 	pkgdesc = RealLive clone for Linux and OSX
 	pkgver = 0.14
-	pkgrel = 2
-	url = http://www.elliotglaysher.org/rlvm/
-	arch = i686
+	pkgrel = 3
+	url = http://www.rlvm.net/
 	arch = x86_64
 	license = GPL
 	makedepends = scons
@@ -11,13 +10,24 @@ pkgbase = rlvm
 	depends = boost-libs>=1.46
 	depends = glew
 	depends = libmad
+	depends = libogg
+	depends = libvorbis
+	depends = libpng
 	depends = sdl_mixer
 	depends = sdl_image
 	depends = sdl_ttf
+	depends = guichan
+	depends = gtk2
 	source = https://github.com/eglaysher/rlvm/archive/release-0.14.tar.gz
+	source = https://github.com/eglaysher/rlvm/commit/97c808194c56ba58cabdc4730270797909b7652d.patch
 	source = luabind.patch
-	md5sums = 03a7df65cf22bba83547d412fd07e941
-	md5sums = ed77bb39c013519544f16a4db7c17f3a
+	source = freetype.patch
+	source = iostream.patch
+	sha256sums = 6d1717540b8db8aca1480ebafae3354b24e3122a77dd2ee81f4b964c7b10dcc0
+	sha256sums = 8d2e8acf8bcb1f8fd5c78373dbea29036ccee1947a31ea99ae92af72b8ca84fd
+	sha256sums = 2c17ce6af4a2e176e64a2fb10add59b8d7372677fed86f949a2ea3b702f2a54d
+	sha256sums = d8977832b099a00e51f161ce97d7fa0524888f0bad7e1b6100f71f8458f16ceb
+	sha256sums = 80ee25081846981e27dcd802760a86429e9580a793bd1523e39ba99a5609c739
 
 pkgname = rlvm
 
diff --git a/PKGBUILD b/PKGBUILD
index c9ef99372dca..ad320dfb11f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,47 @@
-# Maintainer: Jon Bergli Heier <snakebite@jvnv.net>
+# Maintainer: neeshy <neeshy@tfwno.gf>
+# Contributor: Jon Bergli Heier <snakebite@jvnv.net>
 pkgname=rlvm
 pkgver=0.14
-pkgrel=2
+pkgrel=3
 pkgdesc="RealLive clone for Linux and OSX"
-arch=(i686 x86_64)
-url="http://www.elliotglaysher.org/rlvm/"
+arch=('x86_64')
+url="http://www.rlvm.net/"
 license=('GPL')
-depends=('boost-libs>=1.46' glew libmad sdl_mixer sdl_image sdl_ttf)
-makedepends=(scons boost)
-source=(https://github.com/eglaysher/rlvm/archive/release-${pkgver}.tar.gz luabind.patch)
-md5sums=('03a7df65cf22bba83547d412fd07e941'
-         'ed77bb39c013519544f16a4db7c17f3a')
+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/97c808194c56ba58cabdc4730270797909b7652d.patch"
+        "luabind.patch"
+        "freetype.patch"
+        "iostream.patch")
+sha256sums=('6d1717540b8db8aca1480ebafae3354b24e3122a77dd2ee81f4b964c7b10dcc0'
+            '8d2e8acf8bcb1f8fd5c78373dbea29036ccee1947a31ea99ae92af72b8ca84fd'
+            '2c17ce6af4a2e176e64a2fb10add59b8d7372677fed86f949a2ea3b702f2a54d'
+            'd8977832b099a00e51f161ce97d7fa0524888f0bad7e1b6100f71f8458f16ceb'
+            '80ee25081846981e27dcd802760a86429e9580a793bd1523e39ba99a5609c739')
 
-build() {
-  cd "$srcdir/rlvm-release-${pkgver}"
-  patch -p1 < "$srcdir/luabind.patch"
+prepare() {
+  cd "$srcdir/$pkgname-release-$pkgver"
+  patch -Np1 -i "$srcdir/97c808194c56ba58cabdc4730270797909b7652d.patch"
+  patch -Np1 -i "$srcdir/luabind.patch"
+  patch -Np1 -i "$srcdir/freetype.patch"
+  patch -Np1 -i "$srcdir/iostream.patch"
+}
 
+build() {
+  cd "$srcdir/$pkgname-release-$pkgver"
   scons --release
-
 }
 
 package() {
-  cd "$srcdir/rlvm-release-${pkgver}"
+  cd "$srcdir/$pkgname-release-$pkgver"
+
+  install -Dm755 "build/release/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "src/platforms/gtk/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 
-  install -D "$srcdir/rlvm-release-${pkgver}/build/release/rlvm" "$pkgdir/usr/bin/rlvm"
-  install -D "$srcdir/rlvm-release-${pkgver}/src/platforms/gtk/rlvm.desktop" "$pkgdir/usr/share/applications/rlvm.desktop"
-  for r in 16 24 32 48 128 256; do
-    install -d "$pkgdir/usr/share/icons/hicolor/${r}x$r"
-    install -D "$srcdir/rlvm-release-${pkgver}/resources/$r/rlvm.png" "$pkgdir/usr/share/icons/hicolor/${r}x$r/apps/rlvm.png"
+  local _i
+  for _i in 16 24 32 48 128 256; do
+    install -Dm644 "resources/$_i/$pkgname.png" "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/$pkgname.png"
   done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/freetype.patch b/freetype.patch
new file mode 100644
index 000000000000..fab7872aa637
--- /dev/null
+++ b/freetype.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..8ef2abb573e1
--- /dev/null
+++ b/iostream.patch
@@ -0,0 +1,20 @@
+--- 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
index 41fd044be2f5..a8e402220f24 100644
--- a/luabind.patch
+++ b/luabind.patch
@@ -1,8 +1,6 @@
-diff --git a/vendor/luabind/include/luabind/object.hpp b/vendor/luabind/include/luabind/object.hpp
-index 5e2771c..24c140c 100644
 --- a/vendor/luabind/include/luabind/object.hpp
 +++ b/vendor/luabind/include/luabind/object.hpp
-@@ -544,6 +544,7 @@ namespace detail
+@@ -544,6 +544,7 @@
        handle m_key;
    };
  
@@ -10,7 +8,7 @@ index 5e2771c..24c140c 100644
  // Needed because of some strange ADL issues.
  
  #define LUABIND_OPERATOR_ADL_WKND(op) \
-@@ -565,6 +566,7 @@ namespace detail
+@@ -565,6 +566,7 @@
    LUABIND_OPERATOR_ADL_WKND(!=)
  
  #undef LUABIND_OPERATOR_ADL_WKND