testing/cemu: upgrade to 2.1

This commit is contained in:
Joshua Murphy 2024-08-27 17:19:07 -04:00 committed by omni
parent 20e42cd558
commit 8b82696a9c
2 changed files with 5 additions and 52 deletions

View File

@ -1,9 +1,8 @@
# Contributor: Joshua Murphy <joshuamurphy@posteo.net>
# Maintainer: Joshua Murphy <joshuamurphy@posteo.net>
pkgname=cemu
pkgver=2.0.61
_pkgver=2.0-61
pkgrel=2
pkgver=2.1
pkgrel=0
_cubeb=2071354a69aca7ed6df3b4222e305746c2113f60
_imgui=f65bcf481ab34cd07d3909aab1479f409fa79f2f
pkgdesc="Wii U Emulator"
@ -45,14 +44,13 @@ makedepends="
zstd-dev
"
subpackages="$pkgname-lang"
source="$pkgname-$_pkgver.tar.gz::https://github.com/cemu-project/Cemu/archive/v$_pkgver.tar.gz
source="$pkgname-$pkgver.tar.gz::https://github.com/cemu-project/Cemu/archive/v$pkgver.tar.gz
cubeb-$_cubeb.tar.gz::https://github.com/mozilla/cubeb/archive/$_cubeb.tar.gz
imgui-$_imgui.tar.gz::https://github.com/ocornut/imgui/archive/$_imgui.tar.gz
cmake-fixes.patch
execinfo.patch
glslang-headers.patch
"
builddir="$srcdir/Cemu-$_pkgver"
builddir="$srcdir/Cemu-$pkgver"
options="!check" # no tests
prepare() {
@ -77,7 +75,6 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_DISCORD_RPC=OFF \
-DENABLE_VCPKG=OFF \
-DPORTABLE=OFF \
-DUSE_SANITIZERS=OFF \
$crossopts
cmake --build build
@ -101,10 +98,9 @@ lang() {
}
sha512sums="
573b9795201066a6a1375095f586d08df1c01c8be609a638d1c3164c99e73468357199912079c8099608716bd631dc609bf86a12528eaf72bdbafb4a70caf0ff cemu-2.0-61.tar.gz
489ea230ea99b68a554bb048803987a152f3df80356862ac9b29d34e3a8aa18f02f29598b1edfbd242bea8c29ecfd88748d042a742a3d010338c7d464f864e03 cemu-2.1.tar.gz
64a25d58f6a842947ac8ee1125574fc6a34b261e97a11a9fcdf27cccaf35dad49f12f3f2d8abb1e057932059629c3e568421cf2c09b064d76de21c1a8d8542a3 cubeb-2071354a69aca7ed6df3b4222e305746c2113f60.tar.gz
6e5bbede4435bd7248ae426eed519d702c5770ac211d2cf18c4b9f9fa7e83b901e4f80662c0f39e1d688bc3eaf674dd21c9d3e42e7324e5ab9bc16af67c13429 imgui-f65bcf481ab34cd07d3909aab1479f409fa79f2f.tar.gz
79d1fd6c733094a50e11622ec611cd06ca609bb088210ba00534f846209dc7f1f09f8308ba0c04f60b37871218155dd1865df290ecffdc4275d6c5c703da6e6a cmake-fixes.patch
0467091365c2cdb475bb6034115be4998af71803e351e5fdf7591a640eb328a22c7cc27c2760096410e2fd597989e6986e3fb6fceb91acde5ea47cdf9ba2bce6 execinfo.patch
aeda1c3bd458233e97a8a2bc5cb97f0656a08635dbe1a7bbe74fc7022f4035bba77f4c39a67649894b78fff6bbfec086d3653435a9ec6e3e6348ef98a690eff1 glslang-headers.patch
"

View File

@ -1,43 +0,0 @@
From 9e50207d1c7bbd69a3b8805de6d39e294eb876f3 Mon Sep 17 00:00:00 2001
From: Mike Lothian <mike@fireburn.co.uk>
Date: Fri, 19 Jan 2024 01:03:57 +0000
Subject: [PATCH] Vulkan: Don't use glslang internal headers
Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
---
src/Cafe/HW/Latte/Renderer/Vulkan/VKRPipelineInfo.cpp | 3 +--
src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VKRPipelineInfo.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VKRPipelineInfo.cpp
index e9936c434..72a1be4c2 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VKRPipelineInfo.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VKRPipelineInfo.cpp
@@ -3,7 +3,6 @@
#include "Cafe/HW/Latte/Renderer/Vulkan/LatteTextureVk.h"
#include "Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h"
-#include <glslang/Include/Types.h>
#include "Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompiler.h"
#include "Cafe/HW/Latte/Core/LattePerformanceMonitor.h"
@@ -91,4 +90,4 @@ PipelineInfo::~PipelineInfo()
// remove from cache
VulkanRenderer::GetInstance()->unregisterGraphicsPipeline(this);
-}
\ No newline at end of file
+}
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
index 44214606e..616f57e24 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
@@ -26,7 +26,7 @@
#include "Cafe/HW/Latte/Core/LatteTiming.h" // vsync control
-#include <glslang/Include/Types.h>
+#include <glslang/Public/ShaderLang.h>
#include <wx/msgdlg.h>