Date: Thursday, February 22, 2018 @ 18:49:26 Author: alucryd Revision: 297106
archrelease: copy trunk to community-staging-x86_64 Added: dolphin-emu/repos/community-staging-x86_64/PKGBUILD (from rev 297103, dolphin-emu/trunk/PKGBUILD) dolphin-emu/repos/community-staging-x86_64/dolphin-emu-5.0-gtk3.patch (from rev 297104, dolphin-emu/trunk/dolphin-emu-5.0-gtk3.patch) Deleted: dolphin-emu/repos/community-staging-x86_64/PKGBUILD dolphin-emu/repos/community-staging-x86_64/dolphin-emu-5.0-gtk3.patch ----------------------------+ PKGBUILD | 118 +++++++++++++++++++++---------------------- dolphin-emu-5.0-gtk3.patch | 50 +++++++++--------- 2 files changed, 85 insertions(+), 83 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-02-22 18:49:23 UTC (rev 297105) +++ PKGBUILD 2018-02-22 18:49:26 UTC (rev 297106) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: schuay <jakob.gru...@gmail.com> -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Jeremy Newton (Mystro256) <alexjn...@gmail.com> - -pkgname=dolphin-emu -pkgver=5.0 -pkgrel=5 -epoch=1 -pkgdesc='A Gamecube / Wii / Triforce emulator' -arch=('x86_64') -url='http://dolphin-emu.org' -license=('GPL') - -makedepends=('cmake') -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" - "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} - - mkdir -p build && cd build - cmake .. \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_CXX_FLAGS='-fno-pie -fPIC' \ - -DUSE_SHARED_ENET='TRUE' \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \ - -DDISTRIBUTOR='archlinux.org' - make -} - -package() { - cd dolphin-${pkgver}/build - - make DESTDIR="${pkgdir}" install - - install -Dm 644 ../Data/51-usb-device.rules -t "${pkgdir}"/usr/lib/udev/rules.d/ -} - -# vim: ts=2 sw=2 et: Copied: dolphin-emu/repos/community-staging-x86_64/PKGBUILD (from rev 297103, dolphin-emu/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-02-22 18:49:26 UTC (rev 297106) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: schuay <jakob.gru...@gmail.com> +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Jeremy Newton (Mystro256) <alexjn...@gmail.com> + +pkgname=dolphin-emu +pkgver=5.0.r6362.c08f6f0c53 +pkgrel=1 +epoch=1 +pkgdesc='A Gamecube / Wii / Triforce emulator' +arch=('x86_64') +url='http://dolphin-emu.org' +license=('GPL') +depends=('alsa-lib' 'bluez-libs' 'cairo' 'enet' 'gcc-libs' 'gdk-pixbuf2' + 'glib2' 'glibc' 'gtk2' 'hidapi' 'libevdev' 'libgl' 'libpng' 'libpulse' + 'libsm' 'libx11' 'libxi' 'libxrandr' 'libxxf86vm' 'lzo' 'mbedtls' + 'miniupnpc' 'pango' 'sfml' 'zlib' + 'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libcurl.so' + 'libswscale.so' 'libudev.so' 'libusb-1.0.so') +makedepends=('cmake' 'git') +optdepends=('pulseaudio: PulseAudio backend') +options=('!emptydirs') +_commit='c08f6f0c5335464c70c9c5e56330baced5ba6802' +source=("dolphin-emu::git+https://github.com/dolphin-emu/dolphin.git#commit=${_commit}") +sha256sums=('SKIP') + +pkgver() { + cd dolphin-emu + + git describe | sed 's/-/.r/; s/-g/./' +} + +prepare() { + if [[ -d build ]]; then + rm -rf build + fi + mkdir build +} + +build() { + cd build + + cmake ../dolphin-emu \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_CXX_FLAGS='-fno-pie -fPIC' \ + -DENABLE_QT2='OFF' \ + -DUSE_SHARED_ENET='ON' \ + -DDISTRIBUTOR='archlinux.org' + make +} + +package() { + cd build + + make DESTDIR="${pkgdir}" install + + install -Dm 644 ../dolphin-emu/Data/51-usb-device.rules -t "${pkgdir}"/usr/lib/udev/rules.d/ +} + +# vim: ts=2 sw=2 et: Deleted: dolphin-emu-5.0-gtk3.patch =================================================================== --- dolphin-emu-5.0-gtk3.patch 2018-02-22 18:49:23 UTC (rev 297105) +++ dolphin-emu-5.0-gtk3.patch 2018-02-22 18:49:26 UTC (rev 297106) @@ -1,25 +0,0 @@ ---- 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) Copied: dolphin-emu/repos/community-staging-x86_64/dolphin-emu-5.0-gtk3.patch (from rev 297104, dolphin-emu/trunk/dolphin-emu-5.0-gtk3.patch) =================================================================== --- dolphin-emu-5.0-gtk3.patch (rev 0) +++ dolphin-emu-5.0-gtk3.patch 2018-02-22 18:49:26 UTC (rev 297106) @@ -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)