Date: Tuesday, March 31, 2015 @ 15:18:50 Author: alucryd Revision: 130406
upgpkg: dolphin-emu 1:4.0.2-8 Added: dolphin-emu/trunk/dolphin-emu-findx11.patch Modified: dolphin-emu/trunk/PKGBUILD ---------------------------+ PKGBUILD | 26 ++++++++++++++------------ dolphin-emu-findx11.patch | 11 +++++++++++ 2 files changed, 25 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-31 11:23:00 UTC (rev 130405) +++ PKGBUILD 2015-03-31 13:18:50 UTC (rev 130406) @@ -1,10 +1,11 @@ # $Id$ # Maintainer: schuay <jakob.gru...@gmail.com> +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> # Contributor: Jeremy Newton (Mystro256) <alexjn...@gmail.com> pkgname=dolphin-emu pkgver=4.0.2 -pkgrel=7 +pkgrel=8 epoch=1 pkgdesc='A Gamecube / Wii / Triforce emulator' arch=('i686' 'x86_64') @@ -11,7 +12,7 @@ url='http://dolphin-emu.org' license=('GPL2') -makedepends=('cmake' 'git' 'opencl-headers') +makedepends=('cmake' 'opencl-headers') depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk') optdepends=('pulseaudio: PulseAudio backend') @@ -18,31 +19,32 @@ options=('!emptydirs') -source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}" +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dolphin-emu/dolphin/archive/${pkgver}.tar.gz" + 'dolphin-emu-findx11.patch' 'dolphin-emu-gcc49.patch') -md5sums=('SKIP' +md5sums=('95436ade64fc8ed2fe4b2ed5306dc879' + 'f9a692b76263f3efae9793c4879bc2c5' '5fead49fc3a0ff9a9d1435368b5df1f9') prepare() { - cd "${srcdir}/${pkgname%-*}" + cd dolphin-${pkgver} + patch -Np1 -i ../dolphin-emu-findx11.patch patch -Np1 -i ../dolphin-emu-gcc49.patch } build() { - cd "${srcdir}/${pkgname%-*}" + cd dolphin-${pkgver} mkdir build && cd build - if [[ $CARCH == x86_64 ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS='-fno-inline-functions' - else - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' - fi + cmake .. \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_CXX_FLAGS='-fno-inline-functions -fpermissive' make } package() { - cd "${srcdir}/${pkgname%-*}/build" + cd dolphin-${pkgver}/build make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/lib/libpolarssl.a" Added: dolphin-emu-findx11.patch =================================================================== --- dolphin-emu-findx11.patch (rev 0) +++ dolphin-emu-findx11.patch 2015-03-31 13:18:50 UTC (rev 130406) @@ -0,0 +1,11 @@ +diff -rupN dolphin-4.0.2.orig/CMakeLists.txt dolphin-4.0.2/CMakeLists.txt +--- dolphin-4.0.2.orig/CMakeLists.txt 2015-03-31 15:05:43.953995860 +0200 ++++ dolphin-4.0.2/CMakeLists.txt 2015-03-31 15:06:53.379078333 +0200 +@@ -417,6 +417,7 @@ if(NOT ANDROID) + + # Note: We do not need to explicitly check for X11 as it is done in the cmake + # FindOpenGL module on linux. ++ include(FindX11) + if(USE_X11 AND X11_FOUND) + set(USE_X11 1) + add_definitions(-DHAVE_X11=1)