From 0d6e0ad0c6ee8e01ebc1100407a421be602716dd Mon Sep 17 00:00:00 2001 From: moui0 Date: Mon, 17 Jun 2024 15:33:02 +0200 Subject: [PATCH] updpatch: libretro-play 8218-2 --- libretro-play/add-riscv64-build.patch | 30 ++++++++++++++++++++++++--- libretro-play/riscv64.patch | 8 ++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/libretro-play/add-riscv64-build.patch b/libretro-play/add-riscv64-build.patch index 3a08d73e2..c8ce804e6 100644 --- a/libretro-play/add-riscv64-build.patch +++ b/libretro-play/add-riscv64-build.patch @@ -1,5 +1,5 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index dfb0ce09..b3e77d02 100644 +index df3903bf..b1ca66a7 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -34,7 +34,7 @@ if(TARGET_PLATFORM_ANDROID OR TARGET_PLATFORM_IOS OR TARGET_PLATFORM_JS OR BUILD @@ -11,6 +11,17 @@ index dfb0ce09..b3e77d02 100644 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -mssse3") endif() +diff --git a/Source/ee/IPU.h b/Source/ee/IPU.h +index 2c860a19..a46cb5c8 100644 +--- a/Source/ee/IPU.h ++++ b/Source/ee/IPU.h +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + #include + #include "Types.h" diff --git a/Source/gs/GSH_OpenGL/CMakeLists.txt b/Source/gs/GSH_OpenGL/CMakeLists.txt index ab40170d..a2da9da5 100644 --- a/Source/gs/GSH_OpenGL/CMakeLists.txt @@ -25,10 +36,10 @@ index ab40170d..a2da9da5 100644 endif() diff --git a/Source/gs/GSH_OpenGL/GSH_OpenGL_Texture.cpp b/Source/gs/GSH_OpenGL/GSH_OpenGL_Texture.cpp -index 0a903513..f0171797 100644 +index 01a12176..44c3bc7a 100644 --- a/Source/gs/GSH_OpenGL/GSH_OpenGL_Texture.cpp +++ b/Source/gs/GSH_OpenGL/GSH_OpenGL_Texture.cpp -@@ -567,13 +567,127 @@ inline void convertColumn4(uint8* dest, const int destStride, uint8* src, int co +@@ -547,13 +547,127 @@ inline void convertColumn4(uint8* dest, const int destStride, uint8* src, int co } #else @@ -220,3 +231,16 @@ index d2a9d04..1253ce7 100644 endif() endif() +Submodule deps/Framework contains modified content +diff --git a/deps/Framework/include/SimdDefs.h b/deps/Framework/include/SimdDefs.h +index be7e2e1..88f0622 100644 +--- a/deps/Framework/include/SimdDefs.h ++++ b/deps/Framework/include/SimdDefs.h +@@ -19,6 +19,6 @@ + #define FRAMEWORK_SIMD_USE_NEON + #endif + +-#if !defined(FRAMEWORK_SIMD_USE_SSE) && !defined(FRAMEWORK_SIMD_USE_NEON) ++#if !defined(FRAMEWORK_SIMD_USE_SSE) && !defined(FRAMEWORK_SIMD_USE_NEON) && !(defined(__riscv) && (__riscv_xlen == 64)) + #error No SIMD instrinsics available for this platform. + #endif diff --git a/libretro-play/riscv64.patch b/libretro-play/riscv64.patch index d1134e789..2e317564e 100644 --- a/libretro-play/riscv64.patch +++ b/libretro-play/riscv64.patch @@ -1,3 +1,5 @@ +diff --git PKGBUILD PKGBUILD +index 2b8d915..1b41060 100644 --- PKGBUILD +++ PKGBUILD @@ -22,6 +22,7 @@ makedepends=( @@ -6,7 +8,7 @@ libglvnd + simde ) - _commit=1b631a6d5e5b31e802a39b093b65ebf0b697fb89 + _commit=ca98a3ca28a863469861400da2b220aa45cb1243 source=( @@ -35,19 +36,19 @@ source=( git+https://github.com/SDWebImage/SDWebImage.git @@ -26,7 +28,7 @@ - SKIP - SKIP -) -+b2sums=('SKIP' ++b2sums=('a8a835b4d8fc94143f5c3c6869f96effc0c1fe1790aa719dbcb5456778bd70f6285cee573b3ea0226459236adb9c81a718c1ba381129e05ecc56b5c7c5ca06fc' + 'SKIP' + 'SKIP' + 'SKIP' @@ -36,7 +38,7 @@ + 'SKIP' + 'SKIP' + 'SKIP' -+ '046baa04aeaf665ebe8d2f70f8eb18c660e6ae1d36c56b371679c1ae08bed77285f5865fdf93239a4cf433254e0257bb8083ab700fb1dd729ec6c33b5b9eae67') ++ '2d919fce01c0aa4704ffe8619b941b8ae1b2a3d0cb2d69b75ca9eb30e58ae0bb9b9868c3f77aa95028e94366c3434a41119248943e8ab14e632562b1d7fa7e3b') pkgver() { cd libretro-play