[arch-commits] Commit in ppsspp/trunk (4 files)

2017-05-26 Thread Maxime Gauduin
Date: Friday, May 26, 2017 @ 10:35:25
  Author: alucryd
Revision: 230444

upgpkg: ppsspp 1.4.1-1

Modified:
  ppsspp/trunk/PKGBUILD
  ppsspp/trunk/ppsspp-headless.sh
  ppsspp/trunk/ppsspp-qt.sh
  ppsspp/trunk/ppsspp.sh

+
 PKGBUILD   |   14 +++---
 ppsspp-headless.sh |2 +-
 ppsspp-qt.sh   |2 +-
 ppsspp.sh  |2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-26 10:18:43 UTC (rev 230443)
+++ PKGBUILD2017-05-26 10:35:25 UTC (rev 230444)
@@ -7,8 +7,8 @@
 
 pkgbase=ppsspp
 pkgname=('ppsspp' 'ppsspp-headless' 'ppsspp-qt')
-pkgver=1.4
-pkgrel=3
+pkgver=1.4.1
+pkgrel=1
 pkgdesc='A PSP emulator written in C++'
 arch=('x86_64')
 url='http://www.ppsspp.org/'
@@ -15,11 +15,11 @@
 license=('GPL2')
 depends=('glew' 'sdl2')
 makedepends=('cmake' 'git' 'glu' 'libzip' 'qt5-tools')
-_commit='186d471305cad6fe83d8716d6b328f0e8b32b38c'
+_commit='e776eff6dba97df3b742dd7e178d2aaf9b15cc87'
 source=("git+https://github.com/hrydgard/ppsspp.git#commit=${_commit};
 
'git+https://github.com/hrydgard/ppsspp-ffmpeg.git#commit=a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef'
 
'ppsspp-glslang::git+https://github.com/hrydgard/glslang.git#commit=b16f7e6819267e57c3c244808d1981f0ce34acbc'
-
'git+https://github.com/hrydgard/ppsspp-lang.git#commit=ed0bbfb389da213bd891d179d1d92e95b8f05e43'
+
'git+https://github.com/hrydgard/ppsspp-lang.git#commit=f32328a88cbf368af90eb79bc7ad5420795d6585'
 
'git+https://github.com/Kingcom/armips.git#commit=770365d44df35d6e675c58bb2a774ca412278ef5'
 
'armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git#commit=b7f5a22753c81d834ab5133d655f1fd525280765'
 
'git+https://github.com/KhronosGroup/SPIRV-Cross.git#commit=6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6'
@@ -36,9 +36,9 @@
 'SKIP'
 'SKIP'
 'SKIP'
-'873d63c6ef9acdf7121f4bcc4cb849bb8a006abc508c403786c24ebd500e0eec'
-'5c168ae19d19059095101e5ff587d5b107b16d070721541f765d002e15d89ed4'
-'e14964ec3a931d10ed71a88316735f4c47ac7fd62f346973e0c9a0d0a2ff6cab'
+'2c2d1ee6d1ce5c2acec372d58b8079885f6d5d674633cfea489cd550252a5426'
+'1236ce000bb670ee2c0e0645c3d55f4d8c8e74dbc35a1af0962a3bdd7608f1c5'
+'828b06aacc56672a4d953d77342717c5be414a68261025f74e466abd084b8e6b'
 '1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8'
 'b3b1fb9e0ecd3c4472b51f27d028a69514b1a3823c26e33da6ffaebfb1522b7f'
 '6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278')

Modified: ppsspp-headless.sh
===
--- ppsspp-headless.sh  2017-05-26 10:18:43 UTC (rev 230443)
+++ ppsspp-headless.sh  2017-05-26 10:35:25 UTC (rev 230444)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/ppsspp
-exec ./PPSSPPHeadless $*
+exec ./PPSSPPHeadless "$@"

Modified: ppsspp-qt.sh
===
--- ppsspp-qt.sh2017-05-26 10:18:43 UTC (rev 230443)
+++ ppsspp-qt.sh2017-05-26 10:35:25 UTC (rev 230444)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/ppsspp
-exec ./PPSSPPQt $*
+exec ./PPSSPPQt "$@"

Modified: ppsspp.sh
===
--- ppsspp.sh   2017-05-26 10:18:43 UTC (rev 230443)
+++ ppsspp.sh   2017-05-26 10:35:25 UTC (rev 230444)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/ppsspp
-exec ./PPSSPPSDL $*
+exec ./PPSSPPSDL "$@"


[arch-commits] Commit in ppsspp/trunk (4 files)

2017-04-26 Thread Maxime Gauduin
Date: Wednesday, April 26, 2017 @ 19:56:29
  Author: alucryd
Revision: 225784

upgpkg: ppsspp 1.4-3

Modified:
  ppsspp/trunk/PKGBUILD
  ppsspp/trunk/ppsspp-headless.sh
  ppsspp/trunk/ppsspp-qt.sh
  ppsspp/trunk/ppsspp.sh

+
 PKGBUILD   |8 
 ppsspp-headless.sh |2 +-
 ppsspp-qt.sh   |2 +-
 ppsspp.sh  |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-26 19:56:18 UTC (rev 225783)
+++ PKGBUILD2017-04-26 19:56:29 UTC (rev 225784)
@@ -8,7 +8,7 @@
 pkgbase=ppsspp
 pkgname=('ppsspp' 'ppsspp-headless' 'ppsspp-qt')
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc='A PSP emulator written in C++'
 arch=('x86_64')
 url='http://www.ppsspp.org/'
@@ -36,9 +36,9 @@
 'SKIP'
 'SKIP'
 'SKIP'
-'e479cc5f6b998807ecea1793551cd9f080fe136243cd1d5212eb70e389e48eb0'
-'86b1748137d7c05f7e6da11f148b36aa2c64e25f432de1220b47cf17baa53175'
-'b9c1c638f13c41c9ddaf818fea3349cf14841aade2287d086f1e2c96584e99ea'
+'873d63c6ef9acdf7121f4bcc4cb849bb8a006abc508c403786c24ebd500e0eec'
+'5c168ae19d19059095101e5ff587d5b107b16d070721541f765d002e15d89ed4'
+'e14964ec3a931d10ed71a88316735f4c47ac7fd62f346973e0c9a0d0a2ff6cab'
 '1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8'
 'b3b1fb9e0ecd3c4472b51f27d028a69514b1a3823c26e33da6ffaebfb1522b7f'
 '6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278')

Modified: ppsspp-headless.sh
===
--- ppsspp-headless.sh  2017-04-26 19:56:18 UTC (rev 225783)
+++ ppsspp-headless.sh  2017-04-26 19:56:29 UTC (rev 225784)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/ppsspp
-exec ./PPSSPPHeadless
+exec ./PPSSPPHeadless $*

Modified: ppsspp-qt.sh
===
--- ppsspp-qt.sh2017-04-26 19:56:18 UTC (rev 225783)
+++ ppsspp-qt.sh2017-04-26 19:56:29 UTC (rev 225784)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/ppsspp
-exec ./PPSSPPQt
+exec ./PPSSPPQt $*

Modified: ppsspp.sh
===
--- ppsspp.sh   2017-04-26 19:56:18 UTC (rev 225783)
+++ ppsspp.sh   2017-04-26 19:56:29 UTC (rev 225784)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/ppsspp
-exec ./PPSSPPSDL
+exec ./PPSSPPSDL $*


[arch-commits] Commit in ppsspp/trunk (4 files)

2015-02-01 Thread Bartłomiej Piotrowski
Date: Monday, February 2, 2015 @ 08:19:33
  Author: bpiotrowski
Revision: 126951

upgpkg: ppsspp 1.0-1

new upstream release

Added:
  ppsspp/trunk/ppsspp-1.0-shared-ffmpeg.patch
(from rev 126950, ppsspp/trunk/ppsspp-0.9.9.1-shared-ffmpeg.patch)
Modified:
  ppsspp/trunk/PKGBUILD
Deleted:
  ppsspp/trunk/ppsspp-0.9.9.1-ffmpeg2.2.patch
  ppsspp/trunk/ppsspp-0.9.9.1-shared-ffmpeg.patch

+
 PKGBUILD   |   27 ++---
 ppsspp-0.9.9.1-ffmpeg2.2.patch |   12 --
 ppsspp-0.9.9.1-shared-ffmpeg.patch |  176 --
 ppsspp-1.0-shared-ffmpeg.patch |  180 +++
 4 files changed, 193 insertions(+), 202 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-02 06:46:49 UTC (rev 126950)
+++ PKGBUILD2015-02-02 07:19:33 UTC (rev 126951)
@@ -2,28 +2,28 @@
 # Maintainer: Bartłomiej Piotrowski bpiotrow...@archlinux.org
 
 pkgname=ppsspp
-pkgver=0.9.9.1
-pkgrel=3
+pkgver=1.0
+pkgrel=1
 pkgdesc='PSP emulator written in C++'
 arch=('i686' 'x86_64')
 url='http://www.ppsspp.org/'
 license=('GPL2')
-depends=('zlib' 'sdl' 'libpng' 'libgl' 'hicolor-icon-theme' 'xdg-utils' 
'ffmpeg')
+depends=('zlib' 'sdl2' 'libpng' 'libgl' 'hicolor-icon-theme' 'xdg-utils' 
'ffmpeg')
 makedepends=('git' 'cmake' 'mesa' 'mesa-libgl' 'glu' 'chrpath' 'zlib' 'sdl')
 install=ppsspp.install
 source=(git://github.com/hrydgard/ppsspp.git#tag=v$pkgver
-git://github.com/hrydgard/native.git#commit=2ba8e36
-lang::git://github.com/hrydgard/ppsspp-lang.git#commit=fdc4558
-ffmpeg::git://github.com/hrydgard/ppsspp-ffmpeg.git#commit=bc6302be
-ppsspp-0.9.9.1-shared-ffmpeg.patch
-ppsspp-0.9.9.1-ffmpeg2.2.patch
+git://github.com/hrydgard/native.git#commit=5becb9a
+lang::git://github.com/hrydgard/ppsspp-lang.git#commit=f5812ba
+ffmpeg::git://github.com/hrydgard/ppsspp-ffmpeg.git#commit=04d6e3e
+git://github.com/Kingcom/armips#commit=a0b878f
+ppsspp-1.0-shared-ffmpeg.patch
 ppsspp.desktop)
 md5sums=('SKIP'
  'SKIP'
  'SKIP'
  'SKIP'
- 'dbdc26c7ec8d008c7d5240cf06a61016'
- '1634b48a6f594ad95402d80729dfcbec'
+ 'SKIP'
+ '0b6265a0ba7c8b7066adbed210a5a5bb'
  'b70b8b3913079468db3469abeacaa9f6')
 
 prepare() {
@@ -31,13 +31,12 @@
   cd $pkgname
 
   git submodule init
-  for submodule in native lang ffmpeg; do
-git config submodule.${submodule}.url $srcdir/$submodule
+  for submodule in native lang ffmpeg ext/armips; do
+git config submodule.${submodule}.url $srcdir/${submodule#*/}
 git submodule update $submodule
   done
 
-  patch -p1 -i ../ppsspp-0.9.9.1-shared-ffmpeg.patch
-  patch -p1 -i ../ppsspp-0.9.9.1-ffmpeg2.2.patch
+  patch -p1 -i ../ppsspp-1.0-shared-ffmpeg.patch
 }
 
 build() {

Deleted: ppsspp-0.9.9.1-ffmpeg2.2.patch
===
--- ppsspp-0.9.9.1-ffmpeg2.2.patch  2015-02-02 06:46:49 UTC (rev 126950)
+++ ppsspp-0.9.9.1-ffmpeg2.2.patch  2015-02-02 07:19:33 UTC (rev 126951)
@@ -1,12 +0,0 @@
-diff -urN ppsspp-0.9.9.1/Core/HW/SimpleAudioDec.cpp 
ppsspp-0.9.9.1-patched/Core/HW/SimpleAudioDec.cpp
 ppsspp-0.9.9.1/Core/HW/SimpleAudioDec.cpp  2014-08-19 07:35:25.0 
+1100
-+++ ppsspp-0.9.9.1-patched/Core/HW/SimpleAudioDec.cpp  2014-11-02 
20:37:58.0 +1000
-@@ -94,6 +94,8 @@
-   }
-   codecCtx_-channels = channels_;
-   codecCtx_-channel_layout = channels_ == 2 ? AV_CH_LAYOUT_STEREO : 
AV_CH_LAYOUT_MONO;
-+  if (!codecCtx_-block_align)
-+  codecCtx_-block_align = sample_rate_;
-   codecCtx_-sample_rate = sample_rate_;
-   OpenCodec();
- #endif  // USE_FFMPEG

Deleted: ppsspp-0.9.9.1-shared-ffmpeg.patch
===
--- ppsspp-0.9.9.1-shared-ffmpeg.patch  2015-02-02 06:46:49 UTC (rev 126950)
+++ ppsspp-0.9.9.1-shared-ffmpeg.patch  2015-02-02 07:19:33 UTC (rev 126951)
@@ -1,176 +0,0 @@
-diff -urN ppsspp-0.9.9/CMakeLists.txt ppsspp-0.9.9-patched/CMakeLists.txt
 ppsspp-0.9.9/CMakeLists.txt2014-07-23 01:14:59.0 +1100
-+++ ppsspp-0.9.9-patched/CMakeLists.txt2014-07-23 18:38:20.695717128 
+1100
-@@ -374,138 +374,19 @@
-   native/ext/stb_vorbis/stb_vorbis.h)
- include_directories(native/ext/stb_vorbis)
- 
--if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
--  if(ANDROID)
--  if(ARMV7)
--  set(PLATFORM_ARCH android/armv7)
--  elseif(ARM)
--  set(PLATFORM_ARCH android/arm)
--  elseif(X86)
--  set(PLATFORM_ARCH android/x86)
--  endif()
--  elseif(BLACKBERRY)
--  set(PLATFORM_ARCH blackberry/armv7)
--  elseif(IOS)
--  set(PLATFORM_ARCH ios/universal)
--  elseif(MACOSX)
--  

[arch-commits] Commit in ppsspp/trunk (4 files)

2014-08-18 Thread Bartłomiej Piotrowski
Date: Monday, August 18, 2014 @ 23:04:34
  Author: bpiotrowski
Revision: 117532

upgpkg: ppsspp 0.9.9.1-1

new upstream release

Modified:
  ppsspp/trunk/PKGBUILD
  ppsspp/trunk/ppsspp.desktop
Deleted:
  ppsspp/trunk/ppsspp-headless
  ppsspp/trunk/ppsspp-sdl

-+
 PKGBUILD|   22 ++
 ppsspp-headless |3 ---
 ppsspp-sdl  |3 ---
 ppsspp.desktop  |2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-18 19:56:29 UTC (rev 117531)
+++ PKGBUILD2014-08-18 21:04:34 UTC (rev 117532)
@@ -2,7 +2,7 @@
 # Maintainer: Bartłomiej Piotrowski bpiotrow...@archlinux.org
 
 pkgname=ppsspp
-pkgver=0.9.9
+pkgver=0.9.9.1
 pkgrel=1
 pkgdesc='PSP emulator written in C++'
 arch=('i686' 'x86_64')
@@ -12,17 +12,15 @@
 makedepends=('git' 'cmake' 'mesa' 'mesa-libgl' 'glu' 'chrpath' 'zlib' 'sdl')
 install=ppsspp.install
 source=(git://github.com/hrydgard/ppsspp.git#tag=v$pkgver
-git://github.com/hrydgard/native.git#commit=78941b08
-lang::git://github.com/hrydgard/ppsspp-lang.git#commit=7876a52f
+git://github.com/hrydgard/native.git#commit=2ba8e36
+lang::git://github.com/hrydgard/ppsspp-lang.git#commit=fdc4558
 ffmpeg::git://github.com/hrydgard/ppsspp-ffmpeg.git#commit=bc6302be
-ppsspp-headless ppsspp-sdl ppsspp.desktop)
+ppsspp.desktop)
 md5sums=('SKIP'
  'SKIP'
  'SKIP'
  'SKIP'
- 'e516beb9b1c42ea21e06b80b737c'
- '2d4671d325c14b43ee1edf1a6e4fcd5d'
- '0f9fffc0ad19bd4b647a81e0357e9d04')
+ 'b70b8b3913079468db3469abeacaa9f6')
 
 prepare() {
   mkdir build{,-qt}
@@ -42,13 +40,13 @@
 }
 
 package() {
+  install -Dm755 build/PPSSPPSDL $pkgdir/usr/bin/PPSSPPSDL
+  install -Dm755 build/PPSSPPHeadless $pkgdir/usr/bin/PPSSPPHeadless
+  chrpath -d $pkgdir/usr/bin/PPSSPP{SDL,Headless}
+
   install -d $pkgdir/usr/share/ppsspp $pkgdir/usr/share/icons/
-  cp -r build/{PPSSPPSDL,PPSSPPHeadless,assets/} $pkgdir/usr/share/ppsspp
-  chrpath -d $pkgdir/usr/share/ppsspp/PPSSPP{SDL,Headless}
-
+  cp -r build/assets $pkgdir/usr/share/ppsspp/
   cp -r ppsspp/assets/unix-icons/hicolor $pkgdir/usr/share/icons/hicolor
 
-  install -Dm755 ppsspp-headless $pkgdir/usr/bin/ppsspp-headless
-  install -Dm755 ppsspp-sdl $pkgdir/usr/bin/ppsspp-sdl
   install -Dm644 ppsspp.desktop $pkgdir/usr/share/applications/ppsspp.desktop
 }

Deleted: ppsspp-headless
===
--- ppsspp-headless 2014-08-18 19:56:29 UTC (rev 117531)
+++ ppsspp-headless 2014-08-18 21:04:34 UTC (rev 117532)
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-cd /usr/share/ppsspp
-exec ./PPSSPPHeadless $@

Deleted: ppsspp-sdl
===
--- ppsspp-sdl  2014-08-18 19:56:29 UTC (rev 117531)
+++ ppsspp-sdl  2014-08-18 21:04:34 UTC (rev 117532)
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-cd /usr/share/ppsspp
-exec ./PPSSPPSDL $@

Modified: ppsspp.desktop
===
--- ppsspp.desktop  2014-08-18 19:56:29 UTC (rev 117531)
+++ ppsspp.desktop  2014-08-18 21:04:34 UTC (rev 117532)
@@ -2,7 +2,7 @@
 Name=PPSSPP
 GenericName=PSP Emulator
 Comment=Playstation Portable Emulator
-Exec=ppsspp-sdl %f
+Exec=PPSSPPSDL %f
 Terminal=false
 Type=Application
 Icon=ppsspp