[arch-commits] Commit in libretro-ppsspp/repos/community-x86_64 (5 files)

Maxime Gauduin alucryd at archlinux.org
Fri May 7 07:18:55 UTC 2021


    Date: Friday, May 7, 2021 @ 07:18:54
  Author: alucryd
Revision: 928563

archrelease: copy trunk to community-x86_64

Added:
  libretro-ppsspp/repos/community-x86_64/PKGBUILD
    (from rev 928562, libretro-ppsspp/trunk/PKGBUILD)
  libretro-ppsspp/repos/community-x86_64/libretro-ppsspp-assets-path.patch
    (from rev 928562, libretro-ppsspp/trunk/libretro-ppsspp-assets-path.patch)
  libretro-ppsspp/repos/community-x86_64/libretro-ppsspp-system-zstd.patch
    (from rev 928562, libretro-ppsspp/trunk/libretro-ppsspp-system-zstd.patch)
Deleted:
  libretro-ppsspp/repos/community-x86_64/PKGBUILD
  libretro-ppsspp/repos/community-x86_64/libretro-ppsspp-assets-path.patch

-----------------------------------+
 PKGBUILD                          |  225 ++++++++++++++++++------------------
 libretro-ppsspp-assets-path.patch |   22 +--
 libretro-ppsspp-system-zstd.patch |   42 ++++++
 3 files changed, 168 insertions(+), 121 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 07:18:47 UTC (rev 928562)
+++ PKGBUILD	2021-05-07 07:18:54 UTC (rev 928563)
@@ -1,110 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Wouter Wijsman <wwijsman at live.nl>
-# Contributor: Duck Hunt <vaporeon at tfwno.gf>
-
-pkgname=libretro-ppsspp
-pkgver=29606
-pkgrel=1
-pkgdesc='Sony PlayStation Portable core'
-arch=(x86_64)
-url=https://github.com/libretro/ppsspp
-license=(GPL2)
-groups=(libretro)
-depends=(
-  gcc-libs
-  glew
-  glibc
-  libgl
-  libpng
-  libretro-core-info
-  libzip
-  snappy
-  zlib
-)
-makedepends=(
-  cmake
-  git
-  libglvnd
-  python
-)
-_commit=0328a0d550840687b55f45dddcc0838b2c670aeb
-source=(
-  libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=${_commit}
-  git+https://github.com/Kingcom/armips.git
-  git+https://github.com/discordapp/discord-rpc.git
-  git+https://github.com/hrydgard/ppsspp-ffmpeg.git
-  ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
-  git+https://github.com/hrydgard/ppsspp-lang.git
-  ppsspp-miniupnp::git+https://github.com/hrydgard/miniupnp.git
-  git+https://github.com/Tencent/rapidjson.git
-  git+https://github.com/KhronosGroup/SPIRV-Cross.git
-  armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git
-  libretro-ppsspp-assets-path.patch
-)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            '2234ab0c53849ed728889305a68119a365da16094a1b7ac2c4d2a2ababe5c8f5')
-
-pkgver() {
-  cd libretro-ppsspp
-
-  git rev-list --count HEAD
-}
-
-prepare() {
-  cd libretro-ppsspp
-
-  patch -Np1 -i ../libretro-ppsspp-assets-path.patch
-
-  for submodule in ffmpeg assets/lang ext/glslang ext/miniupnp; do
-    git submodule init ${submodule}
-    git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
-    git submodule update ${submodule}
-  done
-  for submodule in ext/{armips,discord-rpc,rapidjson,SPIRV-Cross}; do
-    git submodule init ${submodule}
-    git config submodule.${submodule}.url ../${submodule#*/}
-    git submodule update ${submodule}
-  done
-
-  cd ext/armips
-
-  for submodule in ext/tinyformat; do
-    git submodule init ${submodule}
-    git config submodule.${submodule}.url ../../../armips-${submodule#*/}
-    git submodule update ${submodule}
-  done
-}
-
-build() {
-  cmake -S libretro-ppsspp -B build \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DOpenGL_GL_PREFERENCE=GLVND \
-    -DHEADLESS=OFF \
-    -DLIBRETRO=ON \
-    -DMOBILE_DEVICE=OFF \
-    -DSIMULATOR=OFF \
-    -DUNITTEST=OFF \
-    -DUSE_SYSTEM_LIBZIP=ON \
-    -DUSE_SYSTEM_SNAPPY=ON \
-    -DUSING_QT_UI=OFF
-  make -C build
-}
-
-package() {
-  install -Dm 644 build/lib/ppsspp_libretro.so -t "${pkgdir}"/usr/lib/libretro/
-  install -Dm 644 libretro-ppsspp/LICENSE.TXT -t "${pkgdir}"/usr/share/licenses/libretro-ppsspp-git/
-  install -dm 755 "${pkgdir}"/usr/share/libretro/ppsspp
-  cp -dr --no-preserve=ownership build/assets "${pkgdir}"/usr/share/libretro/ppsspp/
-}
-
-# vim: ts=2 sw=2 et:

Copied: libretro-ppsspp/repos/community-x86_64/PKGBUILD (from rev 928562, libretro-ppsspp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-07 07:18:54 UTC (rev 928563)
@@ -0,0 +1,115 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Wouter Wijsman <wwijsman at live.nl>
+# Contributor: Duck Hunt <vaporeon at tfwno.gf>
+
+pkgname=libretro-ppsspp
+pkgver=29742
+pkgrel=1
+pkgdesc='Sony PlayStation Portable core'
+arch=(x86_64)
+url=https://github.com/libretro/ppsspp
+license=(GPL2)
+groups=(libretro)
+depends=(
+  gcc-libs
+  glew
+  glibc
+  libgl
+  libpng
+  libretro-core-info
+  libzip
+  snappy
+  zlib
+  zstd
+)
+makedepends=(
+  cmake
+  git
+  libglvnd
+  ninja
+  python
+)
+_commit=4462b0c612986cfdd585885eb56098d19c2181ec
+source=(
+  libretro-ppsspp::git+https://github.com/hrydgard/ppsspp.git#commit=${_commit}
+  git+https://github.com/Kingcom/armips.git
+  git+https://github.com/hrydgard/ppsspp-ffmpeg.git
+  ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
+  git+https://github.com/hrydgard/ppsspp-lang.git
+  ppsspp-miniupnp::git+https://github.com/hrydgard/miniupnp.git
+  git+https://github.com/Tencent/rapidjson.git
+  git+https://github.com/KhronosGroup/SPIRV-Cross.git
+  armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git
+  libretro-ppsspp-assets-path.patch
+  libretro-ppsspp-system-zstd.patch
+)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '2234ab0c53849ed728889305a68119a365da16094a1b7ac2c4d2a2ababe5c8f5'
+            'c65ae3f20976a573b1a74600b02515e3f665513864a49e10db57c2fd170819e7')
+
+pkgver() {
+  cd libretro-ppsspp
+
+  git rev-list --count HEAD
+}
+
+prepare() {
+  cd libretro-ppsspp
+
+  patch -Np1 -i ../libretro-ppsspp-assets-path.patch
+  patch -Np1 -i ../libretro-ppsspp-system-zstd.patch
+
+  for submodule in ffmpeg assets/lang ext/glslang ext/miniupnp; do
+    git submodule init ${submodule}
+    git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
+    git submodule update ${submodule}
+  done
+  for submodule in ext/{armips,rapidjson,SPIRV-Cross}; do
+    git submodule init ${submodule}
+    git config submodule.${submodule}.url ../${submodule#*/}
+    git submodule update ${submodule}
+  done
+
+  cd ext/armips
+
+  for submodule in ext/tinyformat; do
+    git submodule init ${submodule}
+    git config submodule.${submodule}.url ../../../armips-${submodule#*/}
+    git submodule update ${submodule}
+  done
+}
+
+build() {
+  cmake -S libretro-ppsspp -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DOpenGL_GL_PREFERENCE=GLVND \
+    -DHEADLESS=OFF \
+    -DLIBRETRO=ON \
+    -DMOBILE_DEVICE=OFF \
+    -DSIMULATOR=OFF \
+    -DUNITTEST=OFF \
+    -DUSE_SYSTEM_LIBZIP=ON \
+    -DUSE_SYSTEM_SNAPPY=ON \
+    -DUSE_SYSTEM_ZSTD=ON \
+    -DUSING_QT_UI=OFF \
+    -Wno-dev
+  cmake --build build
+}
+
+package() {
+  install -Dm 644 build/lib/ppsspp_libretro.so -t "${pkgdir}"/usr/lib/libretro/
+  install -Dm 644 libretro-ppsspp/LICENSE.TXT -t "${pkgdir}"/usr/share/licenses/libretro-ppsspp-git/
+  install -dm 755 "${pkgdir}"/usr/share/libretro/ppsspp
+  cp -dr --no-preserve=ownership build/assets "${pkgdir}"/usr/share/libretro/ppsspp/
+}
+
+# vim: ts=2 sw=2 et:

Deleted: libretro-ppsspp-assets-path.patch
===================================================================
--- libretro-ppsspp-assets-path.patch	2021-05-07 07:18:47 UTC (rev 928562)
+++ libretro-ppsspp-assets-path.patch	2021-05-07 07:18:54 UTC (rev 928563)
@@ -1,11 +0,0 @@
---- libretro-ppsspp.orig/libretro/libretro.cpp	2020-10-08 22:13:25.641893000 +0200
-+++ libretro-ppsspp/libretro/libretro.cpp	2020-10-10 01:21:00.000136872 +0200
-@@ -601,6 +601,7 @@
-    g_Config.internalDataDirectory = retro_base_dir;
- 
-    VFSRegister("", new DirectoryAssetReader(retro_base_dir.c_str()));
-+   VFSRegister("", new DirectoryAssetReader("/usr/share/libretro/ppsspp/assets/"));
- 
-    coreState = CORE_POWERUP;
-    ctx       = LibretroGraphicsContext::CreateGraphicsContext();
-

Copied: libretro-ppsspp/repos/community-x86_64/libretro-ppsspp-assets-path.patch (from rev 928562, libretro-ppsspp/trunk/libretro-ppsspp-assets-path.patch)
===================================================================
--- libretro-ppsspp-assets-path.patch	                        (rev 0)
+++ libretro-ppsspp-assets-path.patch	2021-05-07 07:18:54 UTC (rev 928563)
@@ -0,0 +1,11 @@
+--- libretro-ppsspp.orig/libretro/libretro.cpp	2020-10-08 22:13:25.641893000 +0200
++++ libretro-ppsspp/libretro/libretro.cpp	2020-10-10 01:21:00.000136872 +0200
+@@ -601,6 +601,7 @@
+    g_Config.internalDataDirectory = retro_base_dir;
+ 
+    VFSRegister("", new DirectoryAssetReader(retro_base_dir.c_str()));
++   VFSRegister("", new DirectoryAssetReader("/usr/share/libretro/ppsspp/assets/"));
+ 
+    coreState = CORE_POWERUP;
+    ctx       = LibretroGraphicsContext::CreateGraphicsContext();
+

Copied: libretro-ppsspp/repos/community-x86_64/libretro-ppsspp-system-zstd.patch (from rev 928562, libretro-ppsspp/trunk/libretro-ppsspp-system-zstd.patch)
===================================================================
--- libretro-ppsspp-system-zstd.patch	                        (rev 0)
+++ libretro-ppsspp-system-zstd.patch	2021-05-07 07:18:54 UTC (rev 928563)
@@ -0,0 +1,42 @@
+diff '--color=auto' -rupN libretro-ppsspp.orig/CMakeLists.txt libretro-ppsspp/CMakeLists.txt
+--- libretro-ppsspp.orig/CMakeLists.txt	2021-05-07 09:02:42.107209058 +0200
++++ libretro-ppsspp/CMakeLists.txt	2021-05-07 09:10:24.353248166 +0200
+@@ -135,6 +135,7 @@ option(USE_MINIUPNPC "Build with miniUPn
+ option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY})
+ option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG})
+ option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP})
++option(USE_SYSTEM_ZSTD "Dynamically link against system zstd" ${USE_SYSTEM_ZSTD})
+ option(USE_ASAN "Use address sanitizer" OFF)
+ option(USE_UBSAN "Use undefined behaviour sanitizer" OFF)
+ 
+@@ -1817,8 +1818,20 @@ if(ANDROID)
+ 	endif()
+ endif()
+ 
+-set(CoreExtraLibs ${CoreExtraLibs} armips libzstd_static)
+-include_directories(ext/zstd/lib)
++set(CoreExtraLibs ${CoreExtraLibs} armips)
++
++find_package(PkgConfig)
++if(PKG_CONFIG_FOUND)
++	pkg_check_modules(ZSTD libzstd)
++endif()
++if(ZSTD_FOUND AND USE_SYSTEM_ZSTD)
++	include_directories(${ZSTD_INCLUDE_DIRS})
++	target_link_libraries(${CoreLibName} ${ZSTD_LIBRARIES})
++else()
++	add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL)
++	include_directories(ext/zstd/lib)
++	set(CoreExtraLibs ${CoreExtraLibs} libzstd_static)
++endif()
+ 
+ # needed for VK_USE_PLATFORM_XCB_KHR only
+ #if(VULKAN AND NOT WIN32)
+diff '--color=auto' -rupN libretro-ppsspp.orig/ext/CMakeLists.txt libretro-ppsspp/ext/CMakeLists.txt
+--- libretro-ppsspp.orig/ext/CMakeLists.txt	2021-05-07 09:02:41.033776512 +0200
++++ libretro-ppsspp/ext/CMakeLists.txt	2021-05-07 09:11:00.643266519 +0200
+@@ -22,4 +22,3 @@ add_subdirectory(SPIRV-Cross-build)
+ if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO)
+ 	add_subdirectory(discord-rpc-build)
+ endif()
+-add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)



More information about the arch-commits mailing list