[arch-commits] Commit in dolphin-emu/repos/community-x86_64 (3 files)

[Balló György]

    Date: Monday, July 3, 2017 @ 07:24:01
  Author: bgyorgy
Revision: 242103

archrelease: copy trunk to community-x86_64

Added:
  dolphin-emu/repos/community-x86_64/PKGBUILD
    (from rev 242102, dolphin-emu/trunk/PKGBUILD)
  dolphin-emu/repos/community-x86_64/dolphin-emu-5.0-gtk3.patch
    (from rev 242102, dolphin-emu/trunk/dolphin-emu-5.0-gtk3.patch)
Deleted:
  dolphin-emu/repos/community-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |  105 ++++++++++++++++++++++++-------------------
 dolphin-emu-5.0-gtk3.patch |   25 ++++++++++
 2 files changed, 84 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-03 07:23:57 UTC (rev 242102)
+++ PKGBUILD	2017-07-03 07:24:01 UTC (rev 242103)
@@ -1,46 +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=5.0
-pkgrel=3
-epoch=1
-pkgdesc='A Gamecube / Wii / Triforce emulator'
-arch=('x86_64')
-url='http://dolphin-emu.org'
-license=('GPL')
-
-makedepends=('cmake')
-depends=('bluez-libs' 'enet' 'ffmpeg' 'libao' 'libevdev' 'mbedtls' 'miniupnpc'
-         'openal' 'portaudio' 'soundtouch' 'xdg-utils' 'wxgtk')
-optdepends=('pulseaudio: PulseAudio backend')
-
-options=('!emptydirs')
-
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dolphin-emu/dolphin/archive/${pkgver}.tar.gz")
-sha256sums=('62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b')
-
-build() {
-  cd dolphin-${pkgver}
-
-  mkdir build && cd build
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_CXX_FLAGS='-fno-pie' \
-    -DENABLE_LTO='TRUE' \
-    -DUSE_SHARED_ENET='TRUE' \
-    -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-x86_64/PKGBUILD (from rev 242102, dolphin-emu/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-07-03 07:24:01 UTC (rev 242103)
@@ -0,0 +1,59 @@
+# $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=5.0
+pkgrel=4
+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 build && cd build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_CXX_FLAGS='-fno-pie' \
+    -DENABLE_LTO='TRUE' \
+    -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-x86_64/dolphin-emu-5.0-gtk3.patch (from rev 242102, dolphin-emu/trunk/dolphin-emu-5.0-gtk3.patch)
===================================================================
--- dolphin-emu-5.0-gtk3.patch	                        (rev 0)
+++ dolphin-emu-5.0-gtk3.patch	2017-07-03 07:24:01 UTC (rev 242103)
@@ -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)