From 50e90b3557ba0ed1667b0d962cc200fa65416ae2 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Wed, 21 Oct 2015 12:32:12 -0400 Subject: [PATCH] dolphin-emu: fix musl; build against our wxWidgets package. --- srcpkgs/dolphin-emu/patches/fix-musl.patch | 23 ++++++++++++++++++++++ srcpkgs/dolphin-emu/template | 5 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/dolphin-emu/patches/fix-musl.patch diff --git a/srcpkgs/dolphin-emu/patches/fix-musl.patch b/srcpkgs/dolphin-emu/patches/fix-musl.patch new file mode 100644 index 00000000000..98b86c80a6a --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/fix-musl.patch @@ -0,0 +1,23 @@ +--- ./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 + void print_trace(const char * msg) + { diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 0a86e2d4885..6d137031ea8 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -11,12 +11,13 @@ version=4.0.2 revision=7 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=ON -DUSE_WAYLAND=OFF -DUSE_EGL=OFF -DUSE_GLES=OFF -DUSE_GLES3=OFF + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" hostmakedepends="cmake 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" + portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel" depends="desktop-file-utils" short_desc="A Gamecube / Wii / Triforce emulator" maintainer="Juan RP "