dolphin-emu: update to 5.0.

This commit is contained in:
Juan RP 2016-06-26 09:02:32 +02:00
parent 354dff02f8
commit edbb9ce78a
4 changed files with 32 additions and 49 deletions

View File

@ -1,12 +0,0 @@
--- CMakeLists.txt.orig 2015-09-21 18:07:53.311175825 +0200
+++ CMakeLists.txt 2015-09-21 18:08:14.138130904 +0200
@@ -415,8 +415,7 @@ if(NOT ANDROID)
add_definitions(-DHAVE_WAYLAND=0)
endif(USE_WAYLAND AND WAYLAND_FOUND)
- # 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)

View File

@ -1,23 +0,0 @@
--- ./Source/Core/Common/Src/Thread.cpp.orig 2015-10-21 12:01:13.444981266 -0400
+++ ./Source/Core/Common/Src/Thread.cpp 2015-10-21 12:01:57.739979915 -0400
@@ -123,7 +123,7 @@
{
#ifdef __APPLE__
pthread_setname_np(szThreadName);
-#else
+#elif defined __GLIBC__
pthread_setname_np(pthread_self(), szThreadName);
#endif
}
--- ./Source/Core/Core/Src/x64MemTools.cpp.orig 2015-10-21 12:16:39.401953012 -0400
+++ ./Source/Core/Core/Src/x64MemTools.cpp 2015-10-21 12:16:55.380952525 -0400
@@ -55,7 +55,7 @@
namespace EMM
{
-#if defined __APPLE__ || defined __linux__ || defined __FreeBSD__
+#if defined __APPLE__ || defined __GLIBC__ || defined __FreeBSD__
#include <execinfo.h>
void print_trace(const char * msg)
{

View File

@ -0,0 +1,22 @@
--- Source/PCH/pch.h.orig 2016-06-26 08:53:16.021952803 +0200
+++ Source/PCH/pch.h 2016-06-26 08:54:20.662712317 +0200
@@ -19,7 +19,7 @@
#include <ctype.h>
#include <deque>
#include <errno.h>
-#if !defined ANDROID && !defined _WIN32
+#if defined(__linux__) && defined(__GLIBC__)
#include <execinfo.h>
#endif
#include <fcntl.h>
--- Source/Core/Common/Thread.cpp.orig 2016-06-26 08:56:12.959031810 +0200
+++ Source/Core/Common/Thread.cpp 2016-06-26 08:57:27.281905099 +0200
@@ -135,7 +135,7 @@ void SetCurrentThreadName(const char* sz
pthread_setname_np(szThreadName);
#elif defined __FreeBSD__
pthread_set_name_np(pthread_self(), szThreadName);
-#else
+#elif defined __GLIBC__
// linux doesn't allow to set more than 16 bytes, including \0.
pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str());
#endif

View File

@ -1,30 +1,26 @@
# Template file for 'dolphin-emu'
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
# XXX polarssl is incompatible.
# XXX wxWidgets-3.0: undefined reference to wxCommandEvent::Clone()
CFLAGS="-mssse3"
CXXFLAGS="-mssse3"
only_for_archs="x86_64 x86_64-musl"
pkgname=dolphin-emu
version=4.0.2
revision=7
version=5.0
revision=1
wrksrc="dolphin-${version}"
build_style=cmake
configure_args="-DUSE_X11=ON -DUSE_WAYLAND=OFF -DUSE_EGL=OFF -DUSE_GLES=OFF -DUSE_GLES3=OFF
configure_args="-DUSE_X11=1 -DUSE_EGL=0
-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
hostmakedepends="cmake pkg-config"
hostmakedepends="pkg-config"
makedepends="
zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel libgomp-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel"
zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel
mbedtls-devel SFML-devel libenet-devel"
depends="desktop-file-utils"
short_desc="A Gamecube / Wii / Triforce emulator"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://dolphin-emu.org"
distfiles="https://github.com/dolphin-emu/dolphin/archive/${version}.tar.gz"
checksum=09f10f73abe0a7b5d10a51b3b56dc0044331bb12d6a18fe969c9bbd83a9b1129
checksum=62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b
post_install() {
rm -f ${DESTDIR}/usr/lib/*.a