[arch-commits] Commit in xmoto/repos (3 files)

[Ronald van Haren]

    Date: Monday, October 26, 2009 @ 18:17:43
  Author: ronald
Revision: 56749

Merged revisions 51755,56748 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xmoto/trunk

........
  r51755 | ronald | 2009-09-10 23:10:43 +0200 (Thu, 10 Sep 2009) | 1 line
  
  remove old patch
........
  r56748 | ronald | 2009-10-26 23:17:01 +0100 (Mon, 26 Oct 2009) | 2 lines
  
  upgpkg: xmoto 0.5.2-2
      rebuild against ode 0.11.1
........

Modified:
  xmoto/repos/extra-x86_64/	(properties)
  xmoto/repos/extra-x86_64/PKGBUILD
Deleted:
  xmoto/repos/extra-x86_64/xmoto_gcc44.patch

-------------------+
 PKGBUILD          |    6 +++---
 xmoto_gcc44.patch |   33 ---------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)


Property changes on: xmoto/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xmoto/trunk:1-51753
   + /xmoto/trunk:1-56748

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-26 22:17:01 UTC (rev 56748)
+++ extra-x86_64/PKGBUILD	2009-10-26 22:17:43 UTC (rev 56749)
@@ -5,12 +5,12 @@
 
 pkgname=xmoto
 pkgver=0.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64')
 url="http://xmoto.tuxfamily.org"
 license=('GPL')
-depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11' 'curl>=7.16.2' 
+depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl>=7.16.2' 
 	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net')
 install=xmoto.install
 source=(http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz)
@@ -23,7 +23,7 @@
   sed -i 's|v_replay << m_Chunks.size();|v_replay << (unsigned int) m_Chunks.size();|' src/Replay.cpp || return 1
 
   # build and install 
-  ./configure --prefix=/usr --disable-sdltest
+  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
 
   make || return 1
   make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install

Deleted: extra-x86_64/xmoto_gcc44.patch
===================================================================
--- extra-x86_64/xmoto_gcc44.patch	2009-10-26 22:17:01 UTC (rev 56748)
+++ extra-x86_64/xmoto_gcc44.patch	2009-10-26 22:17:43 UTC (rev 56749)
@@ -1,33 +0,0 @@
-diff -Naur src.old/XMArgs.cpp src/XMArgs.cpp
---- src.old/XMArgs.cpp	2009-05-14 14:20:54.603960980 +0200
-+++ src/XMArgs.cpp	2009-05-14 14:21:07.584007699 +0200
-@@ -24,6 +24,7 @@
- #include "VFileIO.h"
- #include <sstream>
- #include <stdlib.h>
-+#include <cstdio>
- 
- XMArguments::XMArguments() {
-   m_opt_pack   	       = false;
-diff -Naur src.old/helpers/Log.cpp src/helpers/Log.cpp
---- src.old/helpers/Log.cpp	2009-05-14 14:20:54.613925407 +0200
-+++ src/helpers/Log.cpp	2009-05-14 14:23:14.092429804 +0200
-@@ -23,6 +23,7 @@
- #include "../VFileIO.h"
- #include "assert.h"
- #include <stdarg.h>
-+#include <cstdio>
- 
- bool  Logger::m_isInitialized = false;
- bool  Logger::m_activ         = true;
-diff -Naur src.old/helpers/Text.cpp src/helpers/Text.cpp
---- src.old/helpers/Text.cpp	2009-05-14 14:20:54.613925407 +0200
-+++ src/helpers/Text.cpp	2009-05-14 14:21:31.804817862 +0200
-@@ -19,6 +19,7 @@
- =============================================================================*/
- 
- #include "Text.h"
-+#include <cstdio>
- 
- std::string txtToLower(const std::string& i_str) {
-     std::string v_res;