Switch to Qt, make GTK optional, general cleanups

2 files changed, 22 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d16005dce315..130d907f5b4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = audacious-plugins-git
 	pkgdesc = Plugins for Audacious
-	pkgver = 2019.02.24
+	pkgver = 2019.10.24
 	pkgrel = 1
 	url = https://audacious-media-player.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
 	license = GPL
-	makedepends = audacious-git>=2019.02.24
+	makedepends = audacious-git>=2019.10.24
 	makedepends = glib2
-	makedepends = python2
+	makedepends = python
 	makedepends = alsa-lib
 	makedepends = pulseaudio
 	makedepends = jack
@@ -24,7 +24,7 @@ pkgbase = audacious-plugins-git
 	makedepends = libcdio-paranoia
 	makedepends = libsidplayfp
 	makedepends = wavpack
-	makedepends = dbus-glib
+	makedepends = libsamplerate
 	makedepends = libnotify
 	makedepends = lirc
 	makedepends = curl
@@ -32,6 +32,7 @@ pkgbase = audacious-plugins-git
 	makedepends = neon
 	makedepends = libmms
 	makedepends = libcue
+	makedepends = libbs2b
 	makedepends = git
 	optdepends = alsa-lib: Advanced Linux Sound Arch. output
 	optdepends = pulseaudio: PulseAudio output
@@ -47,11 +48,12 @@ pkgbase = audacious-plugins-git
 	optdepends = libcdio-paranoia: CD Digital Audio input
 	optdepends = libsidplayfp: Commodore 64 audio input
 	optdepends = wavpack: WavPack input
-	optdepends = dbus-glib: Gnome Shortcuts Plugin
+	optdepends = libsamplerate: Speed and Pitch Plugin
 	optdepends = libnotify: libnotify OSD
 	optdepends = lirc: LIRC
 	optdepends = curl: AudioScrobbler Client
 	optdepends = libmtp: Upload to MTP device
+	optdepends = libbs2b: Bauer stereophonic-to-binaural DSP
 	optdepends = neon: neon-based http transport
 	optdepends = libmms: libmms-based mms transport
 	optdepends = libcue: CUE playlist format
diff --git a/PKGBUILD b/PKGBUILD
index 401d3bc8db6e..4220f239a6fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id$
 # Maintainer: Radioactiveman <thomas-lange2@gmx.de>
 # Contributor: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
-pkgname=audacious-plugins-git
-pkgver=2019.02.24
+_pkgname=audacious-plugins
+pkgname="$_pkgname-git"
+pkgver=2019.10.24
 pkgrel=1
 pkgdesc="Plugins for Audacious"
 arch=('i686' 'x86_64')
 url="https://audacious-media-player.org/"
 license=('BSD' 'GPL')
-provides=('audacious-plugins')
-conflicts=('audacious-plugins')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
 
 makedepends=("audacious-git>=$pkgver"
-             'glib2' 'python2' # for gdbus-codegen
+             'glib2' 'python' # for gdbus-codegen
              'alsa-lib' 'pulseaudio' 'jack' 'lame' 'libvorbis' 'flac' 'mpg123'
              'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia'
-             'libsidplayfp' 'wavpack' 'dbus-glib' 'libnotify' 'lirc' 'curl'
-             'libmtp' 'neon' 'libmms' 'libcue' 'git') # 'libbs2b')
+             'libsidplayfp' 'wavpack' 'libsamplerate' 'libnotify' 'lirc'
+             'curl' 'libmtp' 'neon' 'libmms' 'libcue' 'libbs2b' 'git')
 
 optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'pulseaudio: PulseAudio output'
@@ -38,18 +38,18 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libsidplayfp: Commodore 64 audio input'
             'wavpack: WavPack input'
 
-            'dbus-glib: Gnome Shortcuts Plugin'
+            'libsamplerate: Speed and Pitch Plugin'
             'libnotify: libnotify OSD'
             'lirc: LIRC'
             'curl: AudioScrobbler Client'
             'libmtp: Upload to MTP device'
-          # 'libbs2b: Bauer stereophonic-to-binaural DSP'
+            'libbs2b: Bauer stereophonic-to-binaural DSP'
 
             'neon: neon-based http transport'
             'libmms: libmms-based mms transport'
             'libcue: CUE playlist format')
 
-source=('git://github.com/audacious-media-player/audacious-plugins.git')
+source=("git://github.com/audacious-media-player/$_pkgname.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -57,18 +57,18 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/audacious-plugins"
+  cd "$srcdir/$_pkgname"
 
   autoreconf -I m4
   ./configure \
     --prefix=/usr \
-  # --enable-qt \
+  # --enable-gtk \
 
   make
 }
 
 package() {
-  cd "$srcdir/audacious-plugins"
+  cd "$srcdir/$_pkgname"
   make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/audacious-plugins/LICENSE"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 }