summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-03-11 17:31:00 +0100
committerJon Bergli Heier <snakebite@jvnv.net>2011-03-11 17:31:00 +0100
commit060f13519fecefd6f1fed3ae1ad5f4c7b6e153cd (patch)
treecf80198cb0197257bd6748a347067c04ca4e29b0
parent3284bd73bf54557b8b9b91cb719d3e46604b8d07 (diff)
rlvm: Updated to 0.11 with patch for Boost 1.46.
-rw-r--r--rlvm/PKGBUILD15
-rw-r--r--rlvm/build.patch38
2 files changed, 47 insertions, 6 deletions
diff --git a/rlvm/PKGBUILD b/rlvm/PKGBUILD
index e0a60db..6ce6705 100644
--- a/rlvm/PKGBUILD
+++ b/rlvm/PKGBUILD
@@ -1,21 +1,24 @@
# Maintainer: Jon Bergli Heier <snakebite@jvnv.net>
pkgname=rlvm
-pkgver=0.10
-pkgrel=2
+pkgver=0.11
+pkgrel=1
pkgdesc="RealLive clone for Linux and OSX"
arch=(i686 x86_64)
url="http://www.elliotglaysher.org/rlvm/"
license=('GPL')
-depends=('boost-libs>=1.40' glew libmad sdl_mixer sdl_image sdl_ttf)
+depends=('boost-libs>=1.46' glew libmad sdl_mixer sdl_image sdl_ttf)
makedepends=(scons boost)
-source=(https://github.com/eglaysher/rlvm/tarball/release-${pkgver})
-md5sums=('f6bedb2a879f9103c248e5e9bf52bc40')
+source=(https://github.com/eglaysher/rlvm/tarball/release-${pkgver}
+ build.patch)
+md5sums=('1474521ca1a1c6bbb72594001f110a76'
+ '3cb364727ba04f80982f918f55e7911c')
build() {
# release commit, for silly directory names
- commit=f1a556a
+ commit=2af821f
cd "$srcdir/eglaysher-rlvm-$commit"
+ patch -p1 < $srcdir/build.patch || return 1
scons --release
mkdir -p "$pkgdir/usr/bin"
install "$srcdir/eglaysher-rlvm-$commit/build/release/rlvm" "$pkgdir/usr/bin/"
diff --git a/rlvm/build.patch b/rlvm/build.patch
new file mode 100644
index 0000000..9400d55
--- /dev/null
+++ b/rlvm/build.patch
@@ -0,0 +1,38 @@
+diff --git a/SConstruct b/SConstruct
+index fe7e078..0ede14f 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -20,14 +20,14 @@ env = Environment(
+ tools = ["default", "rlvm"],
+
+ LIBS = [
+- "boost_program_options-mt",
+- "boost_serialization-mt",
+- "boost_iostreams-mt",
+- "boost_filesystem-mt",
+- "boost_date_time-mt",
+- "boost_signals-mt",
+- "boost_thread-mt",
+- "boost_system-mt",
++ "boost_program_options",
++ "boost_serialization",
++ "boost_iostreams",
++ "boost_filesystem",
++ "boost_date_time",
++ "boost_signals",
++ "boost_thread",
++ "boost_system",
+ "z"
+ ],
+
+@@ -46,6 +46,10 @@ env = Environment(
+ CPPDEFINES = [
+ "HAVE_CONFIG_H",
+
++ # boost made a large non-backwards compatible change to their filesystem
++ # library. Specify version 2 explicitly.
++ ["BOOST_FILESYSTEM_VERSION", 2],
++
+ # This prevents conflicts between SDL and GLEW. I shouldn't have to do
+ # this, but the SDL_opengl.h and glew.h differ in const correctness...
+ "NO_SDL_GLEXT"