From 71b123efc856a31b026e511a24ac8c6b04de5bd7 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Mon, 16 May 2011 23:29:28 +0200 Subject: rlvm: Bumped to version 0.12. --- rlvm/PKGBUILD | 18 +++++++++++------- rlvm/build.patch | 21 +++------------------ 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/rlvm/PKGBUILD b/rlvm/PKGBUILD index 6ce6705..a2282fe 100644 --- a/rlvm/PKGBUILD +++ b/rlvm/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Jon Bergli Heier pkgname=rlvm -pkgver=0.11 +pkgver=0.12 pkgrel=1 pkgdesc="RealLive clone for Linux and OSX" arch=(i686 x86_64) @@ -10,18 +10,22 @@ 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} build.patch) -md5sums=('1474521ca1a1c6bbb72594001f110a76' - '3cb364727ba04f80982f918f55e7911c') +md5sums=('9dbafab7f720f6782c727015012e25fe' + 'f702633c91148a239fd0457621a311f5') build() { # release commit, for silly directory names - commit=2af821f + commit=bee99d3 cd "$srcdir/eglaysher-rlvm-$commit" - patch -p1 < $srcdir/build.patch || return 1 + patch -Np0 < $srcdir/build.patch || return 1 scons --release - mkdir -p "$pkgdir/usr/bin" - install "$srcdir/eglaysher-rlvm-$commit/build/release/rlvm" "$pkgdir/usr/bin/" + install -D "$srcdir/eglaysher-rlvm-$commit/build/release/rlvm" "$pkgdir/usr/bin/rlvm" + install -D "$srcdir/eglaysher-rlvm-$commit/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/eglaysher-rlvm-$commit/resources/$r/rlvm.png" "$pkgdir/usr/share/icons/hicolor/${r}x$r/apps/rlvm.png" + done } # vim:set ts=2 sw=2 et: diff --git a/rlvm/build.patch b/rlvm/build.patch index 9400d55..e26ead4 100644 --- a/rlvm/build.patch +++ b/rlvm/build.patch @@ -1,8 +1,6 @@ -diff --git a/SConstruct b/SConstruct -index fe7e078..0ede14f 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -20,14 +20,14 @@ env = Environment( +--- SConstruct 2011-05-15 21:44:42.000000000 +0200 ++++ SConstruct.fixed 2011-05-16 22:23:31.000000000 +0200 +@@ -20,13 +20,13 @@ tools = ["default", "rlvm"], LIBS = [ @@ -11,7 +9,6 @@ index fe7e078..0ede14f 100644 - "boost_iostreams-mt", - "boost_filesystem-mt", - "boost_date_time-mt", -- "boost_signals-mt", - "boost_thread-mt", - "boost_system-mt", + "boost_program_options", @@ -19,20 +16,8 @@ index fe7e078..0ede14f 100644 + "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" -- cgit v1.2.3