Updated build

2 files changed, 25 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6aa06a48b8e3..0def2a6ac33e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rigsofrods
 	pkgdesc = An open source vehicle simulator based on soft-body physics
-	pkgver = 0.4.7.0
+	pkgver = 2022.12
 	pkgrel = 1
 	url = https://rigsofrods.org
 	arch = i686
@@ -9,26 +9,28 @@ pkgbase = rigsofrods
 	makedepends = gcc
 	makedepends = cmake>=2.8
 	makedepends = git
+	makedepends = conan
+	depends = boost>=1.50
+	depends = curl
+	depends = openssl
+	depends = gtk2
+	depends = mygui>=3.2.2
+	depends = ogre
+	depends = ois>=1.3
 	depends = openal
-	depends = wxgtk
-	depends = ogre>=1.8.0
-	depends = ogre<2.0.0
-	depends = caelum
-	depends = mygui
-	depends = ogre-pagedgeometry-git
-	depends = socketw
-	depends = angelscript-2.22.1
-	depends = jsoncpp
-	optdepends = nvidia-cg-toolkit: required for Cg shader effects which some mods use
-	provides = rigsofrods
+	depends = rapidjson>=1.1.0
+	optdepends = angelscript
+	optdepends = caelum>=0.6.2
+	optdepends = nvidia-cg-toolkit
 	conflicts = rigsofrods-git
 	conflicts = rigsofrods-hg
-	source = https://github.com/RigsOfRods/rigs-of-rods/archive/0.4.7.0.tar.gz
+	conflicts = rigsofrods-bin
+	source = https://github.com/RigsOfRods/rigs-of-rods/archive/2022.12.tar.gz
 	source = plugins.cfg
 	source = rigsofrods.png
 	source = RoRConfig.desktop
 	source = RoR.desktop
-	sha512sums = 88a5a4852718d678d2029bd6d935267c55db6999233179747e41dce97d7f88e8ca36aa3039ea63cd73efb7f4ba1c9c2f3cbda061e819cc0a4043b0bd7f5636c2
+	sha512sums = 29d754c2f680ede181c40b4f4c88b471a9b909c362c29410d61ff43db6e0cdf0625971cd90da64305604909eaf9162da37f711a242f3fbb6fb2097abe14e73a6
 	sha512sums = 1fffff3e1e1bcf55fb2604c3874457571151082c09e5bcbccf452d6d60b01f2fff825fab601bf428196310c97d67ea1b9346f6de6b17a9906024f867aaa2ceb4
 	sha512sums = 8280ddec6dba37e66c323e469c1894bacc3b592b6ea1f7fd3876bc9e7253b14b4949c3c51d7dd47ad7bd78e085fbe51aad83b1e8d0b0755deda426129e4a6710
 	sha512sums = 40a000061d72245265d53d7c2ce0c4acc81eb3dddb6f6beda4b693a154e34922b8eb5c8400062b58c5f43a74be6cdaab938c1cd6427aebfc691d1fa52517fe2d
diff --git a/PKGBUILD b/PKGBUILD
index 87be5049ca01..b7bacf18d863 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@ _pkgname=rigsofrods
 _gitname=rigs-of-rods
 
 pkgname=rigsofrods
-pkgver=2021.10
+pkgver=2022.12
 pkgrel=1
 pkgdesc="An open source vehicle simulator based on soft-body physics"
 arch=('i686' 'x86_64')
 url="https://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')
+optdepends=('angelscript' 'caelum>=0.6.2' 'nvidia-cg-toolkit')
 makedepends=('gcc' 'cmake>=2.8' 'git' 'conan')
 conflicts=('rigsofrods-git' 'rigsofrods-hg' 'rigsofrods-bin')
 source=("https://github.com/RigsOfRods/rigs-of-rods/archive/${pkgver}.tar.gz"
@@ -19,47 +19,20 @@ source=("https://github.com/RigsOfRods/rigs-of-rods/archive/${pkgver}.tar.gz"
     "rigsofrods.png"
     "RoRConfig.desktop"
 "RoR.desktop")
-sha512sums=('SKIP'
-    '1fffff3e1e1bcf55fb2604c3874457571151082c09e5bcbccf452d6d60b01f2fff825fab601bf428196310c97d67ea1b9346f6de6b17a9906024f867aaa2ceb4'
-    '8280ddec6dba37e66c323e469c1894bacc3b592b6ea1f7fd3876bc9e7253b14b4949c3c51d7dd47ad7bd78e085fbe51aad83b1e8d0b0755deda426129e4a6710'
-    '40a000061d72245265d53d7c2ce0c4acc81eb3dddb6f6beda4b693a154e34922b8eb5c8400062b58c5f43a74be6cdaab938c1cd6427aebfc691d1fa52517fe2d'
-    'b0c04df93fa622d27ba485df1253ee786ebe42acb2c7b2f5d9657f22623503ee995845905f782c7b550625a4db0dbfdd924e4757b2daf21f84bb9cb3f6d683af'
-)
+sha512sums=('29d754c2f680ede181c40b4f4c88b471a9b909c362c29410d61ff43db6e0cdf0625971cd90da64305604909eaf9162da37f711a242f3fbb6fb2097abe14e73a6'
+            '1fffff3e1e1bcf55fb2604c3874457571151082c09e5bcbccf452d6d60b01f2fff825fab601bf428196310c97d67ea1b9346f6de6b17a9906024f867aaa2ceb4'
+            '8280ddec6dba37e66c323e469c1894bacc3b592b6ea1f7fd3876bc9e7253b14b4949c3c51d7dd47ad7bd78e085fbe51aad83b1e8d0b0755deda426129e4a6710'
+            '40a000061d72245265d53d7c2ce0c4acc81eb3dddb6f6beda4b693a154e34922b8eb5c8400062b58c5f43a74be6cdaab938c1cd6427aebfc691d1fa52517fe2d'
+            'b0c04df93fa622d27ba485df1253ee786ebe42acb2c7b2f5d9657f22623503ee995845905f782c7b550625a4db0dbfdd924e4757b2daf21f84bb9cb3f6d683af')
 
 build() {
-    # cd "$srcdir/$_gitname-$pkgver"
-    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 && find ./bin -type f -maxdepth 1 ! -name resources -delete
-    # mkdir 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 \
-    # make
     cd "$srcdir/$_gitname-$pkgver"
     
     # get a clean build dir
     [[ -d build ]] && rm -rf build
     mkdir build && cd build
-    
-    cmake .. 
-      -DROR_USE_MYGUI="TRUE" \
-      -DROR_USE_OPENAL="TRUE" \
-      -DROR_USE_SOCKETW="TRUE" \
-      -DROR_USE_PAGED="TRUE" \
-      -DROR_USE_CAELUM="TRUE" \
-      -DROR_USE_ANGELSCRIPT="TRUE" \
-      set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
-    make
+    cmake -GNinja -DCMAKE_BUILD_TYPE=Release ..
+    ninja
 }
 
 package() {