Date: Monday, January 6, 2014 @ 14:33:47 Author: alucryd Revision: 103468
Add lib32-sdl2 as well Added: lib32-sdl2/ lib32-sdl2/repos/ lib32-sdl2/trunk/ lib32-sdl2/trunk/PKGBUILD Modified: pcsx2/trunk/PKGBUILD ---------------------------+ lib32-sdl2/trunk/PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++++++++ pcsx2/trunk/PKGBUILD | 24 +++++++++++++--------- 2 files changed, 63 insertions(+), 9 deletions(-) Added: lib32-sdl2/trunk/PKGBUILD =================================================================== --- lib32-sdl2/trunk/PKGBUILD (rev 0) +++ lib32-sdl2/trunk/PKGBUILD 2014-01-06 13:33:47 UTC (rev 103468) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Maxime Gauduin <[email protected]> +# Contributor: Jameson Pugh <[email protected]> +# Contributor: J0k3r <[email protected]> + +pkgname=lib32-sdl2 +pkgver=2.0.1 +pkgrel=2 +pkgdesc='A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)' +arch=('x86_64') +url='http://www.libsdl.org' +license=('MIT') +depends=('lib32-libgl' 'lib32-libx11' 'lib32-libxext' 'lib32-libxrender' "${pkgname#*-}") +makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' 'lib32-libxinerama' 'lib32-libxrandr') +optdepends=('lib32-alsa-lib: ALSA audio driver' + 'lib32-libpulse: PulseAudio audio driver') +source=("${url}/release/SDL2-${pkgver}.tar.gz") +sha256sums=('0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0') + +prepare() { + if [[ -d build ]]; then + rm -rf build + fi + mkdir build +} + +build() { + cd build + + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + + ../SDL2-${pkgver}/configure --prefix='/usr' --libdir='/usr/lib32' --enable-{alsa,pulseaudio-shared,sdl-dlopen} --disable-{arts,esd,nas,rpath} + make +} + +package() { + cd build + + make DESTDIR="$pkgdir" install + rm -rf "${pkgdir}"/usr/{bin,include,share} + + 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-sdl2/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 13:13:29 UTC (rev 103467) +++ pcsx2/trunk/PKGBUILD 2014-01-06 13:33:47 UTC (rev 103468) @@ -13,16 +13,22 @@ license=('GPL') makedepends=('cmake' 'sparsehash') if [[ $CARCH == "i686" ]]; then - depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 'portaudio' 'sdl' 'soundtouch' 'wxgtk2.8') + depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8') elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk2.8') + makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') fi options=('!emptydirs') -source=("http://code.google.com/p/pcsx2/downloads/detail?name=${pkgname}-${pkgver}-r${_rev}-lnx-sources.tar.bz2" - 'gcc48.patch') -sha256sums=('3f6067c3ea23b2afa4d4c411f3121d86612c310b1c7a44413577cf5727e498bc' - '57204299c89d98f900af2e6c98fd3af0460d9095d1046f4d67772b9b75dc894b') +source=("http://pcsx2.googlecode.com/files/${pkgname}-${pkgver}-r${_rev}-lnx-sources.tar.bz2" + 'zzogl-mesa10.patch') +sha256sums=('1353db351784dca47244c4b184e14c279218fb6933fba53b9d6a6a81182c2663' + 'e9b3a70ada333c78d94733a1b71f3a1f005a8dabb480c3fbfaf1f91f44f4c5fe') +prepare() { + cd ${pkgname}.snapshot-${_rev} + + patch -Np1 -i ../zzogl-mesa10.patch +} + build() { cd ${pkgname}.snapshot-${_rev} @@ -32,12 +38,12 @@ mkdir build && cd build if [[ $CARCH == "i686" ]]; then - 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' + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_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' -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' + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_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 @@ -47,7 +53,7 @@ cd ${pkgname}.snapshot-${_rev}/build if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') + depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') fi make DESTDIR="${pkgdir}" install
