update to 2.0.r44.g454b587

* use default compiler
* update patch

4 files changed, 17 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de9c028ac66e..dbd7f033e778 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = cemu-git
 	pkgdesc = Nintendo Wii U emulator
-	pkgver = 2.0.r40.g01c5855
-	pkgrel = 2
+	pkgver = 2.0.r44.g454b587
+	pkgrel = 1
 	url = https://cemu.info/
 	arch = x86_64
 	license = MPL2
 	makedepends = boost
-	makedepends = clang
 	makedepends = cmake
 	makedepends = cubeb
 	makedepends = curl
@@ -34,8 +33,8 @@ pkgbase = cemu-git
 	source = cemu.bash
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = da4c607462ac0c97ad33fc3588b5eb0b7ede039964365830807ad003604df7f24d8fd65374596dceb9449ef49ff9c78ec5bb3d8fda50061c79cf397e149debc2
-	b2sums = fb63e1929a826ae3681c8211ebf8bee5887385c8aafb307452c6a694ce668ce0d42489b97a931cdda92e21ec68fb9175a735c84ce867e6b338100aa5573ff576
+	b2sums = 739dfcb54d4f818c2f638c63e6471747470ff32327c37e7e13c11a93885728933b3314bda29699a3ec704081b78c3697261e8437c1d6e732a1e470e3f82720a5
+	b2sums = c5deb443e09fa4d10f29a1a8865f11d660c97a2dd2da361673b02b90f60abd3d67c73fde0fe6760fcb7c2ab424d5d7d91f26245c8b63af05c736662e8cc2f3ef
 
 pkgname = cemu-git
 	depends = discord-rpc
diff --git a/PKGBUILD b/PKGBUILD
index cedee823c95a..d4fd6bf8b5c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexandre Bouvier <contact@amb.tf>
 _pkgname=cemu
 pkgname=$_pkgname-git
-pkgver=2.0.r40.g01c5855
-pkgrel=2
+pkgver=2.0.r44.g454b587
+pkgrel=1
 pkgdesc="Nintendo Wii U emulator"
 arch=('x86_64')
 url="https://cemu.info/"
@@ -16,7 +16,6 @@ depends=(
 )
 makedepends=(
 	'boost'
-	'clang'
 	'cmake'
 	'cubeb'
 	'curl'
@@ -43,8 +42,8 @@ source=(
 b2sums=(
 	'SKIP'
 	'SKIP'
-	'da4c607462ac0c97ad33fc3588b5eb0b7ede039964365830807ad003604df7f24d8fd65374596dceb9449ef49ff9c78ec5bb3d8fda50061c79cf397e149debc2'
-	'fb63e1929a826ae3681c8211ebf8bee5887385c8aafb307452c6a694ce668ce0d42489b97a931cdda92e21ec68fb9175a735c84ce867e6b338100aa5573ff576'
+	'739dfcb54d4f818c2f638c63e6471747470ff32327c37e7e13c11a93885728933b3314bda29699a3ec704081b78c3697261e8437c1d6e732a1e470e3f82720a5'
+	'c5deb443e09fa4d10f29a1a8865f11d660c97a2dd2da361673b02b90f60abd3d67c73fde0fe6760fcb7c2ab424d5d7d91f26245c8b63af05c736662e8cc2f3ef'
 )
 
 pkgver() {
@@ -63,8 +62,6 @@ prepare() {
 build() {
 	cmake -S Cemu -B build \
 		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_C_COMPILER=clang \
-		-DCMAKE_CXX_COMPILER=clang++ \
 		-DCMAKE_CXX_FLAGS_INIT="-I/opt/fmt7/include" \
 		-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=bin \
 		-DCMAKE_TOOLCHAIN_FILE= \
@@ -82,10 +79,10 @@ package() {
 		'libzip.so'
 		'libzstd.so'
 	)
-	# shellcheck disable=SC2154
-	install -D $_pkgname.bash "$pkgdir"/usr/bin/$_pkgname
-	install -D -t "$pkgdir"/usr/lib/$_pkgname build/src/bin/Cemu
 	cd Cemu
+	# shellcheck disable=SC2154
+	install -D ../$_pkgname.bash "$pkgdir"/usr/bin/$_pkgname
+	install -D -t "$pkgdir"/usr/lib/$_pkgname ../build/src/bin/Cemu
 	cp -dr --no-preserve=ownership -t "$pkgdir"/usr/lib/$_pkgname bin/*
 	install -Dm644 -t "$pkgdir"/usr/share/applications dist/linux/info.cemu.Cemu.desktop
 	install -Dm644 -t "$pkgdir"/usr/share/metainfo dist/linux/info.cemu.Cemu.metainfo.xml
diff --git a/cemu.bash b/cemu.bash
index 9d8a27776d8f..9a4a85a76a15 100644
--- a/cemu.bash
+++ b/cemu.bash
@@ -9,6 +9,7 @@ readonly cemu=$mountpoint/Cemu
 
 mkdir -p "$datadir" "$statedir" "$mountpoint"
 
+# https://mostlyuseful.tech/posts/overlay-mounting/
 exec unshare -rm bash <<- BASH
     mount -t overlay -o lowerdir="$rootdir" -o upperdir="$datadir" -o workdir="$statedir" -o userxattr overlay "$mountpoint"
     exec unshare --map-user=$UID --map-group="$GID" "$cemu" "$@"
diff --git a/unbundle-libs.patch b/unbundle-libs.patch
index 9d5e91e2dce8..518168ae81cf 100644
--- a/unbundle-libs.patch
+++ b/unbundle-libs.patch
@@ -57,41 +57,11 @@ index 9666005..2571928 100644
    add_compile_definitions(HAS_CUBEB=1)
  endif()
  
-Submodule dependencies/ZArchive contains modified content
-diff --git a/dependencies/ZArchive/CMakeLists.txt b/dependencies/ZArchive/CMakeLists.txt
-index f91023a..9746c05 100644
---- a/dependencies/ZArchive/CMakeLists.txt
-+++ b/dependencies/ZArchive/CMakeLists.txt
-@@ -30,7 +30,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/include
- )

- 

- find_package(zstd REQUIRED)

--target_link_libraries(zarchive PRIVATE zstd::libzstd_static)

-+target_link_libraries(zarchive PRIVATE zstd::libzstd_shared)

- 

- # standalone executable

- add_executable (zarchiveTool src/main.cpp)

-diff --git a/dependencies/discord-rpc/CMakeLists.txt b/dependencies/discord-rpc/CMakeLists.txt
-index 4aa1108..a6d7568 100644
---- a/dependencies/discord-rpc/CMakeLists.txt
-+++ b/dependencies/discord-rpc/CMakeLists.txt
-@@ -30,9 +30,9 @@ execute_process(
- #    file(REMOVE ${RJ_TAR_FILE})
- #endif(NOT RAPIDJSONTEST)
- 
--#find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
-+find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
- 
--#add_library(rapidjson STATIC IMPORTED ${RAPIDJSON})
-+add_library(rapidjson STATIC IMPORTED ${RAPIDJSON})
- 
- # add subdirs
- 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index adebc32..0c52d95 100644
+index fd2c4ad..020adcc 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -83,7 +83,7 @@ target_link_libraries(CemuBin PRIVATE ZLIB::ZLIB)
+@@ -86,7 +86,7 @@ target_link_libraries(CemuBin PRIVATE ZLIB::ZLIB)
  target_link_libraries(CemuBin PRIVATE ${wxWidgets_LIBRARIES})
  target_link_libraries(CemuBin PRIVATE CURL::libcurl)
  target_link_libraries(CemuBin PRIVATE imgui::imgui)
@@ -101,7 +71,7 @@ index adebc32..0c52d95 100644
  target_link_libraries(CemuBin PUBLIC
  CemuCommon CemuAudio CemuInput CemuComponents CemuCafe CemuConfig CemuGui imguiImpl)
 diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp
-index b107e56..c9b7c75 100644
+index 0d41156..a7bcee8 100644
 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp
 +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp
 @@ -7,7 +7,7 @@
@@ -109,7 +79,7 @@ index b107e56..c9b7c75 100644
  
  #include <glslang/Public/ShaderLang.h>
 -#if GLSLANG_VERSION_LESS_OR_EQUAL_TO(11, 0, 0)
-+#if GLSLANG_VERSION_LESS_OR_EQUAL_TO(12, 0, 0)
++#if GLSLANG_VERSION_GREATER_OR_EQUAL_TO(11, 0, 0)
  #include <glslang/SPIRV/GlslangToSpv.h>
  #else
  #include <SPIRV/Logger.h>
@@ -118,33 +88,7 @@ index b107e56..c9b7c75 100644
  	/* .maxMeshViewCountNV = */ 4,
  
 -#if GLSLANG_VERSION_LESS_OR_EQUAL_TO(11, 0, 0)
-+#if GLSLANG_VERSION_LESS_OR_EQUAL_TO(12, 0, 0)
++#if GLSLANG_VERSION_GREATER_OR_EQUAL_TO(11, 0, 0)
  	/* .maxDualSourceDrawBuffersEXT = */ 1,
  #endif
  
-diff --git a/src/Cemu/CMakeLists.txt b/src/Cemu/CMakeLists.txt
-index 8c9136f..7c88c3b 100644
---- a/src/Cemu/CMakeLists.txt
-+++ b/src/Cemu/CMakeLists.txt
-@@ -13,3 +13,4 @@ target_include_directories(CemuComponents PRIVATE ../)
- if(ENABLE_DISCORD_RPC)
- target_link_libraries(CemuComponents PRIVATE discord-rpc)
- endif()
-+target_link_libraries(CemuComponents PRIVATE CemuUtil)
-diff --git a/src/Cemu/Logging/CemuLogging.h b/src/Cemu/Logging/CemuLogging.h
-index 021055d..0463502 100644
---- a/src/Cemu/Logging/CemuLogging.h
-+++ b/src/Cemu/Logging/CemuLogging.h
-@@ -58,9 +58,9 @@ bool cemuLog_log(LogType type, TFmt format, TArgs&&... args)
- 	if (!cemuLog_isLoggingEnabled(type))
- 		return false;
- 
--	const auto format_view = fmt::to_string_view(format);
--	const auto text = fmt::vformat(format_view, fmt::make_args_checked<TArgs...>(format_view, args...));
--	cemuLog_log(type, std::basic_string_view(text.data(), text.size()));
-+	// const auto format_view = fmt::to_string_view(format);
-+	// const auto text = fmt::vformat(format_view, fmt::make_args_checked<TArgs...>(format_view, args...));
-+	// cemuLog_log(type, std::basic_string_view(text.data(), text.size()));
- 	return true;
- }
-