Remove patch for upstream issue 1034, require glslang 14 or higher

3 files changed, 5 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1ca6f345af1..c7d9b9f44665 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cemu
 	pkgdesc = Software to emulate Wii U games and applications on PC
 	pkgver = 2.0.487
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cemu.info
 	install = cemu.install
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = cemu
 	makedepends = llvm>=12
 	makedepends = ninja
 	makedepends = boost>=1.79
-	makedepends = glslang>=11.8
+	makedepends = glslang>=14
 	makedepends = glm>=0.9.9.8
 	makedepends = rapidjson
 	makedepends = nasm
@@ -38,13 +38,11 @@ pkgbase = cemu
 	source = git+https://github.com/Exzap/ZArchive#commit=d2c717730092c7bf8cbb033b12fd4001b7c4d932
 	source = git+https://github.com/arsenm/sanitizers-cmake#commit=aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a
 	source = git+https://github.com/google/googletest#commit=800f5422ac9d9e0ad59cd860a2ef3a679588acb4
-	source = fix-issue-1034.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 2c6fbe790d5273586fa0c4e818e89ce08d9eb723fa6a1b5ba57160b7c6a7126b
 
 pkgname = cemu
diff --git a/PKGBUILD b/PKGBUILD
index 06d4f3222ca7..4836760f948d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=cemu
 pkgver=2.0.487
-pkgrel=1
+pkgrel=2
 pkgdesc='Software to emulate Wii U games and applications on PC'
 arch=(x86_64)
 url=https://cemu.info
@@ -17,7 +17,7 @@ makedepends=(
 	# build setup
 	git 'cmake>=3.21.1' 'clang>=12' 'llvm>=12' ninja
 	# unbundled vcpkg
-	'boost>=1.79' 'glslang>=11.8' 'glm>=0.9.9.8' rapidjson
+	'boost>=1.79' 'glslang>=14' 'glm>=0.9.9.8' rapidjson
 	# direct cemu dependencies
 	nasm 'vulkan-headers>=1.3.240'
 	# wxwidgets
@@ -39,16 +39,13 @@ source=(
 	# cubeb submodules
 	git+https://github.com/arsenm/sanitizers-cmake#commit=aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a
 	git+https://github.com/google/googletest#commit=800f5422ac9d9e0ad59cd860a2ef3a679588acb4
-	# fix spirv linker error
-	fix-issue-1034.patch
 )
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '2c6fbe790d5273586fa0c4e818e89ce08d9eb723fa6a1b5ba57160b7c6a7126b')
+            'SKIP')
 
 pkgver() {
 	cd Cemu
@@ -89,8 +86,6 @@ prepare() {
 
 	# gamelist column width improvement
 	sed -i '/InsertColumn/s/kListIconWidth/&+8/;/SetColumnWidth/s/last_col_width/&-1/' src/gui/components/wxGameList.cpp
-
-	git apply "${srcdir}/fix-issue-1034.patch"
 }
 
 build() {
diff --git a/fix-issue-1034.patch b/fix-issue-1034.patch
deleted file mode 100644
index 68046eb134ad..000000000000
--- a/fix-issue-1034.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c988508c..ad2c5589 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,7 +128,7 @@ find_package(pugixml REQUIRED)
- find_package(RapidJSON REQUIRED)
- find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED)
- find_package(libzip REQUIRED)
--find_package(glslang REQUIRED)
-+find_package(Vulkan COMPONENTS glslang REQUIRED)
- find_package(ZLIB REQUIRED)
- find_package(zstd MODULE REQUIRED) # MODULE so that zstd::zstd is available
- find_package(OpenSSL COMPONENTS Crypto SSL REQUIRED)
-@@ -136,11 +136,6 @@ find_package(glm REQUIRED)
- find_package(fmt 9 REQUIRED)
- find_package(PNG REQUIRED)
- 
--# glslang versions older than 11.11.0 define targets without a namespace
--if (NOT TARGET glslang::SPIRV AND TARGET SPIRV)
--	add_library(glslang::SPIRV ALIAS SPIRV)
--endif()
--
- if (UNIX AND NOT APPLE)
- 	find_package(X11 REQUIRED)
- 	if (ENABLE_WAYLAND)
-diff --git a/src/Cafe/CMakeLists.txt b/src/Cafe/CMakeLists.txt
-index 29c5a0b3..4d0e8def 100644
---- a/src/Cafe/CMakeLists.txt
-+++ b/src/Cafe/CMakeLists.txt
-@@ -516,7 +516,7 @@ target_link_libraries(CemuCafe PRIVATE
- 	Boost::nowide
- 	CURL::libcurl
- 	fmt::fmt
--	glslang::SPIRV
-+	Vulkan::glslang
- 	ih264d
- 	OpenSSL::Crypto
- 	OpenSSL::SSL