[arch-commits] Commit in (9 files)

Maxime Gauduin alucryd at nymeria.archlinux.org
Mon Jan 6 11:20:38 UTC 2014


    Date: Monday, January 6, 2014 @ 12:20:38
  Author: alucryd
Revision: 103451

Add lib32-libaio and lib32-nvidia-cg-toolkit

Added:
  lib32-libaio/
  lib32-libaio/repos/
  lib32-libaio/trunk/
  lib32-libaio/trunk/PKGBUILD
  lib32-nvidia-cg-toolkit/
  lib32-nvidia-cg-toolkit/repos/
  lib32-nvidia-cg-toolkit/trunk/
  lib32-nvidia-cg-toolkit/trunk/PKGBUILD
Modified:
  pcsx2/trunk/PKGBUILD

----------------------------------------+
 lib32-libaio/trunk/PKGBUILD            |   35 ++++++++++++++++++++++++++++
 lib32-nvidia-cg-toolkit/trunk/PKGBUILD |   25 ++++++++++++++++++++
 pcsx2/trunk/PKGBUILD                   |   38 +++++++++++++------------------
 3 files changed, 76 insertions(+), 22 deletions(-)

Added: lib32-libaio/trunk/PKGBUILD
===================================================================
--- lib32-libaio/trunk/PKGBUILD	                        (rev 0)
+++ lib32-libaio/trunk/PKGBUILD	2014-01-06 11:20:38 UTC (rev 103451)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor : josephgbr <rafael.f.f1 at gmail.com>
+# Contributor : angvp <angvp at archlinux.org>
+
+pkgname=lib32-libaio
+pkgver=0.3.109
+pkgrel=6
+pkgdesc='The Linux-native asynchronous I/O facility (aio) library'
+arch=('x86_64')
+url='http://lse.sourceforge.net/io/aio.html'
+license=('LGPL')
+depends=("${pkgname#*-}")
+makedepends=('gcc-multilib')
+options=('!staticlibs')
+source=("http://ftp.de.debian.org/debian/pool/main/liba/${pkgname#*-}/${pkgname#*-}_${pkgver}.orig.tar.gz")
+sha256sums=('bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d')
+
+build() {
+  cd ${pkgname#*-}-${pkgver}
+
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+  make
+}
+
+package() {
+  cd ${pkgname#*-}-${pkgver}
+
+  make prefix="${pkgdir}"/usr libdir="${pkgdir}"/usr/lib32 install
+  rm -rf "${pkgdir}"/usr/include
+}
+
+# vim: ts=2 sw=2 et:


Property changes on: lib32-libaio/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: lib32-nvidia-cg-toolkit/trunk/PKGBUILD
===================================================================
--- lib32-nvidia-cg-toolkit/trunk/PKGBUILD	                        (rev 0)
+++ lib32-nvidia-cg-toolkit/trunk/PKGBUILD	2014-01-06 11:20:38 UTC (rev 103451)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+
+pkgname=lib32-nvidia-cg-toolkit
+pkgver=3.1
+pkgrel=4
+pkgdesc='NVIDIA Cg libraries'
+arch=('x86_64')
+url='http://developer.nvidia.com/object/cg_toolkit.html'
+license=('custom')
+depends=('lib32-mesa' "${pkgname#*-}")
+source=("http://developer.download.nvidia.com/cg/Cg_${pkgver}/Cg-${pkgver}_April2012_x86.tgz")
+sha256sums=('cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879')
+
+package() {
+  install -dm 755 "${pkgdir}"/usr/lib32
+  install -m 644 "${srcdir}"/usr/lib/* "${pkgdir}"/usr/lib32
+
+# License
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s "${pkgname#*-}" "${pkgdir}"/usr/share/licenses/${pkgname}
+}
+
+# vim: ts=2 sw=2 et:


Property changes on: lib32-nvidia-cg-toolkit/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: pcsx2/trunk/PKGBUILD
===================================================================
--- pcsx2/trunk/PKGBUILD	2014-01-06 11:19:52 UTC (rev 103450)
+++ pcsx2/trunk/PKGBUILD	2014-01-06 11:20:38 UTC (rev 103451)
@@ -4,33 +4,27 @@
 # Contributor: vEX <vex at niechift.com>
 
 pkgname=pcsx2
-pkgver=1.0.0
-pkgrel=6
-pkgdesc="A Sony PlayStation 2 emulator"
+pkgver=1.1.0
+_rev=5674
+pkgrel=1
+pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
-url="http://www.pcsx2.net"
+url='http://www.pcsx2.net'
 license=('GPL')
 makedepends=('cmake' 'sparsehash')
 if [[ $CARCH == "i686" ]]; then
-  depends=('glew' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk')
+  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 'portaudio' 'sdl' 'soundtouch' 'wxgtk2.8')
 elif [[ $CARCH == "x86_64" ]]; then
-  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk')
+  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk2.8')
 fi
 options=('!emptydirs')
-source=("${pkgname}-${pkgver}-r5350-sources.7z::http://pcsx2.net/download/releases/source-code/finish/7-source/93-pcsx2-v1-0-0-source-code/0.html"
+source=("http://code.google.com/p/pcsx2/downloads/detail?name=${pkgname}-${pkgver}-r${_rev}-lnx-sources.tar.bz2"
         'gcc48.patch')
 sha256sums=('3f6067c3ea23b2afa4d4c411f3121d86612c310b1c7a44413577cf5727e498bc'
             '57204299c89d98f900af2e6c98fd3af0460d9095d1046f4d67772b9b75dc894b')
 
-prepare() {
-  cd ${pkgname}-${pkgver}-r5350-sources
-
-  patch -Np1 -i ../gcc48.patch
-  sed 's/0.9.8/1.0.0/' -i CMakeLists.txt
-}
-
 build() {
-  cd ${pkgname}-${pkgver}-r5350-sources
+  cd ${pkgname}.snapshot-${_rev}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -38,12 +32,12 @@
   mkdir build && cd build
 
   if [[ $CARCH == "i686" ]]; then
-    cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DPACKAGE_MODE=TRUE -DXDG_STD=TRUE -DGLSL_API=TRUE -DREBUILD_SHADER=TRUE -DPLUGIN_DIR=/usr/lib/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DGLSL_SHADER_DIR=/usr/share/pcsx2
+    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -D{GAMEINDEX,GLSL_SHADER}_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
   elif [[ $CARCH == "x86_64" ]]; then
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-    cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DPACKAGE_MODE=TRUE -DXDG_STD=TRUE -DGLSL_API=TRUE -DREBUILD_SHADER=TRUE -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DGLSL_SHADER_DIR=/usr/share/pcsx2 -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc32 -DCMAKE_LIBRARY_PATH=/usr/lib32
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -D{GAMEINDEX,GLSL_SHADER}_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32'
   fi
 
   make
@@ -50,10 +44,10 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}-r5350-sources/build
+  cd ${pkgname}.snapshot-${_rev}/build
 
   if [[ $CARCH == "x86_64" ]]; then
-    depends=('lib32-wxgtk' 'lib32-libgl' 'lib32-glew' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch')
+    depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
   fi
 
   make DESTDIR="${pkgdir}" install




More information about the arch-commits mailing list