Fixed build

4 files changed, 38 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46164d37e875..96115521cd74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,35 @@
-# Generated by mksrcinfo v8
-# Wed Jan 17 22:54:25 CET 2018
 pkgbase = rigsofrods-git
 	pkgdesc = An open source vehicle simulator based on soft-body physics
-	pkgver = 0.4.7.0.r285.gc37e6b5f
+	pkgver = 2022.12.r117.gb0fc91954
 	pkgrel = 1
 	url = http://rigsofrods.org
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = cmake
+	makedepends = gcc
+	makedepends = cmake>=2.8
 	makedepends = git
+	depends = curl
+	depends = openssl
+	depends = fmt
+	depends = mygui-ogre
+	depends = ogre
+	depends = ois
 	depends = openal
-	depends = wxgtk
-	depends = ogre-1.9
-	depends = caelum-ogre1.9
-	depends = mygui-ogre1.9
-	depends = ogre-1.9-pagedgeometry
+	depends = rapidjson>=1.1.0
 	depends = angelscript
-	depends = jsoncpp
-	depends = boost
-	optdepends = sh: for being able to run the commands rigsofrods and rigsofrods-config instead of /opt/rigsofrods/RoR and /opt/rigsofrods/RoRConfig
+	depends = caelum
+	depends = nvidia-cg-toolkit
+	depends = ogre-pagedgeometry
 	provides = rigsofrods
 	conflicts = rigsofrods
 	conflicts = rigsofrods-hg
 	conflicts = rigsofrods-noangelscript-git
-	source = git+https://github.com/RigsOfRods/rigs-of-rods.git
-	source = plugins.cfg
+	source = git+https://github.com/RigsOfRods/rigs-of-rods.git#branch=aur
 	source = rigsofrods.png
-	source = RoRConfig.desktop
 	source = RoR.desktop
-	source = rigsofrods.sh
-	source = rigsofrods-config.sh
 	sha512sums = SKIP
-	sha512sums = 45da7604f07357ee14724dae80c83bd0dc0166a1e8da342c168751ef142f0a6c5d20a14fcc89a90cf8a98b7fdc710dc475fd2d2aa82758cd1aeb8df88e8b216c
-	sha512sums = 8280ddec6dba37e66c323e469c1894bacc3b592b6ea1f7fd3876bc9e7253b14b4949c3c51d7dd47ad7bd78e085fbe51aad83b1e8d0b0755deda426129e4a6710
-	sha512sums = 40a000061d72245265d53d7c2ce0c4acc81eb3dddb6f6beda4b693a154e34922b8eb5c8400062b58c5f43a74be6cdaab938c1cd6427aebfc691d1fa52517fe2d
-	sha512sums = b0c04df93fa622d27ba485df1253ee786ebe42acb2c7b2f5d9657f22623503ee995845905f782c7b550625a4db0dbfdd924e4757b2daf21f84bb9cb3f6d683af
-	sha512sums = 83796e24bda42ed9f744cfd12af7eaf4ce576a4f784f3b10c360a6038fc921f47f42b90e205c933b89f0e837a65d446f101063fc9bac22591963747ed45fdfb6
-	sha512sums = fe76e153ff532f1e88dd57889f6347c598517024681e0f899a878d3c57e2ef6a400c391bfc0a1860975138dc8dc814df268d0c419d919757e59389a307b0f71d
+	sha512sums = 1aaf75c5a22d2129e1fe6293689a347cec07c6d3d3b9990810bc6033b7ca9fd2d9f0c169eb27224ddac23a95982824eb36a9f21aa2f5e90dca82d4c8513023fd
+	sha512sums = f4396b67d65f50e1850b36bb1913ee411570a667ce4bf0b83bb96af34c53f7655936c68b9ce001e21fa9b4140e8f78f28620ff133e44f0049c1d601f3c973f71
 
 pkgname = rigsofrods-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 50581aabfec1..5a736ffeaaab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,54 @@
-# Maintainer: syntheit <daniel@matv.io>
+# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
+# Contributor: Jeanbon
+# Contributor: tritonas00
+# Contributor: sp33dyx
 
 _pkgname=rigsofrods _gitname=rigs-of-rods
 
 pkgname=$_pkgname-git
-pkgver=2021.10.r10.gcab4c279c
+pkgver=2022.12.r117.gb0fc91954
 pkgrel=1
 pkgdesc="An open source vehicle simulator based on soft-body physics"
 arch=('i686' 'x86_64')
 url="http://rigsofrods.org" 
 license=('GPL')
-depends=('boost>=1.50' 'curl' 'openssl' 'gtk2' 'mygui>=3.2.2' 'ogre' 'ois>=1.3' 'openal' 'rapidjson>=1.1.0')
-optdepends=('angelscript=2.31.2' 'caelum>=0.6.2' 'nvidia-cg-toolkit')
+depends=('curl' 'openssl' 'fmt' 'mygui-ogre' 'ogre' 'ois' 'openal' 'rapidjson>=1.1.0' 'angelscript' 'caelum' 'nvidia-cg-toolkit' 'ogre-pagedgeometry')
 makedepends=('gcc' 'cmake>=2.8' 'git')
-# depends=('openal' 'wxgtk' 'ogre-1.9' 'caelum-ogre1.9' 'mygui-ogre1.9' 'ogre-1.9-pagedgeometry' 'angelscript' 'jsoncpp' 'boost')
-# optdepends=('sh: for being able to run the commands rigsofrods and rigsofrods-config instead of /opt/rigsofrods/RoR and /opt/rigsofrods/RoRConfig')
-# makedepends=('cmake' 'git') 
 conflicts=('rigsofrods' 'rigsofrods-hg' 'rigsofrods-noangelscript-git')
 provides=('rigsofrods')
-source=("git+https://github.com/RigsOfRods/$_gitname.git" "plugins.cfg" "rigsofrods.png" "RoRConfig.desktop" "RoR.desktop" "rigsofrods.sh" "rigsofrods-config.sh")
-sha512sums=('SKIP' 
-'45da7604f07357ee14724dae80c83bd0dc0166a1e8da342c168751ef142f0a6c5d20a14fcc89a90cf8a98b7fdc710dc475fd2d2aa82758cd1aeb8df88e8b216c' 
-'8280ddec6dba37e66c323e469c1894bacc3b592b6ea1f7fd3876bc9e7253b14b4949c3c51d7dd47ad7bd78e085fbe51aad83b1e8d0b0755deda426129e4a6710' 
-'40a000061d72245265d53d7c2ce0c4acc81eb3dddb6f6beda4b693a154e34922b8eb5c8400062b58c5f43a74be6cdaab938c1cd6427aebfc691d1fa52517fe2d' 
-'b0c04df93fa622d27ba485df1253ee786ebe42acb2c7b2f5d9657f22623503ee995845905f782c7b550625a4db0dbfdd924e4757b2daf21f84bb9cb3f6d683af' 
-'83796e24bda42ed9f744cfd12af7eaf4ce576a4f784f3b10c360a6038fc921f47f42b90e205c933b89f0e837a65d446f101063fc9bac22591963747ed45fdfb6' 
-'fe76e153ff532f1e88dd57889f6347c598517024681e0f899a878d3c57e2ef6a400c391bfc0a1860975138dc8dc814df268d0c419d919757e59389a307b0f71d' )
+source=("git+https://github.com/RigsOfRods/$_gitname.git#branch=aur" "rigsofrods.png" "RoR.desktop")
+sha512sums=('SKIP'
+            '1aaf75c5a22d2129e1fe6293689a347cec07c6d3d3b9990810bc6033b7ca9fd2d9f0c169eb27224ddac23a95982824eb36a9f21aa2f5e90dca82d4c8513023fd'
+            'f4396b67d65f50e1850b36bb1913ee411570a667ce4bf0b83bb96af34c53f7655936c68b9ce001e21fa9b4140e8f78f28620ff133e44f0049c1d601f3c973f71')
 
 pkgver() {
-cd "$srcdir/$_gitname"
-git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "$srcdir/$_gitname"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-
     cd "$srcdir/$_gitname"
 
-    export PKG_CONFIG_PATH="/opt/OGRE-1.9/lib/pkgconfig:/opt/MyGUI-OGRE1.9/lib/pkgconfig:/opt/Caelum-OGRE1.9/lib/pkgconfig:/opt/PagedGeometry-OGRE1.9/lib/pkgconfig:$PKG_CONFIG_PATH"
-    export LD_LIBRARY_PATH="/opt/OGRE-1.9/lib:/opt/MyGUI-OGRE1.9/lib:/opt/Caelum-OGRE1.9/lib:/opt/PagedGeometry-OGRE1.9/lib:$LD_LIBRARY_PATH"
-    export CMAKE_PREFIX_PATH="/opt/MyGUI-OGRE1.9/"
-    export LDFLAGS='-L/usr/lib/openssl-1.0/ -lssl -lcrypto'
-
     # get a clean build dir
     [[ -d build ]] && rm -rf build 
     mkdir build && cd build
 
+    # cd build
+
     cmake .. \
-    -DROR_USE_OPENAL="TRUE" \
-    -DROR_USE_SOCKETW="FALSE" \
-    -DROR_USE_PAGED="TRUE" \
-    -DROR_USE_CAELUM="TRUE" \
-    -DROR_USE_ANGELSCRIPT="TRUE" \
-    -DCMAKE_BUILD_TYPE=RELEASE \
-    -DMyGUI_INCLUDE_DIR:PATH="/opt/MyGUI-OGRE1.9/include/MYGUI" \
-    -DMyGUI_LIBRARY:PATH="/opt/MyGUI-OGRE1.9/include/MYGUI" \
-    -DMyGUI_MyGUIEngine_LIBRARY_REL:FILEPATH="/opt/MyGUI-OGRE1.9/lib/libMyGUIEngine.so" \
-    -DMyGUI_OgrePlatform_LIBRARY_REL:FILEPATH="/opt/MyGUI-OGRE1.9/lib/libMyGUI.OgrePlatform.a" \
-    -DPagedGeometry_INCLUDE_DIR:PATH="/opt/PagedGeometry-OGRE1.9/include/PagedGeometry" \
-    -DPagedGeometry_LIBRARY:FILEPATH="/opt/PagedGeometry-OGRE1.9/lib/libPagedGeometry.a" \
-    -DCaelum_INCLUDE_DIR:PATH="/opt/Caelum-OGRE1.9/include/Caelum" \
-    -DCaelum_LIBRARY:FILEPATH="/opt/Caelum-OGRE1.9/lib/libCaelum.so"    
+        -DCMAKE_BUILD_TYPE=RELEASE \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DINSTALL_NATIVE=TRUE \
+        -DCUSTOM_VERSION=$pkgver
     make
 }
 
-
-
 package() {
-    cd $srcdir
+    cd "$srcdir/$_gitname/build"
 
-    mkdir -p "$pkgdir/opt/$_pkgname"
-    cp -r $srcdir/$_gitname/build/bin/* "$pkgdir/opt/$_pkgname/"
+    make DESTDIR="$pkgdir" install
 
+    cd "$srcdir"
     install -Dm755 rigsofrods.png "$pkgdir/usr/share/pixmaps/rigsofrods.png"
     install -Dm755 RoR.desktop "$pkgdir/usr/share/applications/RoR.desktop"
-    install -Dm755 RoRConfig.desktop "$pkgdir/usr/share/applications/RoRConfig.desktop"
-    install -Dm755 plugins.cfg "$pkgdir/opt/$_pkgname/plugins.cfg"
-    install -Dm755 rigsofrods.sh "$pkgdir/usr/bin/rigsofrods"
-    install -Dm755 rigsofrods-config.sh "$pkgdir/usr/bin/rigsofrods-config"
 }
diff --git a/RoR.desktop b/RoR.desktop
index 684747173d4d..68688de9efad 100644
--- a/RoR.desktop
+++ b/RoR.desktop
@@ -4,6 +4,6 @@ Encoding=UTF-8
 Name=Rigs of Rods
 Comment=An open source vehicle simulator based on soft-body physics
 Icon=rigsofrods.png
-Exec=/opt/rigsofrods/RoR
+Exec=/usr/bin/RoR
 Terminal=false
 Categories=Application;Game;
diff --git a/rigsofrods.png b/rigsofrods.png
index 80ab89219997..a30fe03f6205 100644
--- a/rigsofrods.png
+++ b/rigsofrods.png