[arch-commits] Commit in dolphin-emu/repos/community-x86_64 (6 files)
Jakob Gruber
schuay at archlinux.org
Sat Nov 7 12:10:29 UTC 2015
Date: Saturday, November 7, 2015 @ 13:10:28
Author: schuay
Revision: 146362
archrelease: copy trunk to community-x86_64
Added:
dolphin-emu/repos/community-x86_64/PKGBUILD
(from rev 146361, dolphin-emu/trunk/PKGBUILD)
dolphin-emu/repos/community-x86_64/dolphin-emu-findx11.patch
(from rev 146361, dolphin-emu/trunk/dolphin-emu-findx11.patch)
dolphin-emu/repos/community-x86_64/dolphin-emu-gcc49.patch
(from rev 146361, dolphin-emu/trunk/dolphin-emu-gcc49.patch)
Deleted:
dolphin-emu/repos/community-x86_64/PKGBUILD
dolphin-emu/repos/community-x86_64/dolphin-emu-findx11.patch
dolphin-emu/repos/community-x86_64/dolphin-emu-gcc49.patch
---------------------------+
PKGBUILD | 110 ++++++++++++++++++++++----------------------
dolphin-emu-findx11.patch | 22 ++++----
dolphin-emu-gcc49.patch | 34 ++++++-------
3 files changed, 83 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-07 12:10:21 UTC (rev 146361)
+++ PKGBUILD 2015-11-07 12:10:28 UTC (rev 146362)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Jeremy Newton (Mystro256) <alexjnewt at gmail.com>
-
-pkgname=dolphin-emu
-pkgver=4.0.2
-pkgrel=11
-epoch=1
-pkgdesc='A Gamecube / Wii / Triforce emulator'
-arch=('i686' 'x86_64')
-url='http://dolphin-emu.org'
-license=('GPL2')
-
-makedepends=('cmake' 'opencl-headers')
-depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio'
- 'sdl2' 'soundtouch' 'wxgtk')
-optdepends=('pulseaudio: PulseAudio backend')
-
-options=('!emptydirs')
-
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dolphin-emu/dolphin/archive/${pkgver}.tar.gz"
- 'dolphin-emu-findx11.patch'
- 'dolphin-emu-gcc49.patch')
-md5sums=('95436ade64fc8ed2fe4b2ed5306dc879'
- 'f9a692b76263f3efae9793c4879bc2c5'
- '5fead49fc3a0ff9a9d1435368b5df1f9')
-
-prepare() {
- cd dolphin-${pkgver}
-
- patch -Np1 -i ../dolphin-emu-findx11.patch
- patch -Np1 -i ../dolphin-emu-gcc49.patch
-
- # Compatibility with miniupnpc 1.9.20150730, which requires a new ttl argument.
- sed -i 's:upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);:upnpDiscover(2000, NULL, NULL, 0, 0, 2, \&upnperror);:' \
- Source/Core/Core/Src/NetPlayServer.cpp
-}
-
-build() {
- cd dolphin-${pkgver}
-
- mkdir build && cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_CXX_FLAGS='-fno-inline-functions -fpermissive'
- make
-}
-
-package() {
- cd dolphin-${pkgver}/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/lib/libpolarssl.a"
-}
Copied: dolphin-emu/repos/community-x86_64/PKGBUILD (from rev 146361, dolphin-emu/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-11-07 12:10:28 UTC (rev 146362)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Jeremy Newton (Mystro256) <alexjnewt at gmail.com>
+
+pkgname=dolphin-emu
+pkgver=4.0.2
+pkgrel=12
+epoch=1
+pkgdesc='A Gamecube / Wii / Triforce emulator'
+arch=('i686' 'x86_64')
+url='http://dolphin-emu.org'
+license=('GPL2')
+
+makedepends=('cmake' 'opencl-headers')
+depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio'
+ 'sdl2' 'soundtouch' 'wxgtk')
+optdepends=('pulseaudio: PulseAudio backend')
+
+options=('!emptydirs')
+
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dolphin-emu/dolphin/archive/${pkgver}.tar.gz"
+ 'dolphin-emu-findx11.patch'
+ 'dolphin-emu-gcc49.patch')
+md5sums=('95436ade64fc8ed2fe4b2ed5306dc879'
+ 'f9a692b76263f3efae9793c4879bc2c5'
+ '5fead49fc3a0ff9a9d1435368b5df1f9')
+
+prepare() {
+ cd dolphin-${pkgver}
+
+ patch -Np1 -i ../dolphin-emu-findx11.patch
+ patch -Np1 -i ../dolphin-emu-gcc49.patch
+
+ # Compatibility with miniupnpc 1.9.20150730, which requires a new ttl argument.
+ sed -i 's:upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);:upnpDiscover(2000, NULL, NULL, 0, 0, 2, \&upnperror);:' \
+ Source/Core/Core/Src/NetPlayServer.cpp
+}
+
+build() {
+ cd dolphin-${pkgver}
+
+ mkdir build && cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DCMAKE_CXX_FLAGS='-fno-inline-functions -fpermissive'
+ make
+}
+
+package() {
+ cd dolphin-${pkgver}/build
+
+ make DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}/usr/lib/libpolarssl.a"
+}
Deleted: dolphin-emu-findx11.patch
===================================================================
--- dolphin-emu-findx11.patch 2015-11-07 12:10:21 UTC (rev 146361)
+++ dolphin-emu-findx11.patch 2015-11-07 12:10:28 UTC (rev 146362)
@@ -1,11 +0,0 @@
-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)
Copied: dolphin-emu/repos/community-x86_64/dolphin-emu-findx11.patch (from rev 146361, dolphin-emu/trunk/dolphin-emu-findx11.patch)
===================================================================
--- dolphin-emu-findx11.patch (rev 0)
+++ dolphin-emu-findx11.patch 2015-11-07 12:10:28 UTC (rev 146362)
@@ -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)
Deleted: dolphin-emu-gcc49.patch
===================================================================
--- dolphin-emu-gcc49.patch 2015-11-07 12:10:21 UTC (rev 146361)
+++ dolphin-emu-gcc49.patch 2015-11-07 12:10:28 UTC (rev 146362)
@@ -1,17 +0,0 @@
-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)
Copied: dolphin-emu/repos/community-x86_64/dolphin-emu-gcc49.patch (from rev 146361, dolphin-emu/trunk/dolphin-emu-gcc49.patch)
===================================================================
--- dolphin-emu-gcc49.patch (rev 0)
+++ dolphin-emu-gcc49.patch 2015-11-07 12:10:28 UTC (rev 146362)
@@ -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)
More information about the arch-commits
mailing list