[arch-commits] Commit in pcsxr/trunk (PKGBUILD)

2017-08-02 Thread Bartłomiej Piotrowski
Date: Wednesday, August 2, 2017 @ 07:42:30
  Author: bpiotrowski
Revision: 247399

use architecture-specific options instead of bash hackery

Modified:
  pcsxr/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-02 07:32:36 UTC (rev 247398)
+++ PKGBUILD2017-08-02 07:42:30 UTC (rev 247399)
@@ -11,19 +11,14 @@
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
 depends=('libcdio' 'libxv' 'sdl' 'gtk3')
+depends_x86_64=('lib32-libcdio' 'lib32-libxv' 'lib32-sdl' 'lib32-gtk3')
 makedepends=('mesa' 'intltool' 'nasm')
-options=('!libtool')
+makedepends_x86_64=('lib32-mesa')
+optdepends_x86_64=('lib32-libpulse: Pulseaudio support'
+   'lib32-alsa-plugins: ALSA support')
+optdepends_i686=('libpulse: Pulseaudio support'
+ 'alsa-plugins: ALSA support')
 
-if [[ $CARCH == 'x86_64' ]]; then
-makedepends+=('lib32-mesa')
-depends+=('lib32-libcdio' 'lib32-libxv' 'lib32-sdl' 'lib32-gtk3')
-optdepends=('lib32-libpulse: Pulseaudio support'
-'lib32-alsa-plugins: ALSA support')
-else
-optdepends=('libpulse: Pulseaudio support'
-'alsa-plugins: ALSA support')
-fi
-
 # Accessible through /srv/ftp/other/community on nymeria.
 
source=("https://sources.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2;)
 


[arch-commits] Commit in pcsxr/trunk (PKGBUILD)

2016-01-29 Thread Jakob Gruber
Date: Friday, January 29, 2016 @ 11:55:55
  Author: schuay
Revision: 159411

optdepends for pcsxr

Modified:
  pcsxr/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 5 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-29 10:50:59 UTC (rev 159410)
+++ PKGBUILD2016-01-29 10:55:55 UTC (rev 159411)
@@ -17,6 +17,11 @@
 if [[ $CARCH == 'x86_64' ]]; then
 makedepends+=('lib32-mesa')
 depends+=('lib32-libcdio' 'lib32-libxv' 'lib32-sdl' 'lib32-gtk3')
+optdepends=('lib32-libpulse: Pulseaudio support'
+'lib32-alsa-plugins: ALSA support')
+else
+optdepends=('libpulse: Pulseaudio support'
+'alsa-plugins: ALSA support')
 fi
 
 # Accessible through /srv/ftp/other/community on nymeria.


[arch-commits] Commit in pcsxr/trunk (PKGBUILD)

2016-01-26 Thread Jakob Gruber
Date: Tuesday, January 26, 2016 @ 13:24:19
  Author: schuay
Revision: 158951

pcsxr multilib

Modified:
  pcsxr/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-26 12:22:39 UTC (rev 158950)
+++ PKGBUILD2016-01-26 12:24:19 UTC (rev 158951)
@@ -5,15 +5,20 @@
 
 pkgname=pcsxr
 pkgver=1.9.93
-pkgrel=4
+pkgrel=5
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
 depends=('libcdio' 'libxv' 'sdl' 'gtk3')
-makedepends=('mesa' 'intltool')
-[[ $CARCH == 'i686' ]] && makedepends+=('nasm')
+makedepends=('mesa' 'intltool' 'nasm')
+options=('!libtool')
 
+if [[ $CARCH == 'x86_64' ]]; then
+makedepends+=('lib32-mesa')
+depends+=('lib32-libcdio' 'lib32-libxv' 'lib32-sdl' 'lib32-gtk3')
+fi
+
 # Accessible through /srv/ftp/other/community on nymeria.
 
source=("https://sources.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2;)
 
@@ -20,10 +25,19 @@
 build() {
 cd "$srcdir/$pkgname"
 
+if [[ $CARCH == 'x86_64' ]]; then
+export CC="gcc -m32"
+export CXX="g++ -m32"
+fi
+
 autoreconf -f -i
 intltoolize --force
 
-./configure --prefix=/usr --enable-libcdio --enable-opengl
+./configure --prefix=/usr \
+--libdir=/usr/lib32 \
+--enable-dynarec=x86 \
+--enable-libcdio \
+--enable-opengl
 make
 }
 


[arch-commits] Commit in pcsxr/trunk (PKGBUILD)

2014-11-11 Thread Felix Yan
Date: Wednesday, November 12, 2014 @ 03:29:41
  Author: fyan
Revision: 122405

upgpkg: pcsxr 1.9.93-4

libcdio 0.93 rebuild

Modified:
  pcsxr/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-12 02:25:27 UTC (rev 122404)
+++ PKGBUILD2014-11-12 02:29:41 UTC (rev 122405)
@@ -5,7 +5,7 @@
 
 pkgname=pcsxr
 pkgver=1.9.93
-pkgrel=3
+pkgrel=4
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'


[arch-commits] Commit in pcsxr/trunk (PKGBUILD)

2014-01-14 Thread Jakob Gruber
Date: Tuesday, January 14, 2014 @ 16:28:57
  Author: schuay
Revision: 104005

pcsxr libcdio rebuild

Modified:
  pcsxr/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-14 15:23:43 UTC (rev 104004)
+++ PKGBUILD2014-01-14 15:28:57 UTC (rev 104005)
@@ -5,7 +5,7 @@
 
 pkgname=pcsxr
 pkgver=1.9.93
-pkgrel=2
+pkgrel=3
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'



[arch-commits] Commit in pcsxr/trunk (PKGBUILD)

2013-09-10 Thread Jakob Gruber
Date: Tuesday, September 10, 2013 @ 10:48:39
  Author: schuay
Revision: 97003

pcsxr-1.9.93-2

Modified:
  pcsxr/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-10 04:15:01 UTC (rev 97002)
+++ PKGBUILD2013-09-10 08:48:39 UTC (rev 97003)
@@ -5,13 +5,15 @@
 
 pkgname=pcsxr
 pkgver=1.9.93
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
-depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'gtk3')
+options=('!libtool')
+depends=('libcdio' 'libxv' 'sdl' 'gtk3')
 makedepends=('mesa' 'intltool')
+[[ $CARCH == 'i686' ]]  makedepends+=('nasm')
 
 # Accessible through /srv/ftp/other/community on nymeria.
 
source=(ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2;)



[arch-commits] Commit in pcsxr/trunk (PKGBUILD link_order.patch)

2013-08-31 Thread Jakob Gruber
Date: Saturday, August 31, 2013 @ 18:57:02
  Author: schuay
Revision: 96555

pcsxr-1.9.93-1

Modified:
  pcsxr/trunk/PKGBUILD
Deleted:
  pcsxr/trunk/link_order.patch

--+
 PKGBUILD |   25 ++---
 link_order.patch |   13 -
 2 files changed, 14 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-31 16:27:48 UTC (rev 96554)
+++ PKGBUILD2013-08-31 16:57:02 UTC (rev 96555)
@@ -4,28 +4,31 @@
 # Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
 
 pkgname=pcsxr
-pkgver=1.9.92
-pkgrel=5
+pkgver=1.9.93
+pkgrel=1
 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
-depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl')
-makedepends=('mesa')
-source=(ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2;
-link_order.patch)
+depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'gtk3')
+makedepends=('mesa' 'intltool')
 
+# Accessible through /srv/ftp/other/community on nymeria.
+source=(ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2;)
+
 build() {
-cd $srcdir/$pkgname-$pkgver
-patch -Np0  $srcdir/link_order.patch
+cd $srcdir/$pkgname
+
+autoreconf -f -i
+intltoolize --force
+
 ./configure --prefix=/usr --enable-libcdio --enable-opengl
 make
 }
 
 package() {
-cd $srcdir/$pkgname-$pkgver
+cd $srcdir/$pkgname
 make DESTDIR=$pkgdir install
 }
 
-md5sums=('28411aed0b4424f97227d94bdefaec83'
- 'd38c38fa0fbb11fe881b4a9a868cf603')
+md5sums=('d75725b4c3fcb2cb11d39b3ace10dc31')

Deleted: link_order.patch
===
--- link_order.patch2013-08-31 16:27:48 UTC (rev 96554)
+++ link_order.patch2013-08-31 16:57:02 UTC (rev 96555)
@@ -1,13 +0,0 @@
 gui/Makefile.in2010-08-05 13:27:28.0 +0200
-+++ gui/Makefile.in2013-01-08 21:10:44.709992969 +0100
-@@ -244,8 +244,8 @@
-   AboutDlg.c
- 
- pcsx_LDADD = \
--  $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \
--  ../libpcsxcore/libpcsxcore.a
-+  ../libpcsxcore/libpcsxcore.a $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz 
-lm -lXext -lXtst
-+  
- 
- all: all-am
-