summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Torsello2017-02-12 17:20:34 +0100
committerMarco Torsello2017-02-12 17:20:34 +0100
commitc6c325cfed8697e2b5ecc5de353b56cdaab7d94e (patch)
tree915b27cace27695a484da972903794fd5d5ce3ed
parente43a3fd50b7f660125bd08b5cb9588c4e468db73 (diff)
downloadaur-c6c325cfed8697e2b5ecc5de353b56cdaab7d94e.tar.gz
Change the ffmpeg version used by ppsspp from the one provided by archlinux to the fork of the ppsspp project
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD14
2 files changed, 10 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 58e61de1c82..75d9d3c0b8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Dec 22 09:46:18 UTC 2016
+# Sun Feb 12 16:08:04 UTC 2017
pkgbase = ppsspp-git
pkgdesc = A PSP emulator written in C++
- pkgver = 1.3.r229.47ee86ebc
+ pkgver = 1.3.r554.9dd3e18ed
pkgrel = 1
url = http://www.ppsspp.org/
arch = i686
@@ -20,14 +20,10 @@ pkgbase = ppsspp-git
depends = libzip
depends = sdl2
depends = zlib
- depends = libavcodec.so
- depends = libavformat.so
- depends = libavutil.so
- depends = libswresample.so
- depends = libswscale.so
source = git+https://github.com/hrydgard/ppsspp.git
source = git+https://github.com/hrydgard/ppsspp-lang.git
source = ppsspp-glslang::git+https://github.com/hrydgard/glslang.git
+ source = ppsspp-ffmpeg::git+https://github.com/hrydgard/ppsspp-ffmpeg.git
source = ppsspp-armips::git+https://github.com/Kingcom/armips.git
source = armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git
source = ppsspp.desktop
@@ -36,6 +32,7 @@ pkgbase = ppsspp-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = 1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8
pkgname = ppsspp-git
@@ -52,11 +49,6 @@ pkgname = ppsspp-qt-git
depends = libzip
depends = sdl2
depends = zlib
- depends = libavcodec.so
- depends = libavformat.so
- depends = libavutil.so
- depends = libswresample.so
- depends = libswscale.so
depends = qt5-base
depends = qt5-multimedia
provides = ppsspp
diff --git a/PKGBUILD b/PKGBUILD
index 4507c57f917..1e5f45b8784 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,18 @@
pkgbase=ppsspp-git
pkgname=('ppsspp-git' 'ppsspp-qt-git')
-pkgver=1.3.r229.47ee86ebc
+pkgver=1.3.r554.9dd3e18ed
pkgrel=1
pkgdesc='A PSP emulator written in C++'
arch=('i686' 'x86_64')
url='http://www.ppsspp.org/'
license=('GPL2')
-depends=('gcc-libs' 'glew' 'glibc' 'libgl' 'libzip' 'sdl2' 'zlib'
- 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswresample.so'
- 'libswscale.so')
+depends=('gcc-libs' 'glew' 'glibc' 'libgl' 'libzip' 'sdl2' 'zlib')
makedepends=('cmake' 'git' 'glu' 'qt5-multimedia' 'qt5-tools')
source=('git+https://github.com/hrydgard/ppsspp.git'
'git+https://github.com/hrydgard/ppsspp-lang.git'
'ppsspp-glslang::git+https://github.com/hrydgard/glslang.git'
+ 'ppsspp-ffmpeg::git+https://github.com/hrydgard/ppsspp-ffmpeg.git'
'ppsspp-armips::git+https://github.com/Kingcom/armips.git'
'armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git'
'ppsspp.desktop')
@@ -28,6 +27,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8')
pkgver() {
@@ -39,7 +39,7 @@ pkgver() {
prepare() {
cd ppsspp
- for submodule in assets/lang ext/{armips,glslang}; do
+ for submodule in assets/lang ext/{armips,glslang} ffmpeg; do
git submodule init ${submodule}
git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
git submodule update ${submodule}
@@ -64,8 +64,7 @@ build() {
cmake .. \
-DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_SKIP_RPATH='ON' \
- -DUSE_SYSTEM_FFMPEG='ON'
+ -DCMAKE_SKIP_RPATH='ON'
make
cd ../build-qt
@@ -73,7 +72,6 @@ build() {
cmake .. \
-DCMAKE_BUILD_TYPE='Release' \
-DCMAKE_SKIP_RPATH='ON' \
- -DUSE_SYSTEM_FFMPEG='ON' \
-DUSING_QT_UI='ON'
make
}