[arch-commits] Commit in dolphin-emu/repos (14 files)
Maxime Gauduin
alucryd at archlinux.org
Tue Aug 19 01:01:42 UTC 2014
Date: Tuesday, August 19, 2014 @ 03:01:42
Author: alucryd
Revision: 117593
archrelease: copy trunk to community-i686, community-x86_64
Added:
dolphin-emu/repos/community-i686/Dolphin_Logo.png
(from rev 117592, dolphin-emu/trunk/Dolphin_Logo.png)
dolphin-emu/repos/community-i686/PKGBUILD
(from rev 117592, dolphin-emu/trunk/PKGBUILD)
dolphin-emu/repos/community-i686/dolphin-emu-gcc49.patch
(from rev 117592, dolphin-emu/trunk/dolphin-emu-gcc49.patch)
dolphin-emu/repos/community-i686/dolphin-emu.desktop
(from rev 117592, dolphin-emu/trunk/dolphin-emu.desktop)
dolphin-emu/repos/community-x86_64/Dolphin_Logo.png
(from rev 117592, dolphin-emu/trunk/Dolphin_Logo.png)
dolphin-emu/repos/community-x86_64/PKGBUILD
(from rev 117592, dolphin-emu/trunk/PKGBUILD)
dolphin-emu/repos/community-x86_64/dolphin-emu-gcc49.patch
(from rev 117592, dolphin-emu/trunk/dolphin-emu-gcc49.patch)
dolphin-emu/repos/community-x86_64/dolphin-emu.desktop
(from rev 117592, dolphin-emu/trunk/dolphin-emu.desktop)
Deleted:
dolphin-emu/repos/community-i686/Dolphin_Logo.png
dolphin-emu/repos/community-i686/PKGBUILD
dolphin-emu/repos/community-i686/dolphin-emu.desktop
dolphin-emu/repos/community-x86_64/Dolphin_Logo.png
dolphin-emu/repos/community-x86_64/PKGBUILD
dolphin-emu/repos/community-x86_64/dolphin-emu.desktop
------------------------------------------+
/PKGBUILD | 92 +++++++++++++++++++++++++++++
/dolphin-emu.desktop | 22 ++++++
community-i686/PKGBUILD | 43 -------------
community-i686/dolphin-emu-gcc49.patch | 17 +++++
community-i686/dolphin-emu.desktop | 11 ---
community-x86_64/PKGBUILD | 43 -------------
community-x86_64/dolphin-emu-gcc49.patch | 17 +++++
community-x86_64/dolphin-emu.desktop | 11 ---
8 files changed, 148 insertions(+), 108 deletions(-)
Deleted: community-i686/Dolphin_Logo.png
===================================================================
(Binary files differ)
Copied: dolphin-emu/repos/community-i686/Dolphin_Logo.png (from rev 117592, dolphin-emu/trunk/Dolphin_Logo.png)
===================================================================
(Binary files differ)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-19 01:01:27 UTC (rev 117592)
+++ community-i686/PKGBUILD 2014-08-19 01:01:42 UTC (rev 117593)
@@ -1,43 +0,0 @@
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Jeremy Newton (Mystro256)
-
-pkgname=dolphin-emu
-pkgver=4.0.2
-pkgrel=4
-epoch=1
-pkgdesc='A Gamecube / Wii / Triforce emulator'
-arch=('i686' 'x86_64')
-url='http://dolphin-emu.org'
-license=('GPL2')
-
-makedepends=('cmake' 'git' 'opencl-headers')
-depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk')
-optdepends=('pulseaudio: PulseAudio backend')
-
-source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}"
- 'dolphin-emu.desktop'
- 'Dolphin_Logo.png')
-
-# TODO: Drop the custom icon and .desktop file, apparently dolphin ships these now.
-
-build() {
- cd "${srcdir}/${pkgname%-*}"
-
- mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9
- make
-}
-
-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"
-}
-
-md5sums=('SKIP'
- 'feed4580c2e6bfbc7f6c67dad861daae'
- 'd15c51f547b4bd47e510faac40bcc9d6')
Copied: dolphin-emu/repos/community-i686/PKGBUILD (from rev 117592, dolphin-emu/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-19 01:01:42 UTC (rev 117593)
@@ -0,0 +1,46 @@
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Jeremy Newton (Mystro256)
+
+pkgname=dolphin-emu
+pkgver=4.0.2
+pkgrel=5
+epoch=1
+pkgdesc='A Gamecube / Wii / Triforce emulator'
+arch=('i686' 'x86_64')
+url='http://dolphin-emu.org'
+license=('GPL2')
+
+makedepends=('cmake' 'git' 'opencl-headers')
+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-gcc49.patch')
+md5sums=('SKIP'
+ '5fead49fc3a0ff9a9d1435368b5df1f9')
+
+prepare() {
+ cd "${srcdir}/${pkgname%-*}"
+
+ patch -Np1 -i ../dolphin-emu-gcc49.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname%-*}"
+
+ 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
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname%-*}/build"
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: dolphin-emu/repos/community-i686/dolphin-emu-gcc49.patch (from rev 117592, dolphin-emu/trunk/dolphin-emu-gcc49.patch)
===================================================================
--- community-i686/dolphin-emu-gcc49.patch (rev 0)
+++ community-i686/dolphin-emu-gcc49.patch 2014-08-19 01:01:42 UTC (rev 117593)
@@ -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)
Deleted: community-i686/dolphin-emu.desktop
===================================================================
--- community-i686/dolphin-emu.desktop 2014-08-19 01:01:27 UTC (rev 117592)
+++ community-i686/dolphin-emu.desktop 2014-08-19 01:01:42 UTC (rev 117593)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Dolphin
-Categories=Game;Emulator;GTK;
-GenericName=GameCube and Wii Emulator
-Comment=An emulator for the GameCube and Wii consoles
-Exec=dolphin-emu
-Icon=dolphin-emu
-StartupNotify=false
-Name[en_US]=Dolphin
Copied: dolphin-emu/repos/community-i686/dolphin-emu.desktop (from rev 117592, dolphin-emu/trunk/dolphin-emu.desktop)
===================================================================
--- community-i686/dolphin-emu.desktop (rev 0)
+++ community-i686/dolphin-emu.desktop 2014-08-19 01:01:42 UTC (rev 117593)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Dolphin
+Categories=Game;Emulator;GTK;
+GenericName=GameCube and Wii Emulator
+Comment=An emulator for the GameCube and Wii consoles
+Exec=dolphin-emu
+Icon=dolphin-emu
+StartupNotify=false
+Name[en_US]=Dolphin
Deleted: community-x86_64/Dolphin_Logo.png
===================================================================
(Binary files differ)
Copied: dolphin-emu/repos/community-x86_64/Dolphin_Logo.png (from rev 117592, dolphin-emu/trunk/Dolphin_Logo.png)
===================================================================
(Binary files differ)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-19 01:01:27 UTC (rev 117592)
+++ community-x86_64/PKGBUILD 2014-08-19 01:01:42 UTC (rev 117593)
@@ -1,43 +0,0 @@
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Jeremy Newton (Mystro256)
-
-pkgname=dolphin-emu
-pkgver=4.0.2
-pkgrel=4
-epoch=1
-pkgdesc='A Gamecube / Wii / Triforce emulator'
-arch=('i686' 'x86_64')
-url='http://dolphin-emu.org'
-license=('GPL2')
-
-makedepends=('cmake' 'git' 'opencl-headers')
-depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk')
-optdepends=('pulseaudio: PulseAudio backend')
-
-source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}"
- 'dolphin-emu.desktop'
- 'Dolphin_Logo.png')
-
-# TODO: Drop the custom icon and .desktop file, apparently dolphin ships these now.
-
-build() {
- cd "${srcdir}/${pkgname%-*}"
-
- mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9
- make
-}
-
-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"
-}
-
-md5sums=('SKIP'
- 'feed4580c2e6bfbc7f6c67dad861daae'
- 'd15c51f547b4bd47e510faac40bcc9d6')
Copied: dolphin-emu/repos/community-x86_64/PKGBUILD (from rev 117592, dolphin-emu/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-19 01:01:42 UTC (rev 117593)
@@ -0,0 +1,46 @@
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Jeremy Newton (Mystro256)
+
+pkgname=dolphin-emu
+pkgver=4.0.2
+pkgrel=5
+epoch=1
+pkgdesc='A Gamecube / Wii / Triforce emulator'
+arch=('i686' 'x86_64')
+url='http://dolphin-emu.org'
+license=('GPL2')
+
+makedepends=('cmake' 'git' 'opencl-headers')
+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-gcc49.patch')
+md5sums=('SKIP'
+ '5fead49fc3a0ff9a9d1435368b5df1f9')
+
+prepare() {
+ cd "${srcdir}/${pkgname%-*}"
+
+ patch -Np1 -i ../dolphin-emu-gcc49.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname%-*}"
+
+ 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
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname%-*}/build"
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: dolphin-emu/repos/community-x86_64/dolphin-emu-gcc49.patch (from rev 117592, dolphin-emu/trunk/dolphin-emu-gcc49.patch)
===================================================================
--- community-x86_64/dolphin-emu-gcc49.patch (rev 0)
+++ community-x86_64/dolphin-emu-gcc49.patch 2014-08-19 01:01:42 UTC (rev 117593)
@@ -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)
Deleted: community-x86_64/dolphin-emu.desktop
===================================================================
--- community-x86_64/dolphin-emu.desktop 2014-08-19 01:01:27 UTC (rev 117592)
+++ community-x86_64/dolphin-emu.desktop 2014-08-19 01:01:42 UTC (rev 117593)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Dolphin
-Categories=Game;Emulator;GTK;
-GenericName=GameCube and Wii Emulator
-Comment=An emulator for the GameCube and Wii consoles
-Exec=dolphin-emu
-Icon=dolphin-emu
-StartupNotify=false
-Name[en_US]=Dolphin
Copied: dolphin-emu/repos/community-x86_64/dolphin-emu.desktop (from rev 117592, dolphin-emu/trunk/dolphin-emu.desktop)
===================================================================
--- community-x86_64/dolphin-emu.desktop (rev 0)
+++ community-x86_64/dolphin-emu.desktop 2014-08-19 01:01:42 UTC (rev 117593)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Dolphin
+Categories=Game;Emulator;GTK;
+GenericName=GameCube and Wii Emulator
+Comment=An emulator for the GameCube and Wii consoles
+Exec=dolphin-emu
+Icon=dolphin-emu
+StartupNotify=false
+Name[en_US]=Dolphin
More information about the arch-commits
mailing list