Version bump

4 files changed, 65 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 844445749c1d..910e6a812e36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bsf-git
 	pkgdesc = A C++ library that aims to provide a unified foundation for the development of real-time graphical applications, whether games, engines or tools
-	pkgver = r4728.5b9720f5b
+	pkgver = r5221.41e122d24
 	pkgrel = 1
 	url = https://www.bsframework.io/
 	arch = x86_64
@@ -11,20 +11,20 @@ pkgbase = bsf-git
 	makedepends = ninja
 	source = git+https://github.com/GameFoundry/bsf.git
 	source = install-dir.patch
-	source = dont-strip-symbols.patch
-	source = https://data.banshee3d.com/bsfCompiledData_Master_13.zip
-	source = https://data.banshee3d.com/bsfData_Master_6.zip
+	source = https://data.banshee3d.com/bsfCompiledData_Master_35.zip
+	source = https://data.banshee3d.com/bsfData_Master_7.zip
 	source = https://data.banshee3d.com/bsfDocImagesData_Master_2.zip
-	source = https://data.banshee3d.com/bsfDependencies_Linux_Master_8.zip
-	source = https://data.banshee3d.com/bsfDep_XShaderCompiler_Linux_Master_1.zip
+	source = https://data.banshee3d.com/bsfDependencies_Linux_Master_11.zip
+	source = https://data.banshee3d.com/bsfDep_XShaderCompiler_Linux_Master_6.zip
+	source = https://data.banshee3d.com/SemanticUI.zip
 	sha256sums = SKIP
-	sha256sums = 4301910bd0c17e2747c08b27617fe3b4e5f10f70a78ffb29dcef4f23d52b4e16
-	sha256sums = 871c19f0e652efa2cbdaef34b6960ba9a81378b957cdf3701dc3f8733cb69cd6
-	sha256sums = 100e91e5ae58dd301adc0d5f31c972237a688f12682e0c0f21e200430728bf27
-	sha256sums = 3b5e087e200e786ab1a0b79d6f3cd04d4c70fde9337dc8082a13479f477d1025
+	sha256sums = 9291ac8fe6c125841179ae6d3af66d20c31105a0869e8a5d30982454240a62dc
+	sha256sums = 848973eef189b16b00947655d2895d0195f4078159884d585653390ca781d125
+	sha256sums = 212ec9fd67be4f58278de6d35ea8dc6f350009cbc741202b957a8b0337da84b3
 	sha256sums = e9d3793f87c4ff0a36f3574ecd070e4b6b25c567a063e3042d2dc5883636f011
-	sha256sums = 60c53790eda57495fefdad2bcc4a6a78198a330e70aeec71abc213edcc8b7036
-	sha256sums = 3e9063abfb04ae88cf0275d90783d37b87c3c84d2e2bea9a163b65641aa07d66
+	sha256sums = 2c8726abb0f6ec35d00bf7d30a75a3b74de1820672db177799898d8cbb359426
+	sha256sums = 41ff32953fceeb1166ac1ec8ae3ab49d3a55acfa6de993d27862d80a9fbf701b
+	sha256sums = d827f244a0dc9a41e012ebe165c3af2bce1da583e107635acd51012cec303121
 
 pkgname = bsf-git
 	arch = x86_64
@@ -44,6 +44,6 @@ pkgname = bsf-git
 	provides = bsf
 	conflicts = bsf
 
-pkgname = bsf-git-docs
+pkgname = bsf-docs-git
 	arch = any
 
diff --git a/PKGBUILD b/PKGBUILD
index bca34214f756..6e3ae97b7603 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Guillaume Meunier <guillaume.meunier@centraliens.net>
-pkgname=(bsf-git bsf-git-docs)
+pkgname=(bsf-git bsf-docs-git)
 pkgbase=bsf-git
 _pkgname=bsf
-pkgver=r4728.5b9720f5b
+pkgver=r5221.41e122d24
 pkgrel=1
 epoch=
 pkgdesc="A C++ library that aims to provide a unified foundation for the development of real-time graphical applications, whether games, engines or tools"
@@ -21,12 +21,12 @@ changelog=
 
 source=('git+https://github.com/GameFoundry/bsf.git'
         'install-dir.patch'
-        'dont-strip-symbols.patch'
-        'https://data.banshee3d.com/bsfCompiledData_Master_13.zip'
-        'https://data.banshee3d.com/bsfData_Master_6.zip'
+        'https://data.banshee3d.com/bsfCompiledData_Master_35.zip'
+        'https://data.banshee3d.com/bsfData_Master_7.zip'
         'https://data.banshee3d.com/bsfDocImagesData_Master_2.zip'
-        'https://data.banshee3d.com/bsfDependencies_Linux_Master_9.zip'
-        'https://data.banshee3d.com/bsfDep_XShaderCompiler_Linux_Master_1.zip')
+        'https://data.banshee3d.com/bsfDependencies_Linux_Master_11.zip'
+        'https://data.banshee3d.com/bsfDep_XShaderCompiler_Linux_Master_6.zip'
+        'https://data.banshee3d.com/SemanticUI.zip')
 noextract=()
 validpgpkeys=()
 
@@ -47,7 +47,6 @@ prepare() {
 	rm -rf "$_pkgname"/Dependencies/freeimg
 
 	patch -d bsf -p1 < install-dir.patch
-	patch -d bsf -p1 < dont-strip-symbols.patch
 }
 
 pkgver() {
@@ -68,7 +67,8 @@ build() {
 	ninja
 
 	cd ../Documentation/Doxygen
-	doxygen config.doxyconfig
+	doxygen native.doxyconfig
+	doxygen csharp.doxyconfig
 }
 
 package_bsf-git() {
@@ -87,18 +87,22 @@ package_bsf-git() {
 	install "$_pkgname"/LICENSE.md $pkgdir/usr/share/licenses/$pkgbase/
 }
 
-package_bsf-git-docs() {
+package_bsf-docs-git() {
 	arch=(any)
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgbase
-	cp -r "$_pkgname"/Documentation/Generated/html/* "$pkgdir"/usr/share/doc/$pkgbase/
+	cp -r "$_pkgname"/Documentation/Generated/native "$pkgdir"/usr/share/doc/$pkgbase/
+	cp -r "$_pkgname"/Documentation/Generated/csharp "$pkgdir"/usr/share/doc/$pkgbase/
+
+	cp -r SemanticUI "$pkgdir"/usr/share/doc/$pkgbase/native/
+	cp -r SemanticUI "$pkgdir"/usr/share/doc/$pkgbase/csharp/
 }
 
 sha256sums=('SKIP'
-            '4301910bd0c17e2747c08b27617fe3b4e5f10f70a78ffb29dcef4f23d52b4e16'
-            '871c19f0e652efa2cbdaef34b6960ba9a81378b957cdf3701dc3f8733cb69cd6'
-            '100e91e5ae58dd301adc0d5f31c972237a688f12682e0c0f21e200430728bf27'
-            '3b5e087e200e786ab1a0b79d6f3cd04d4c70fde9337dc8082a13479f477d1025'
+            '9291ac8fe6c125841179ae6d3af66d20c31105a0869e8a5d30982454240a62dc'
+            '848973eef189b16b00947655d2895d0195f4078159884d585653390ca781d125'
+            '212ec9fd67be4f58278de6d35ea8dc6f350009cbc741202b957a8b0337da84b3'
             'e9d3793f87c4ff0a36f3574ecd070e4b6b25c567a063e3042d2dc5883636f011'
-            '300541083a4c27da9825cddaaca98dabb49175c84845ce40a45a0faaeeb23d4d'
-            '3e9063abfb04ae88cf0275d90783d37b87c3c84d2e2bea9a163b65641aa07d66')
+            '2c8726abb0f6ec35d00bf7d30a75a3b74de1820672db177799898d8cbb359426'
+            '41ff32953fceeb1166ac1ec8ae3ab49d3a55acfa6de993d27862d80a9fbf701b'
+            'd827f244a0dc9a41e012ebe165c3af2bce1da583e107635acd51012cec303121')
diff --git a/dont-strip-symbols.patch b/dont-strip-symbols.patch
deleted file mode 100644
index 63642f4db193..000000000000
--- a/dont-strip-symbols.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Source/CMake/HelperMethods.cmake b/Source/CMake/HelperMethods.cmake
-index 9577b6c8e..90ec58df6 100644
---- a/Source/CMake/HelperMethods.cmake
-+++ b/Source/CMake/HelperMethods.cmake
-@@ -353,8 +353,6 @@ function(strip_symbols targetName outputFilename)
- endfunction()
- 
- function(install_bsf_target targetName)
--	strip_symbols(${targetName} symbolsFile)
--	
- 	install(
- 		TARGETS ${targetName}
- 		EXPORT bsf
-@@ -362,19 +360,6 @@ function(install_bsf_target targetName)
- 		LIBRARY DESTINATION lib
- 		ARCHIVE DESTINATION lib
- 	)		
--	
--	if(MSVC)
--		install(
--			FILES $<TARGET_PDB_FILE:${targetName}> 
--			DESTINATION bin 
--			OPTIONAL
--		)
--	else()
--		install(
--			FILES ${symbolsFile} 
--			DESTINATION lib
--			OPTIONAL)
--	endif()
- endfunction()
- 
- function(copyBsfBinaries target srcDir)
diff --git a/install-dir.patch b/install-dir.patch
index 705002dd37ad..b3dacded2b7e 100644
--- a/install-dir.patch
+++ b/install-dir.patch
@@ -1,12 +1,12 @@
 diff --git a/Source/CMake/BsEngineConfig.h.in b/Source/CMake/BsEngineConfig.h.in
-index 301aaf73f..db89006bf 100644
+index ef62cdc96..f586fa8e0 100644
 --- a/Source/CMake/BsEngineConfig.h.in
 +++ b/Source/CMake/BsEngineConfig.h.in
-@@ -7,18 +7,9 @@
+@@ -7,21 +7,12 @@
  #define BS_SCRIPTING_ENABLED @BS_SCRIPTING_ENABLED@
  
  /** Path to the framework source directory. */
--static constexpr const char* RAW_APP_ROOT = "@APP_ROOT_DIR@/"; 
+-static constexpr const char* RAW_APP_ROOT = "@APP_ROOT_DIR@/";
 +static constexpr const char* RAW_APP_ROOT = "@CMAKE_INSTALL_PREFIX@/share/bsf/";
  
  /** Path to the framework build directory. */
@@ -23,18 +23,42 @@ index 301aaf73f..db89006bf 100644
 -static constexpr const char* BINARIES_PATH = "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE@";
 -#endif
 +static constexpr const char* BINARIES_PATH = "@CMAKE_INSTALL_PREFIX@/lib/";
+ 
+ /** Banshee 3D related version stuff*/
+ #if BS_IS_BANSHEE3D
+diff --git a/Source/CMake/HelperMethods.cmake b/Source/CMake/HelperMethods.cmake
+index 6e61614ee..6c0bb66de 100644
+@@ -410,8 +410,6 @@ function(strip_symbols targetName outputFilename)
+ endfunction()
+ 
+ function(install_bsf_target targetName)
+-	strip_symbols(${targetName} symbolsFile)
+-	
+ 	if(NOT BS_IS_BANSHEE3D)
+ 		set(BIN_DIR bin)
+ 		install(
 diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
-index a35dc9bea..87831df61 100644
+index caf9213da..ed4971f1a 100644
 --- a/Source/CMakeLists.txt
 +++ b/Source/CMakeLists.txt
-@@ -220,8 +220,8 @@ endif()
+@@ -278,16 +278,16 @@ if(((SCRIPT_API AND (NOT SCRIPT_API MATCHES "None")) OR BS_IS_BANSHEE3D) AND SCR
+ endif()
+ 
+ if(NOT BS_IS_BANSHEE3D)
+-	set(DATA_DST_DIR bin)
++	set(DATA_DST_DIR share/bsf/)
+ else()
+ 	set(DATA_DST_DIR .)
+ endif()
  
  ## Install
  install(
 -	DIRECTORY ../Data
--	DESTINATION bin/
 +	DIRECTORY ../Data/
-+	DESTINATION share/bsf/
+ 	DESTINATION ${DATA_DST_DIR}
  	PATTERN "../Data/Raw" EXCLUDE
  	PATTERN ".version" EXCLUDE
  	PATTERN ".reqversion" EXCLUDE
+-)
+\ No newline at end of file
++)