Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updpatch: libretro-play 8218-2 #3843

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions libretro-play/add-riscv64-build.patch
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,10 +25,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
Expand Down Expand Up @@ -220,3 +220,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
13 changes: 8 additions & 5 deletions libretro-play/riscv64.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
libglvnd
+ simde
)
_commit=1b631a6d5e5b31e802a39b093b65ebf0b697fb89
_commit=ca98a3ca28a863469861400da2b220aa45cb1243
source=(
@@ -35,19 +36,19 @@ source=(
@@ -35,19 +36,21 @@ source=(
git+https://github.com/SDWebImage/SDWebImage.git
git+https://github.com/Cyan4973/xxHash.git
git+https://github.com/facebook/zstd.git
+ add-riscv64-build.patch
+ add-missing-header.patch::https://github.com/jpd002/Play-/pull/1389.diff
)
-b2sums=(
- SKIP
Expand All @@ -26,7 +27,7 @@
- SKIP
- SKIP
-)
+b2sums=('SKIP'
+b2sums=('a8a835b4d8fc94143f5c3c6869f96effc0c1fe1790aa719dbcb5456778bd70f6285cee573b3ea0226459236adb9c81a718c1ba381129e05ecc56b5c7c5ca06fc'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
Expand All @@ -36,17 +37,19 @@
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '046baa04aeaf665ebe8d2f70f8eb18c660e6ae1d36c56b371679c1ae08bed77285f5865fdf93239a4cf433254e0257bb8083ab700fb1dd729ec6c33b5b9eae67')
+ 'a91b12ffb03ae5297de7a900edd98fd96e1bb545c69e5f320970791ef02da96c7e65cf6a4f6fc375f4fd544c5f5e36526240190bfc419ee5c8faffd36ec65335'
+ '048d283259fedf05e3c4bc8587173e7ba740b6bd7346038f1b2e71c02208679d033a16bb1f6944b31f141a6bb792d5000f8fa8d22b7c73e671b89ef390ff2809')

pkgver() {
cd libretro-play
@@ -72,6 +73,9 @@ prepare() {
@@ -72,6 +75,10 @@ prepare() {
git submodule init zstd
git config submodule.zstd.url ../../../zstd
git submodule update
+
+ cd ../..
+ patch -Np1 -i ../add-riscv64-build.patch
+ patch -Np1 -i ../add-missing-header.patch
}

build() {
Loading