[arch-commits] Commit in ppsspp/repos/community-x86_64 (6 files)
Maxime Gauduin
alucryd at archlinux.org
Sat Apr 11 18:58:43 UTC 2020
Date: Saturday, April 11, 2020 @ 18:58:43
Author: alucryd
Revision: 613353
archrelease: copy trunk to community-x86_64
Added:
ppsspp/repos/community-x86_64/PKGBUILD
(from rev 613352, ppsspp/trunk/PKGBUILD)
ppsspp/repos/community-x86_64/ppsspp-flags.patch
(from rev 613352, ppsspp/trunk/ppsspp-flags.patch)
ppsspp/repos/community-x86_64/ppsspp-qt.desktop
(from rev 613352, ppsspp/trunk/ppsspp-qt.desktop)
ppsspp/repos/community-x86_64/ppsspp-sdl.desktop
(from rev 613352, ppsspp/trunk/ppsspp-sdl.desktop)
Deleted:
ppsspp/repos/community-x86_64/PKGBUILD
ppsspp/repos/community-x86_64/ppsspp-flags.patch
--------------------+
PKGBUILD | 267 ++++++++++++++++++++++++++-------------------------
ppsspp-flags.patch | 66 ++++++------
ppsspp-qt.desktop | 9 +
ppsspp-sdl.desktop | 9 +
4 files changed, 191 insertions(+), 160 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-11 18:58:33 UTC (rev 613352)
+++ PKGBUILD 2020-04-11 18:58:43 UTC (rev 613353)
@@ -1,127 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Ben Reedy <thebenj88 at gmail.com>
-# Contributor: Clement Guerin <geecko.dev at free.fr>
-# Contributor: Thiago Kenji Okada <thiago.mast3r at gmail.com>
-
-pkgname=ppsspp
-pkgver=1.9.4
-pkgrel=2
-pkgdesc='A PSP emulator written in C++'
-arch=(x86_64)
-url=https://www.ppsspp.org/
-license=(GPL2)
-depends=(
- gcc-libs
- glew
- glibc
- hicolor-icon-theme
- libavcodec.so
- libavformat.so
- libavutil.so
- libgl
- libswresample.so
- libswscale.so
- libzip
- qt5-base
- sdl2
- snappy
- zlib
-)
-makedepends=(
- cmake
- git
- libglvnd
- python
- qt5-tools
-)
-provides=(
- ppsspp-headless
- ppsspp-qt
-)
-conflicts=(
- ppsspp-headless
- ppsspp-qt
-)
-replaces=(
- ppsspp-headless
- ppsspp-qt
-)
-source=(
- git+https://github.com/hrydgard/ppsspp.git#tag=e3c9793cb3a68ec9f44371c7ebb45a0abed1ecca
- git+https://github.com/Kingcom/armips.git
- git+https://github.com/discordapp/discord-rpc.git
- ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
- git+https://github.com/hrydgard/ppsspp-lang.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
- ppsspp.desktop
- ppsspp-flags.patch
-)
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '93685b9f05322fa24753fc857bf63da7d6e0ee1bcb7e2167ba7600f38079e277'
- '6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278')
-
-pkgver() {
- cd ppsspp
-
- git describe --tags | sed 's/^v//'
-}
-
-prepare() {
- cd ppsspp
-
- patch -Np1 -i ../ppsspp-flags.patch
-
- for submodule in assets/lang ext/glslang; 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 ppsspp -B build \
- -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_SKIP_RPATH=ON \
- -DHEADLESS=ON \
- -DUSE_SYSTEM_FFMPEG=ON \
- -DUSE_SYSTEM_LIBZIP=ON \
- -DUSE_SYSTEM_SNAPPY=ON \
- -DUSING_QT_UI=ON
- make -C build
-}
-
-package() {
- install -Dm 755 build/PPSSPPHeadless -t "${pkgdir}"/usr/bin/
- install -Dm 755 build/PPSSPPQt -t "${pkgdir}"/usr/bin/
- install -dm 755 "${pkgdir}"/usr/share/{icons,ppsspp}
- cp -dr --no-preserve=ownership build/assets "${pkgdir}"/usr/share/ppsspp/
- cp -dr --no-preserve=ownership ppsspp/icons/hicolor "${pkgdir}"/usr/share/icons/
- install -Dm 644 ppsspp/icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg
- install -Dm 644 ppsspp.desktop -t "${pkgdir}"/usr/share/applications/
-}
-
-# vim: ts=2 sw=2 et:
Copied: ppsspp/repos/community-x86_64/PKGBUILD (from rev 613352, ppsspp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-11 18:58:43 UTC (rev 613353)
@@ -0,0 +1,140 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Ben Reedy <thebenj88 at gmail.com>
+# Contributor: Clement Guerin <geecko.dev at free.fr>
+# Contributor: Thiago Kenji Okada <thiago.mast3r at gmail.com>
+
+pkgname=ppsspp
+pkgver=1.9.4
+pkgrel=3
+pkgdesc='A PSP emulator written in C++'
+arch=(x86_64)
+url=https://www.ppsspp.org/
+license=(GPL2)
+depends=(
+ gcc-libs
+ glew
+ glibc
+ hicolor-icon-theme
+ libavcodec.so
+ libavformat.so
+ libavutil.so
+ libgl
+ libswresample.so
+ libswscale.so
+ libzip
+ qt5-base
+ sdl2
+ snappy
+ zlib
+)
+makedepends=(
+ cmake
+ git
+ libglvnd
+ python
+ qt5-tools
+)
+provides=(
+ ppsspp-headless
+ ppsspp-qt
+)
+conflicts=(
+ ppsspp-headless
+ ppsspp-qt
+)
+replaces=(
+ ppsspp-headless
+ ppsspp-qt
+)
+source=(
+ git+https://github.com/hrydgard/ppsspp.git#tag=e3c9793cb3a68ec9f44371c7ebb45a0abed1ecca
+ git+https://github.com/Kingcom/armips.git
+ git+https://github.com/discordapp/discord-rpc.git
+ ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
+ git+https://github.com/hrydgard/ppsspp-lang.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
+ ppsspp-sdl.desktop
+ ppsspp-qt.desktop
+ ppsspp-flags.patch
+)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '47977bbdc36cd9eebe74b204e69aa8c0eb39b1ec66d89e7b90b1c216e5778d8d'
+ '7df9274e8f404a8009042a529729ca43332c264cff032f32b2ce1bf5adf04042'
+ '6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278')
+
+pkgver() {
+ cd ppsspp
+
+ git describe --tags | sed 's/^v//'
+}
+
+prepare() {
+ cd ppsspp
+
+ patch -Np1 -i ../ppsspp-flags.patch
+
+ for submodule in assets/lang ext/glslang; 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 ppsspp -B build-sdl \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DHEADLESS=ON \
+ -DUSE_SYSTEM_FFMPEG=ON \
+ -DUSE_SYSTEM_LIBZIP=ON \
+ -DUSE_SYSTEM_SNAPPY=ON \
+ -DUSING_QT_UI=OFF
+ make -C build-sdl
+ cmake -S ppsspp -B build-qt \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DHEADLESS=OFF \
+ -DUSE_SYSTEM_FFMPEG=ON \
+ -DUSE_SYSTEM_LIBZIP=ON \
+ -DUSE_SYSTEM_SNAPPY=ON \
+ -DUSING_QT_UI=ON
+ make -C build-qt
+}
+
+package() {
+ install -Dm 755 build-sdl/PPSSPPSDL -t "${pkgdir}"/usr/bin/
+ install -Dm 755 build-sdl/PPSSPPHeadless -t "${pkgdir}"/usr/bin/
+ install -Dm 755 build-qt/PPSSPPQt -t "${pkgdir}"/usr/bin/
+ install -dm 755 "${pkgdir}"/usr/share/{icons,ppsspp}
+ cp -dr --no-preserve=ownership build-sdl/assets "${pkgdir}"/usr/share/ppsspp/
+ cp -dr --no-preserve=ownership ppsspp/icons/hicolor "${pkgdir}"/usr/share/icons/
+ install -Dm 644 ppsspp/icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg
+ install -Dm 644 ppsspp-sdl.desktop -t "${pkgdir}"/usr/share/applications/
+ install -Dm 644 ppsspp-qt.desktop -t "${pkgdir}"/usr/share/applications/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: ppsspp-flags.patch
===================================================================
--- ppsspp-flags.patch 2020-04-11 18:58:33 UTC (rev 613352)
+++ ppsspp-flags.patch 2020-04-11 18:58:43 UTC (rev 613353)
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19038c88a436..bf50f5cf52fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,11 +195,11 @@ if(NOT MSVC)
-
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
-- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
-- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- #TODO: Remove this and include the file properly everywhere it makes sense
- # First step is too use the macros everywhere
-@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
-
- if (NOT MSVC)
- # These can be fast even for debug.
-- set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
-- set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
-+ set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
- if(NOT ZLIB_FOUND)
-- set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
- endif()
- endif()
-
-
Copied: ppsspp/repos/community-x86_64/ppsspp-flags.patch (from rev 613352, ppsspp/trunk/ppsspp-flags.patch)
===================================================================
--- ppsspp-flags.patch (rev 0)
+++ ppsspp-flags.patch 2020-04-11 18:58:43 UTC (rev 613353)
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19038c88a436..bf50f5cf52fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,11 +195,11 @@ if(NOT MSVC)
+
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
+ #TODO: Remove this and include the file properly everywhere it makes sense
+ # First step is too use the macros everywhere
+@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
+
+ if (NOT MSVC)
+ # These can be fast even for debug.
+- set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
+- set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
++ set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
++ set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
+ if(NOT ZLIB_FOUND)
+- set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
++ set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
+ endif()
+ endif()
+
+
Copied: ppsspp/repos/community-x86_64/ppsspp-qt.desktop (from rev 613352, ppsspp/trunk/ppsspp-qt.desktop)
===================================================================
--- ppsspp-qt.desktop (rev 0)
+++ ppsspp-qt.desktop 2020-04-11 18:58:43 UTC (rev 613353)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=PPSSPP (Qt)
+GenericName=PSP Emulator
+Comment=PlayStation Portable Simulator Suitable for Playing Portably
+Exec=PPSSPPQt %f
+Icon=ppsspp
+Categories=Game
Copied: ppsspp/repos/community-x86_64/ppsspp-sdl.desktop (from rev 613352, ppsspp/trunk/ppsspp-sdl.desktop)
===================================================================
--- ppsspp-sdl.desktop (rev 0)
+++ ppsspp-sdl.desktop 2020-04-11 18:58:43 UTC (rev 613353)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=PPSSPP (SDL)
+GenericName=PSP Emulator
+Comment=PlayStation Portable Simulator Suitable for Playing Portably
+Exec=PPSSPPSDL %f
+Icon=ppsspp
+Categories=Game
More information about the arch-commits
mailing list