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

[Jakob Gruber]

    Date: Saturday, June 1, 2013 @ 13:40:22
  Author: schuay
Revision: 92141

dolphin-emu-3.5-4

Modified:
  dolphin-emu/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-01 11:07:18 UTC (rev 92140)
+++ PKGBUILD	2013-06-01 11:40:22 UTC (rev 92141)
@@ -3,7 +3,7 @@
 
 pkgname=dolphin-emu
 pkgver=3.5
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='A Gamecube / Wii / Triforce Emulator'
 arch=('i686' 'x86_64')
@@ -11,17 +11,22 @@
 license=('GPL2')
 
 makedepends=('cmake' 'glproto' 'opencl-headers')
-depends=('bluez' 'ffmpeg' 'glew' 'libao' 'libgl' 'libxxf86vm' 'lsb-release' 'lzo2' 'mesa' \
+depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'libgl' 'libxxf86vm' 'lsb-release' 'lzo2' 'mesa' \
          'nvidia-cg-toolkit' 'openal' 'portaudio' 'sdl' 'wxgtk2.9')
 optdepends=('pulseaudio')
 
 source=("http://dolphin-emu.googlecode.com/files/dolphin-${pkgver}-src.zip"
         'dolphin-emu.desktop'
-        'Dolphin_Logo.png')
+        'Dolphin_Logo.png'
+        'gcc48fix.patch')
 
 build() {
   cd "${srcdir}/dolphin-${pkgver}"
 
+  # 'u32 __rold' redeclared as different kind of symbol
+  # Patch merged upstream, remove with next release (> 3.5)
+  patch -lNp1 < "${srcdir}/gcc48fix.patch"
+
   mkdir build && cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9
   make
@@ -39,4 +44,5 @@
 
 md5sums=('4d0429f1e10f0862256e0b4c4e2f44a3'
          'feed4580c2e6bfbc7f6c67dad861daae'
-         'd15c51f547b4bd47e510faac40bcc9d6')
+         'd15c51f547b4bd47e510faac40bcc9d6'
+         'ddeddc2a65042486565b4b78ad739a80')