[arch-commits] Commit in freeorion/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Thursday, March 28, 2013 @ 09:35:38
  Author: arodseth
Revision: 87150

Ready for the Boost 1.53.0 rebuild TODO, just waiting for Ogre

Modified:
  freeorion/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-28 07:09:50 UTC (rev 87149)
+++ PKGBUILD	2013-03-28 08:35:38 UTC (rev 87150)
@@ -8,7 +8,7 @@
 
 pkgname=freeorion
 pkgver=0.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
 url='http://www.freeorion.org/'
@@ -19,8 +19,8 @@
 else
   depends=('nvidia-cg-toolkit')
 fi
-depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
-makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'mesa-libgl'
+depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
+makedepends=('boost' 'ogre>1.8.1-3' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl'
              'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg')
 options=('!strip' '!emptydirs')
 install=$pkgname.install
@@ -66,12 +66,12 @@
     -G "Unix Makefiles"
   
   msg2 'GLU fix...'
-  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
-    "'-march=x86-64 -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
+  if [ "$CARCH" == "x86_64" ]
+  then
+    setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
+      "'-march=native -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU -rpath=/usr/lib '"
+  fi
 
-  #msg2 'Boost fix...'
-  #sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
-  
   msg2 'Compiling...'
   make -j1