Date: Monday, July 3, 2017 @ 07:23:57 Author: bgyorgy Revision: 242102
upgpkg: dolphin-emu 1:5.0-4 Fix build, build with wxgtk3 Added: dolphin-emu/trunk/dolphin-emu-5.0-gtk3.patch Modified: dolphin-emu/trunk/PKGBUILD ----------------------------+ PKGBUILD | 23 ++++++++++++++++++----- dolphin-emu-5.0-gtk3.patch | 25 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-03 05:59:41 UTC (rev 242101) +++ PKGBUILD 2017-07-03 07:23:57 UTC (rev 242102) @@ -5,7 +5,7 @@ pkgname=dolphin-emu pkgver=5.0 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc='A Gamecube / Wii / Triforce emulator' arch=('x86_64') @@ -13,15 +13,27 @@ license=('GPL') makedepends=('cmake') -depends=('bluez-libs' 'enet' 'ffmpeg' 'libao' 'libevdev' 'mbedtls' 'miniupnpc' - 'openal' 'portaudio' 'soundtouch' 'xdg-utils' 'wxgtk') +depends=('bluez-libs' 'curl' 'enet' 'ffmpeg' 'libao' 'libevdev' 'mbedtls' 'miniupnpc' + 'openal' 'portaudio' 'soundtouch' 'xdg-utils' 'wxgtk3') optdepends=('pulseaudio: PulseAudio backend') options=('!emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dolphin-emu/dolphin/archive/${pkgver}.tar.gz") -sha256sums=('62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dolphin-emu/dolphin/archive/${pkgver}.tar.gz" + "dolphin-emu-5.0-gtk3.patch") +sha256sums=('62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b' + '04eed9ebea63b343374de030875f539e4eb03f8536cb8deb4bdc348cd0e7cae4') +prepare() { + cd dolphin-${pkgver} + + # Fix build + sed -i 's/CHAR_/CHARACTER_/g' Source/Core/VideoBackends/OGL/RasterFont.cpp + + # Build with gtk3 + patch -Np1 -i ../dolphin-emu-5.0-gtk3.patch +} + build() { cd dolphin-${pkgver} @@ -31,6 +43,7 @@ -DCMAKE_CXX_FLAGS='-fno-pie' \ -DENABLE_LTO='TRUE' \ -DUSE_SHARED_ENET='TRUE' \ + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \ -DDISTRIBUTOR='archlinux.org' make } Added: dolphin-emu-5.0-gtk3.patch =================================================================== --- dolphin-emu-5.0-gtk3.patch (rev 0) +++ dolphin-emu-5.0-gtk3.patch 2017-07-03 07:23:57 UTC (rev 242102) @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -773,18 +773,10 @@ if(NOT DISABLE_WX AND NOT ANDROID) + execute_process(COMMAND lsb_release -c -s + OUTPUT_VARIABLE DIST_NAME + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +- if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} +- VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty") +- check_lib(GTK2 gtk+-2.0 gtk+-2.0 gtk.h REQUIRED) +- else() +- include(FindGTK2) +- if(GTK2_FOUND) +- include_directories(${GTK2_INCLUDE_DIRS}) +- list(APPEND LIBS ${GTK2_LIBRARIES}) +- else() +- message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.") +- endif() +- endif() ++ ++ check_lib(GTK3 gtk+-3.0 gtk.h REQUIRED) ++ include_directories(${GTK3_INCLUDE_DIRS}) ++ list(APPEND LIBS ${GTK3_LIBRARIES}) + endif() + + if(wxWidgets_FOUND)