[arch-commits] Commit in ppsspp/repos/community-x86_64 (9 files)
Maxime Gauduin
alucryd at archlinux.org
Tue Mar 24 15:30:14 UTC 2020
Date: Tuesday, March 24, 2020 @ 15:30:14
Author: alucryd
Revision: 603866
archrelease: copy trunk to community-x86_64
Added:
ppsspp/repos/community-x86_64/PKGBUILD
(from rev 603865, ppsspp/trunk/PKGBUILD)
ppsspp/repos/community-x86_64/ppsspp-flags.patch
(from rev 603865, ppsspp/trunk/ppsspp-flags.patch)
Deleted:
ppsspp/repos/community-x86_64/PKGBUILD
ppsspp/repos/community-x86_64/ppsspp-flags.patch
ppsspp/repos/community-x86_64/ppsspp-headless.sh
ppsspp/repos/community-x86_64/ppsspp-qt.desktop
ppsspp/repos/community-x86_64/ppsspp-qt.sh
ppsspp/repos/community-x86_64/ppsspp.desktop
ppsspp/repos/community-x86_64/ppsspp.sh
--------------------+
PKGBUILD | 300 +++++++++++++++++++++------------------------------
ppsspp-flags.patch | 66 +++++------
ppsspp-headless.sh | 4
ppsspp-qt.desktop | 9 -
ppsspp-qt.sh | 4
ppsspp.desktop | 9 -
ppsspp.sh | 4
7 files changed, 160 insertions(+), 236 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-24 15:30:06 UTC (rev 603865)
+++ PKGBUILD 2020-03-24 15:30:14 UTC (rev 603866)
@@ -1,173 +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>
-
-pkgbase=ppsspp
-pkgname=(
- ppsspp
- ppsspp-headless
- ppsspp-qt
-)
-pkgver=1.9.4
-pkgrel=1
-pkgdesc='A PSP emulator written in C++'
-arch=(x86_64)
-url=https://www.ppsspp.org/
-license=(GPL2)
-depends=(
- glew
- libgl
- sdl2
- zlib
-)
-makedepends=(
- cmake
- git
- libglvnd
- libzip
- python
- qt5-tools
-)
-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-ffmpeg::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
- 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.sh
- ppsspp-headless.sh
- ppsspp-qt.sh
- ppsspp.desktop
- ppsspp-qt.desktop
- ppsspp-flags.patch
-)
-sha256sums=(
- SKIP
- SKIP
- SKIP
- SKIP
- SKIP
- SKIP
- SKIP
- SKIP
- SKIP
- 2c2d1ee6d1ce5c2acec372d58b8079885f6d5d674633cfea489cd550252a5426
- 1236ce000bb670ee2c0e0645c3d55f4d8c8e74dbc35a1af0962a3bdd7608f1c5
- 828b06aacc56672a4d953d77342717c5be414a68261025f74e466abd084b8e6b
- 1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8
- b3b1fb9e0ecd3c4472b51f27d028a69514b1a3823c26e33da6ffaebfb1522b7f
- 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 ffmpeg; 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
-
- pushd ext/armips
-
- for submodule in ext/tinyformat; do
- git submodule init ${submodule}
- git config submodule.${submodule}.url ../../../armips-${submodule#*/}
- git submodule update ${submodule}
- done
-
- popd
-
- for ui in sdl qt; do
- if [[ -d build-$ui ]]; then
- rm -rf build-$ui
- fi
- mkdir build-$ui
- done
-}
-
-build() {
- cd ppsspp/build-sdl
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_SKIP_RPATH='ON' \
- -DHEADLESS='ON' \
- -DUSE_SYSTEM_LIBZIP='ON'
- make
-
- cd ../build-qt
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_SKIP_RPATH='ON' \
- -DUSE_SYSTEM_LIBZIP='ON' \
- -DUSING_QT_UI='ON'
- make
-}
-
-package_ppsspp() {
- depends+=(
- hicolor-icon-theme
- libzip
- )
-
- cd ppsspp/build-sdl
-
- install -dm 755 "${pkgdir}"/{opt/ppsspp,usr/{bin,share/{applications,icons,pixmaps}}}
- install -m 755 PPSSPPSDL "${pkgdir}"/opt/ppsspp/
- cp -dr --no-preserve='ownership' assets "${pkgdir}"/opt/ppsspp/
- cp -dr --no-preserve='ownership' ../icons/hicolor "${pkgdir}"/usr/share/icons/
- install -m 644 ../icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg
- install -m 755 ../../ppsspp.sh "${pkgdir}"/usr/bin/ppsspp
- install -m 644 ../../ppsspp.desktop "${pkgdir}"/usr/share/applications/
-}
-
-package_ppsspp-headless() {
- cd ppsspp/build-sdl
-
- install -dm 755 "${pkgdir}"/{opt/ppsspp,usr/bin}
- install -m 755 PPSSPPHeadless "${pkgdir}"/opt/ppsspp/
- install -m 755 ../../ppsspp-headless.sh "${pkgdir}"/usr/bin/ppsspp-headless
-}
-
-package_ppsspp-qt() {
- depends+=(
- hicolor-icon-theme
- libzip
- qt5-base
- )
- provides=(ppsspp)
- conflicts=(ppsspp)
-
- cd ppsspp/build-qt
-
- install -dm 755 "${pkgdir}"/{opt/ppsspp,usr/{bin,share/{applications,icons,pixmaps}}}
- install -m 755 PPSSPPQt "${pkgdir}"/opt/ppsspp/
- cp -dr --no-preserve='ownership' assets "${pkgdir}"/opt/ppsspp/
- cp -dr --no-preserve='ownership' ../icons/hicolor "${pkgdir}"/usr/share/icons/
- install -m 644 ../icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg
- install -m 755 ../../ppsspp-qt.sh "${pkgdir}"/usr/bin/ppsspp-qt
- install -m 644 ../../ppsspp-qt.desktop "${pkgdir}"/usr/share/applications/
-}
-
-# vim: ts=2 sw=2 et:
Copied: ppsspp/repos/community-x86_64/PKGBUILD (from rev 603865, ppsspp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-24 15:30:14 UTC (rev 603866)
@@ -0,0 +1,127 @@
+# 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:
Deleted: ppsspp-flags.patch
===================================================================
--- ppsspp-flags.patch 2020-03-24 15:30:06 UTC (rev 603865)
+++ ppsspp-flags.patch 2020-03-24 15:30:14 UTC (rev 603866)
@@ -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 603865, ppsspp/trunk/ppsspp-flags.patch)
===================================================================
--- ppsspp-flags.patch (rev 0)
+++ ppsspp-flags.patch 2020-03-24 15:30:14 UTC (rev 603866)
@@ -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()
+
+
Deleted: ppsspp-headless.sh
===================================================================
--- ppsspp-headless.sh 2020-03-24 15:30:06 UTC (rev 603865)
+++ ppsspp-headless.sh 2020-03-24 15:30:14 UTC (rev 603866)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/ppsspp
-exec ./PPSSPPHeadless "$@"
Deleted: ppsspp-qt.desktop
===================================================================
--- ppsspp-qt.desktop 2020-03-24 15:30:06 UTC (rev 603865)
+++ ppsspp-qt.desktop 2020-03-24 15:30:14 UTC (rev 603866)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=PPSSPP (Qt)
-GenericName=PSP Emulator
-Comment=PlayStation Portable Simulator Suitable for Playing Portably (PPSSPP)
-Exec=ppsspp-qt %f
-Icon=ppsspp
-Categories=Game
Deleted: ppsspp-qt.sh
===================================================================
--- ppsspp-qt.sh 2020-03-24 15:30:06 UTC (rev 603865)
+++ ppsspp-qt.sh 2020-03-24 15:30:14 UTC (rev 603866)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/ppsspp
-exec ./PPSSPPQt "$@"
Deleted: ppsspp.desktop
===================================================================
--- ppsspp.desktop 2020-03-24 15:30:06 UTC (rev 603865)
+++ ppsspp.desktop 2020-03-24 15:30:14 UTC (rev 603866)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=PPSSPP
-GenericName=PSP Emulator
-Comment=PlayStation Portable Simulator Suitable for Playing Portably (PPSSPP)
-Exec=ppsspp %f
-Icon=ppsspp
-Categories=Game
Deleted: ppsspp.sh
===================================================================
--- ppsspp.sh 2020-03-24 15:30:06 UTC (rev 603865)
+++ ppsspp.sh 2020-03-24 15:30:14 UTC (rev 603866)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /opt/ppsspp
-exec ./PPSSPPSDL "$@"
More information about the arch-commits
mailing list