[arch-commits] Commit in dolphin-emu/repos (5 files)
Date: Friday, July 12, 2013 @ 11:12:34
Author: schuay
Revision: 93970
archrelease: copy trunk to community-staging-x86_64
Added:
dolphin-emu/repos/community-staging-x86_64/
dolphin-emu/repos/community-staging-x86_64/Dolphin_Logo.png
(from rev 93969, dolphin-emu/trunk/Dolphin_Logo.png)
dolphin-emu/repos/community-staging-x86_64/PKGBUILD
(from rev 93969, dolphin-emu/trunk/PKGBUILD)
dolphin-emu/repos/community-staging-x86_64/dolphin-emu.desktop
(from rev 93969, dolphin-emu/trunk/dolphin-emu.desktop)
dolphin-emu/repos/community-staging-x86_64/gcc48fix.patch
(from rev 93969, dolphin-emu/trunk/gcc48fix.patch)
-+
PKGBUILD| 48 ++
dolphin-emu.desktop | 11 ++
gcc48fix.patch | 225 ++
3 files changed, 284 insertions(+)
Copied: dolphin-emu/repos/community-staging-x86_64/Dolphin_Logo.png (from rev
93969, dolphin-emu/trunk/Dolphin_Logo.png)
===
(Binary files differ)
Copied: dolphin-emu/repos/community-staging-x86_64/PKGBUILD (from rev 93969,
dolphin-emu/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-07-12 09:12:34 UTC (rev 93970)
@@ -0,0 +1,48 @@
+# Maintainer: schuay
+# Contributor: Jeremy Newton (Mystro256)
+
+pkgname=dolphin-emu
+pkgver=3.5
+pkgrel=5
+epoch=1
+pkgdesc='A Gamecube / Wii / Triforce Emulator'
+arch=('i686' 'x86_64')
+url='http://dolphin-emu.org'
+license=('GPL2')
+
+makedepends=('cmake' 'glproto' 'opencl-headers')
+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'
+'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
+}
+
+package() {
+ cd "${srcdir}/dolphin-${pkgver}/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=('4d0429f1e10f0862256e0b4c4e2f44a3'
+ 'feed4580c2e6bfbc7f6c67dad861daae'
+ 'd15c51f547b4bd47e510faac40bcc9d6'
+ 'ddeddc2a65042486565b4b78ad739a80')
Copied: dolphin-emu/repos/community-staging-x86_64/dolphin-emu.desktop (from
rev 93969, dolphin-emu/trunk/dolphin-emu.desktop)
===
--- community-staging-x86_64/dolphin-emu.desktop
(rev 0)
+++ community-staging-x86_64/dolphin-emu.desktop2013-07-12 09:12:34 UTC
(rev 93970)
@@ -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
Copied: dolphin-emu/repos/community-staging-x86_64/gcc48fix.patch (from rev
93969, dolphin-emu/trunk/gcc48fix.patch)
===
--- community-staging-x86_64/gcc48fix.patch (rev 0)
+++ community-staging-x86_64/gcc48fix.patch 2013-07-12 09:12:34 UTC (rev
93970)
@@ -0,0 +1,225 @@
+diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp
b/Externals/Bochs_disasm/PowerPCDisasm.cpp
+index 56719ff..c25de50 100644
+--- a/Externals/Bochs_disasm/PowerPCDisasm.cpp
b/Externals/Bochs_disasm/PowerPCDisasm.cpp
+@@ -580,7 +580,7 @@ typedef unsigned int ppc_word;
+ if (me < mb)
+ mask = ~mask;
+ //rotate the mask so it can be applied to source reg
+- return _rotl(mask, 32 - r);
++ return __rotl(mask, 32 - r);
+ }
+
+
+diff --git a/Source/Core/Common/Src/CommonFuncs.h
b/Source/Core/Common/Src/CommonFuncs.h
+index f892769..e29ab7c 100644
+--- a/Source/Core/Common/Src/CommonFuncs.h
b/Source/Core/Common/Src/CommonFuncs.h
+@@ -67,7 +67,7 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
+ #endif
+ #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
+
+-inline u32 _rotl(u32 x, int shift) {
++inline u32 __rotl(u32 x, int shift) {
+shift &= 31;
+if (!shift) return x;
+return (x << shift) | (x >> (32 - shift));
+@@ -78,7 +78,7 @@ inline
[arch-commits] Commit in dolphin-emu/repos (5 files)
Date: Friday, July 12, 2013 @ 11:12:26
Author: schuay
Revision: 93969
archrelease: copy trunk to community-staging-i686
Added:
dolphin-emu/repos/community-staging-i686/
dolphin-emu/repos/community-staging-i686/Dolphin_Logo.png
(from rev 93968, dolphin-emu/trunk/Dolphin_Logo.png)
dolphin-emu/repos/community-staging-i686/PKGBUILD
(from rev 93968, dolphin-emu/trunk/PKGBUILD)
dolphin-emu/repos/community-staging-i686/dolphin-emu.desktop
(from rev 93968, dolphin-emu/trunk/dolphin-emu.desktop)
dolphin-emu/repos/community-staging-i686/gcc48fix.patch
(from rev 93968, dolphin-emu/trunk/gcc48fix.patch)
-+
PKGBUILD| 48 ++
dolphin-emu.desktop | 11 ++
gcc48fix.patch | 225 ++
3 files changed, 284 insertions(+)
Copied: dolphin-emu/repos/community-staging-i686/Dolphin_Logo.png (from rev
93968, dolphin-emu/trunk/Dolphin_Logo.png)
===
(Binary files differ)
Copied: dolphin-emu/repos/community-staging-i686/PKGBUILD (from rev 93968,
dolphin-emu/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-12 09:12:26 UTC (rev 93969)
@@ -0,0 +1,48 @@
+# Maintainer: schuay
+# Contributor: Jeremy Newton (Mystro256)
+
+pkgname=dolphin-emu
+pkgver=3.5
+pkgrel=5
+epoch=1
+pkgdesc='A Gamecube / Wii / Triforce Emulator'
+arch=('i686' 'x86_64')
+url='http://dolphin-emu.org'
+license=('GPL2')
+
+makedepends=('cmake' 'glproto' 'opencl-headers')
+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'
+'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
+}
+
+package() {
+ cd "${srcdir}/dolphin-${pkgver}/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=('4d0429f1e10f0862256e0b4c4e2f44a3'
+ 'feed4580c2e6bfbc7f6c67dad861daae'
+ 'd15c51f547b4bd47e510faac40bcc9d6'
+ 'ddeddc2a65042486565b4b78ad739a80')
Copied: dolphin-emu/repos/community-staging-i686/dolphin-emu.desktop (from rev
93968, dolphin-emu/trunk/dolphin-emu.desktop)
===
--- community-staging-i686/dolphin-emu.desktop (rev 0)
+++ community-staging-i686/dolphin-emu.desktop 2013-07-12 09:12:26 UTC (rev
93969)
@@ -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
Copied: dolphin-emu/repos/community-staging-i686/gcc48fix.patch (from rev
93968, dolphin-emu/trunk/gcc48fix.patch)
===
--- community-staging-i686/gcc48fix.patch (rev 0)
+++ community-staging-i686/gcc48fix.patch 2013-07-12 09:12:26 UTC (rev
93969)
@@ -0,0 +1,225 @@
+diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp
b/Externals/Bochs_disasm/PowerPCDisasm.cpp
+index 56719ff..c25de50 100644
+--- a/Externals/Bochs_disasm/PowerPCDisasm.cpp
b/Externals/Bochs_disasm/PowerPCDisasm.cpp
+@@ -580,7 +580,7 @@ typedef unsigned int ppc_word;
+ if (me < mb)
+ mask = ~mask;
+ //rotate the mask so it can be applied to source reg
+- return _rotl(mask, 32 - r);
++ return __rotl(mask, 32 - r);
+ }
+
+
+diff --git a/Source/Core/Common/Src/CommonFuncs.h
b/Source/Core/Common/Src/CommonFuncs.h
+index f892769..e29ab7c 100644
+--- a/Source/Core/Common/Src/CommonFuncs.h
b/Source/Core/Common/Src/CommonFuncs.h
+@@ -67,7 +67,7 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
+ #endif
+ #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
+
+-inline u32 _rotl(u32 x, int shift) {
++inline u32 __rotl(u32 x, int shift) {
+shift &= 31;
+if (!shift) return x;
+return (x << shift) | (x >> (32 - shift));
+@@ -78,7 +78,7 @@ inline u64 _rotl64(u64 x, unsigned int shif
