Kill the wx GUI

2 files changed, 22 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f57b5f6c73c6..a37fad323d3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,29 @@
 # Generated by mksrcinfo v8
-# Wed Jun 27 12:51:10 UTC 2018
+# Mon Jul  2 13:40:03 UTC 2018
 pkgbase = dolphin-emu-git
 	pkgdesc = A GameCube / Wii / Triforce emulator
-	pkgver = 5.0.r8143.29d51ff692
+	pkgver = 5.0.r8299.87c5d00e20
 	pkgrel = 1
 	url = http://www.dolphin-emu.org/
 	arch = x86_64
 	license = GPL
-	makedepends = cairo
 	makedepends = cmake
 	makedepends = git
-	makedepends = gtk2
 	makedepends = libglvnd
-	makedepends = pango
+	makedepends = python
 	depends = alsa-lib
 	depends = bluez-libs
 	depends = enet
-	depends = gcc-libs
-	depends = gdk-pixbuf2
-	depends = glib2
-	depends = glibc
 	depends = hidapi
 	depends = libevdev
 	depends = libgl
 	depends = libpng
 	depends = libpulse
-	depends = libsm
 	depends = libx11
 	depends = libxi
 	depends = libxrandr
-	depends = libxxf86vm
 	depends = lzo
 	depends = mbedtls
-	depends = miniupnpc
 	depends = qt5-base
 	depends = sfml
 	depends = zlib
@@ -40,6 +31,7 @@ pkgbase = dolphin-emu-git
 	depends = libavformat.so
 	depends = libavutil.so
 	depends = libcurl.so
+	depends = libminiupnpc.so
 	depends = libswscale.so
 	depends = libudev.so
 	depends = libusb-1.0.so
@@ -52,12 +44,6 @@ pkgname = dolphin-emu-git
 	provides = dolphin-emu
 	conflicts = dolphin-emu
 
-pkgname = dolphin-emu-cli-git
+pkgname = dolphin-emu-nogui-git
 	depends = dolphin-emu-git
 
-pkgname = dolphin-emu-wx-git
-	depends = cairo
-	depends = dolphin-emu-git
-	depends = gtk2
-	depends = pango
-
diff --git a/PKGBUILD b/PKGBUILD
index 13e80ba2828a..2b45cd80b11f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,21 @@
 # Contributor: Lightning <sgsdxzy@gmail.com>
 
 pkgbase=dolphin-emu-git
-pkgname=('dolphin-emu-git' 'dolphin-emu-cli-git' 'dolphin-emu-wx-git')
-pkgver=5.0.r8143.29d51ff692
+pkgname=('dolphin-emu-git' 'dolphin-emu-nogui-git')
+pkgver=5.0.r8299.87c5d00e20
 pkgrel=1
 pkgdesc='A GameCube / Wii / Triforce emulator'
 arch=('x86_64')
 url='http://www.dolphin-emu.org/'
 license=('GPL')
-depends=('alsa-lib' 'bluez-libs' 'enet' 'gcc-libs' 'gdk-pixbuf2' 'glib2'
-         'glibc' 'hidapi' 'libevdev' 'libgl' 'libpng' 'libpulse' 'libsm'
-         'libx11' 'libxi' 'libxrandr' 'libxxf86vm' 'lzo' 'mbedtls' 'miniupnpc'
-         'qt5-base' 'sfml' 'zlib'
-         'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libcurl.so'
-         'libswscale.so' 'libudev.so' 'libusb-1.0.so')
-makedepends=('cairo' 'cmake' 'git' 'gtk2' 'libglvnd' 'pango')
+depends=(
+  'alsa-lib' 'bluez-libs' 'enet' 'hidapi' 'libevdev' 'libgl' 'libpng'
+  'libpulse' 'libx11' 'libxi' 'libxrandr' 'lzo' 'mbedtls' 'qt5-base' 'sfml'
+  'zlib'
+  'libavcodec.so' 'libavformat.so' 'libavutil.so' 'libcurl.so'
+  'libminiupnpc.so' 'libswscale.so' 'libudev.so' 'libusb-1.0.so'
+)
+makedepends=('cmake' 'git' 'libglvnd' 'python')
 optdepends=('pulseaudio: PulseAudio backend')
 options=('!emptydirs')
 source=('dolphin-emu::git+https://github.com/dolphin-emu/dolphin.git')
@@ -28,8 +29,6 @@ pkgver() {
 }
 
 prepare() {
-  cd dolphin-emu
-
   if [[ -d build ]]; then
     rm -rf build
   fi
@@ -37,9 +36,9 @@ prepare() {
 }
 
 build() {
-  cd dolphin-emu/build
+  cd build
 
-  cmake .. \
+  cmake ../dolphin-emu \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
     -DENABLE_QT2='TRUE' \
@@ -52,30 +51,17 @@ package_dolphin-emu-git() {
   provides=('dolphin-emu')
   conflicts=('dolphin-emu')
 
-  cd dolphin-emu/build
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/dolphin-emu-{nogui,wx}
+  make DESTDIR="${pkgdir}" -C build install
+  rm "${pkgdir}"/usr/bin/dolphin-emu-nogui
 
-  install -Dm 644 ../Data/51-usb-device.rules -t "${pkgdir}"/usr/lib/udev/rules.d/
+  install -Dm 644 dolphin-emu/Data/51-usb-device.rules -t "${pkgdir}"/usr/lib/udev/rules.d/
 }
 
-package_dolphin-emu-cli-git() {
+package_dolphin-emu-nogui-git() {
   depends=('dolphin-emu-git')
 
-  cd dolphin-emu/build
-
-  install -dm 755 "${pkgdir}"/usr/bin
-  install -m 755 Binaries/dolphin-emu-nogui "${pkgdir}"/usr/bin/dolphin-emu-cli
-}
-
-package_dolphin-emu-wx-git() {
-  depends=('cairo' 'dolphin-emu-git' 'gtk2' 'pango')
-
-  cd dolphin-emu/build
-
   install -dm 755 "${pkgdir}"/usr/bin
-  install -m 755 Binaries/dolphin-emu-wx "${pkgdir}"/usr/bin/
+  install -m 755 build/Binaries/dolphin-emu-nogui "${pkgdir}"/usr/bin/dolphin-emu-cli
 }
 
 # vim: ts=2 sw=2 et: