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

[Maxime Gauduin]

    Date: Tuesday, August 19, 2014 @ 03:01:27
  Author: alucryd
Revision: 117592

glew rebuild: dolphin-emu 1:4.0.2-5

Added:
  dolphin-emu/trunk/dolphin-emu-gcc49.patch
Modified:
  dolphin-emu/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   33 ++++++++++++++++++---------------
 dolphin-emu-gcc49.patch |   17 +++++++++++++++++
 2 files changed, 35 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-19 00:59:44 UTC (rev 117591)
+++ PKGBUILD	2014-08-19 01:01:27 UTC (rev 117592)
@@ -3,7 +3,7 @@
 
 pkgname=dolphin-emu
 pkgver=4.0.2
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc='A Gamecube / Wii / Triforce emulator'
 arch=('i686' 'x86_64')
@@ -11,20 +11,31 @@
 license=('GPL2')
 
 makedepends=('cmake' 'git' 'opencl-headers')
-depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk')
+depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'libusbx' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk')
 optdepends=('pulseaudio: PulseAudio backend')
 
+options=('!emptydirs')
+
 source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}"
-        'dolphin-emu.desktop'
-        'Dolphin_Logo.png')
+        'dolphin-emu-gcc49.patch')
+md5sums=('SKIP'
+         '5fead49fc3a0ff9a9d1435368b5df1f9')
 
-# TODO: Drop the custom icon and .desktop file, apparently dolphin ships these now.
+prepare() {
+  cd "${srcdir}/${pkgname%-*}"
 
+  patch -Np1 -i ../dolphin-emu-gcc49.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname%-*}"
 
   mkdir build && cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9
+  if [[ $CARCH == x86_64 ]]; then
+    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS='-fno-inline-functions'
+  else
+    cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
+  fi
   make
 }
 
@@ -31,13 +42,5 @@
 package() {
   cd "${srcdir}/${pkgname%-*}/build"
 
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 "${srcdir}/dolphin-emu.desktop" \
-                 "${pkgdir}/usr/share/applications/dolphin-emu.desktop"
-  install -Dm644 "${srcdir}/Dolphin_Logo.png" "${pkgdir}/usr/share/pixmaps/dolphin-emu.png"
+  make DESTDIR="${pkgdir}" install
 }
-
-md5sums=('SKIP'
-         'feed4580c2e6bfbc7f6c67dad861daae'
-         'd15c51f547b4bd47e510faac40bcc9d6')

Added: dolphin-emu-gcc49.patch
===================================================================
--- dolphin-emu-gcc49.patch	                        (rev 0)
+++ dolphin-emu-gcc49.patch	2014-08-19 01:01:27 UTC (rev 117592)
@@ -0,0 +1,17 @@
+diff -rupN dolphin.orig/Source/Core/Common/Src/CommonFuncs.h dolphin/Source/Core/Common/Src/CommonFuncs.h
+--- dolphin.orig/Source/Core/Common/Src/CommonFuncs.h	2014-08-19 02:36:05.555642000 +0200
++++ dolphin/Source/Core/Common/Src/CommonFuncs.h	2014-08-19 02:38:44.301036700 +0200
+@@ -30,7 +30,12 @@ struct ArraySizeImpl : public std::exten
+ #define b32(x)  (b16(x) | (b16(x) >>16) )
+ #define ROUND_UP_POW2(x)	(b32(x - 1) + 1)
+ 
+-#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC
++#ifndef __GNUC_PREREQ
++	#define __GNUC_PREREQ(a, b) 0
++#endif
++
++#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \
++	!defined __SSSE3__ && defined _M_X86
+ #include <emmintrin.h>
+ static __inline __m128i __attribute__((__always_inline__))
+ _mm_shuffle_epi8(__m128i a, __m128i mask)


Property changes on: dolphin-emu/trunk/dolphin-emu-gcc49.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property