update/fix

1 files changed, 5 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index dde81d243117..c0427d5581d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,12 @@ _gitname=rigs-of-rods
 
 pkgname=$_pkgname-git
 pkgver=LATEST
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source vehicle simulator based on soft-body physics"
 arch=('i686' 'x86_64')
 url="http://rigsofrods.com"
 license=('GPL')
-depends=('angelscript-2.22.1' 'openal' 'wxgtk' 'ogre-1.8' 'caelum-ogre1.8' 'mygui-ogre1.8' 'ogre-1.8-pagedgeometry' 'socketw')
+depends=('angelscript-2.22.1' 'openal' 'wxgtk' 'ogre' 'caelum-git' 'mygui' 'ogre-pagedgeometry-git' 'socketw')
 makedepends=('boost' 'cmake' 'git')
 replaces=('rigsofrods-hg')
 conflicts=('rigsofrods' 'rigsofrods-hg')
@@ -22,7 +22,7 @@ source=("git+https://github.com/RigsOfRods/$_gitname.git"
         "RoRConfig.desktop"
         "RoR.desktop")
 sha512sums=('SKIP'
-            '1fffff3e1e1bcf55fb2604c3874457571151082c09e5bcbccf452d6d60b01f2fff825fab601bf428196310c97d67ea1b9346f6de6b17a9906024f867aaa2ceb4'
+            'aaf465b9afa2acde5300c5721d46147e54a25d74ca42efc560e47fd2e1197717904a33deef3bedcf4a94103228c25129b77f200d386567424a5c1f96fb55b339'
             '8280ddec6dba37e66c323e469c1894bacc3b592b6ea1f7fd3876bc9e7253b14b4949c3c51d7dd47ad7bd78e085fbe51aad83b1e8d0b0755deda426129e4a6710'
             '40a000061d72245265d53d7c2ce0c4acc81eb3dddb6f6beda4b693a154e34922b8eb5c8400062b58c5f43a74be6cdaab938c1cd6427aebfc691d1fa52517fe2d'
             'b0c04df93fa622d27ba485df1253ee786ebe42acb2c7b2f5d9657f22623503ee995845905f782c7b550625a4db0dbfdd924e4757b2daf21f84bb9cb3f6d683af'
@@ -31,11 +31,8 @@ sha512sums=('SKIP'
 build() {
   cd "$srcdir/$_gitname"
 
-  export PKG_CONFIG_PATH="/opt/OGRE-1.8/lib/pkgconfig:/opt/MyGUI-OGRE1.8/lib/pkgconfig:/opt/Caelum-OGRE1.8/lib/pkgconfig:/opt/PagedGeometry-OGRE1.8/lib/pkgconfig:$PKG_CONFIG_PATH"
-  export LD_LIBRARY_PATH="/opt/OGRE-1.8/lib:/opt/MyGUI-OGRE1.8/lib:/opt/Caelum-OGRE1.8/lib:/opt/PagedGeometry-OGRE1.8/lib:$LD_LIBRARY_PATH"
-
-  # patch for MyGUI >3.20, see https://github.com/RigsOfRods/rigs-of-rods/issues/156
-  sed -i 's/key.toValue/key.getValue/' ./source/main/gui/GUIInputManager.cpp ./source/main/gui/Console.cpp ./source/main/gui/LobbyGUI.cpp
+ # export PKG_CONFIG_PATH="/opt/OGRE-1.8/lib/pkgconfig:/opt/MyGUI-OGRE1.8/lib/pkgconfig:/opt/Caelum-OGRE1.8/lib/pkgconfig:/opt/PagedGeometry-OGRE1.8/lib/pkgconfig:$PKG_CONFIG_PATH"
+ # export LD_LIBRARY_PATH="/opt/OGRE-1.8/lib:/opt/MyGUI-OGRE1.8/lib:/opt/Caelum-OGRE1.8/lib:/opt/PagedGeometry-OGRE1.8/lib:$LD_LIBRARY_PATH"
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build && find ./bin -type f -maxdepth 1 ! -name resources -delete
@@ -48,12 +45,6 @@ build() {
     -DROR_USE_PAGED="TRUE" \
     -DROR_USE_CAELUM="TRUE" \
     -DROR_USE_ANGELSCRIPT="TRUE" \
-    -DMYGUI_INCLUDE_DIRS=/opt/MyGUI-OGRE1.8/include/MYGUI \
-    -DMYGUI_OGRE_PLATFORM=/opt/MyGUI-OGRE1.8/lib/libMyGUI.OgrePlatform.a \
-    -DCAELUM_INCLUDE_DIRS=/opt/Caelum-OGRE1.8/include \
-    -DCAELUM_LIBRARIES=/opt/Caelum-OGRE1.8/lib/libCaelum.so \
-    -DPAGED_INCLUDE_DIRS=/opt/PagedGeometry-OGRE1.8/include \
-    -DPAGED_LIBRARIES=/opt/PagedGeometry-OGRE1.8/lib/libPagedGeometry.a \
     -DCMAKE_BUILD_TYPE=RELEASE
 
   make