Change the ffmpeg version used by ppsspp from the one provided by archlinux to the fork of the ppsspp project
This commit is contained in:
		
							parent
							
								
									e43a3fd50b
								
							
						
					
					
						commit
						c6c325cfed
					
				
							
								
								
									
										16
									
								
								.SRCINFO
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								.SRCINFO
									
									
									
									
									
								
							|  | @ -1,8 +1,8 @@ | ||||||
| # Generated by mksrcinfo v8 | # Generated by mksrcinfo v8 | ||||||
| # Thu Dec 22 09:46:18 UTC 2016 | # Sun Feb 12 16:08:04 UTC 2017 | ||||||
| pkgbase = ppsspp-git | pkgbase = ppsspp-git | ||||||
| 	pkgdesc = A PSP emulator written in C++ | 	pkgdesc = A PSP emulator written in C++ | ||||||
| 	pkgver = 1.3.r229.47ee86ebc | 	pkgver = 1.3.r554.9dd3e18ed | ||||||
| 	pkgrel = 1 | 	pkgrel = 1 | ||||||
| 	url = http://www.ppsspp.org/ | 	url = http://www.ppsspp.org/ | ||||||
| 	arch = i686 | 	arch = i686 | ||||||
|  | @ -20,14 +20,10 @@ pkgbase = ppsspp-git | ||||||
| 	depends = libzip | 	depends = libzip | ||||||
| 	depends = sdl2 | 	depends = sdl2 | ||||||
| 	depends = zlib | 	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.git | ||||||
| 	source = git+https://github.com/hrydgard/ppsspp-lang.git | 	source = git+https://github.com/hrydgard/ppsspp-lang.git | ||||||
| 	source = ppsspp-glslang::git+https://github.com/hrydgard/glslang.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 = ppsspp-armips::git+https://github.com/Kingcom/armips.git | ||||||
| 	source = armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git | 	source = armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git | ||||||
| 	source = ppsspp.desktop | 	source = ppsspp.desktop | ||||||
|  | @ -36,6 +32,7 @@ pkgbase = ppsspp-git | ||||||
| 	sha256sums = SKIP | 	sha256sums = SKIP | ||||||
| 	sha256sums = SKIP | 	sha256sums = SKIP | ||||||
| 	sha256sums = SKIP | 	sha256sums = SKIP | ||||||
|  | 	sha256sums = SKIP | ||||||
| 	sha256sums = 1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8 | 	sha256sums = 1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8 | ||||||
| 
 | 
 | ||||||
| pkgname = ppsspp-git | pkgname = ppsspp-git | ||||||
|  | @ -52,11 +49,6 @@ pkgname = ppsspp-qt-git | ||||||
| 	depends = libzip | 	depends = libzip | ||||||
| 	depends = sdl2 | 	depends = sdl2 | ||||||
| 	depends = zlib | 	depends = zlib | ||||||
| 	depends = libavcodec.so |  | ||||||
| 	depends = libavformat.so |  | ||||||
| 	depends = libavutil.so |  | ||||||
| 	depends = libswresample.so |  | ||||||
| 	depends = libswscale.so |  | ||||||
| 	depends = qt5-base | 	depends = qt5-base | ||||||
| 	depends = qt5-multimedia | 	depends = qt5-multimedia | ||||||
| 	provides = ppsspp | 	provides = ppsspp | ||||||
|  |  | ||||||
							
								
								
									
										14
									
								
								PKGBUILD
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								PKGBUILD
									
									
									
									
									
								
							|  | @ -7,19 +7,18 @@ | ||||||
| 
 | 
 | ||||||
| pkgbase=ppsspp-git | pkgbase=ppsspp-git | ||||||
| pkgname=('ppsspp-git' 'ppsspp-qt-git') | pkgname=('ppsspp-git' 'ppsspp-qt-git') | ||||||
| pkgver=1.3.r229.47ee86ebc | pkgver=1.3.r554.9dd3e18ed | ||||||
| pkgrel=1 | pkgrel=1 | ||||||
| pkgdesc='A PSP emulator written in C++' | pkgdesc='A PSP emulator written in C++' | ||||||
| arch=('i686' 'x86_64') | arch=('i686' 'x86_64') | ||||||
| url='http://www.ppsspp.org/' | url='http://www.ppsspp.org/' | ||||||
| license=('GPL2') | license=('GPL2') | ||||||
| depends=('gcc-libs' 'glew' 'glibc' 'libgl' 'libzip' 'sdl2' 'zlib' | depends=('gcc-libs' 'glew' 'glibc' 'libgl' 'libzip' 'sdl2' 'zlib') | ||||||
|          'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libswresample.so' |  | ||||||
|          'libswscale.so') |  | ||||||
| makedepends=('cmake' 'git' 'glu' 'qt5-multimedia' 'qt5-tools') | makedepends=('cmake' 'git' 'glu' 'qt5-multimedia' 'qt5-tools') | ||||||
| source=('git+https://github.com/hrydgard/ppsspp.git' | source=('git+https://github.com/hrydgard/ppsspp.git' | ||||||
|         'git+https://github.com/hrydgard/ppsspp-lang.git' |         'git+https://github.com/hrydgard/ppsspp-lang.git' | ||||||
|         'ppsspp-glslang::git+https://github.com/hrydgard/glslang.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' |         'ppsspp-armips::git+https://github.com/Kingcom/armips.git' | ||||||
|         'armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git' |         'armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git' | ||||||
|         'ppsspp.desktop') |         'ppsspp.desktop') | ||||||
|  | @ -28,6 +27,7 @@ sha256sums=('SKIP' | ||||||
|             'SKIP' |             'SKIP' | ||||||
|             'SKIP' |             'SKIP' | ||||||
|             'SKIP' |             'SKIP' | ||||||
|  |             'SKIP' | ||||||
|             '1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8') |             '1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8') | ||||||
| 
 | 
 | ||||||
| pkgver() { | pkgver() { | ||||||
|  | @ -39,7 +39,7 @@ pkgver() { | ||||||
| prepare() { | prepare() { | ||||||
|   cd ppsspp |   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 submodule init ${submodule} | ||||||
|     git config submodule.${submodule}.url ../ppsspp-${submodule#*/} |     git config submodule.${submodule}.url ../ppsspp-${submodule#*/} | ||||||
|     git submodule update ${submodule} |     git submodule update ${submodule} | ||||||
|  | @ -64,8 +64,7 @@ build() { | ||||||
| 
 | 
 | ||||||
|   cmake .. \ |   cmake .. \ | ||||||
|     -DCMAKE_BUILD_TYPE='Release' \ |     -DCMAKE_BUILD_TYPE='Release' \ | ||||||
|     -DCMAKE_SKIP_RPATH='ON' \ |     -DCMAKE_SKIP_RPATH='ON'  | ||||||
|     -DUSE_SYSTEM_FFMPEG='ON' |  | ||||||
|   make |   make | ||||||
| 
 | 
 | ||||||
|   cd ../build-qt |   cd ../build-qt | ||||||
|  | @ -73,7 +72,6 @@ build() { | ||||||
|   cmake .. \ |   cmake .. \ | ||||||
|     -DCMAKE_BUILD_TYPE='Release' \ |     -DCMAKE_BUILD_TYPE='Release' \ | ||||||
|     -DCMAKE_SKIP_RPATH='ON' \ |     -DCMAKE_SKIP_RPATH='ON' \ | ||||||
|     -DUSE_SYSTEM_FFMPEG='ON' \ |  | ||||||
|     -DUSING_QT_UI='ON' |     -DUSING_QT_UI='ON' | ||||||
|   make |   make | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user