Move away from optdeps (FS#63813)

This makes for easier maintenance and better user experience
(out of the box) -- at the expense of some extra disk space.

See also:
https://github.com/archlinux/svntogit-packages/commit/a96b1142fe0bab0b5e7f7bbf4888d6973ecac069#diff-3e341d2d9c67be01819b25b25d5e53ea3cdf3a38d28846cda85a195eb9b7203a

2 files changed, 29 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85e93419bd80..538df6784591 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,54 +10,31 @@ pkgbase = audacious-plugins-git
 	license = GPL
 	makedepends = glib2
 	makedepends = python
-	makedepends = alsa-lib
-	makedepends = pulseaudio
-	makedepends = jack
-	makedepends = lame
-	makedepends = libvorbis
-	makedepends = flac
-	makedepends = mpg123
-	makedepends = faad2
-	makedepends = ffmpeg
-	makedepends = libmodplug
-	makedepends = fluidsynth
-	makedepends = libcdio-paranoia
-	makedepends = libsidplayfp
-	makedepends = wavpack
-	makedepends = libsamplerate
-	makedepends = libnotify
-	makedepends = lirc
-	makedepends = curl
-	makedepends = libmtp
-	makedepends = neon
-	makedepends = libmms
-	makedepends = libcue
-	makedepends = libbs2b
 	makedepends = git
 	depends = audacious-git
-	optdepends = alsa-lib: Advanced Linux Sound Arch. output
-	optdepends = pulseaudio: PulseAudio output
-	optdepends = jack: Jack Audio Connection Kit output
-	optdepends = lame: FileWriter MP3 output
-	optdepends = libvorbis: Vorbis input, FileWriter Vorbis output
-	optdepends = flac: FLAC input, FileWriter FLAC output
-	optdepends = mpg123: MP3 input
-	optdepends = faad2: AAC input
-	optdepends = ffmpeg: ffaudio input
-	optdepends = libmodplug: modplug input
-	optdepends = fluidsynth: MIDI FluidSynth backend input
-	optdepends = libcdio-paranoia: CD Digital Audio input
-	optdepends = libsidplayfp: Commodore 64 audio input
-	optdepends = wavpack: WavPack input
-	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
+	depends = alsa-lib
+	depends = curl
+	depends = dbus-glib
+	depends = faad2
+	depends = ffmpeg
+	depends = flac
+	depends = fluidsynth
+	depends = jack
+	depends = lame
+	depends = libcdio-paranoia
+	depends = libcue
+	depends = libmms
+	depends = libmodplug
+	depends = libmtp
+	depends = libnotify
+	depends = libsamplerate
+	depends = libsidplayfp
+	depends = libvorbis
+	depends = lirc
+	depends = mpg123
+	depends = neon
+	depends = pulseaudio
+	depends = wavpack
 	provides = audacious-plugins
 	conflicts = audacious-plugins
 	source = git://github.com/audacious-media-player/audacious-plugins.git
diff --git a/PKGBUILD b/PKGBUILD
index 6fd616a9f0d8..a84f5eb1ce5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,41 +15,12 @@ url="https://audacious-media-player.org/"
 license=('BSD' 'GPL')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-depends=('audacious-git')
-
-makedepends=('glib2' 'python' # for gdbus-codegen
-             'alsa-lib' 'pulseaudio' 'jack' 'lame' 'libvorbis' 'flac' 'mpg123'
-             'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia'
-             'libsidplayfp' 'wavpack' 'libsamplerate' 'libnotify' 'lirc'
-             'curl' 'libmtp' 'neon' 'libmms' 'libcue' 'libbs2b' 'git')
-
-optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
-            'pulseaudio: PulseAudio output'
-            'jack: Jack Audio Connection Kit output'
-            'lame: FileWriter MP3 output'
-            'libvorbis: Vorbis input, FileWriter Vorbis output'
-            'flac: FLAC input, FileWriter FLAC output'
-
-            'mpg123: MP3 input'
-            'faad2: AAC input'
-            'ffmpeg: ffaudio input'
-            'libmodplug: modplug input'
-            'fluidsynth: MIDI FluidSynth backend input'
-            'libcdio-paranoia: CD Digital Audio input'
-            'libsidplayfp: Commodore 64 audio input'
-            'wavpack: WavPack input'
-
-            'libsamplerate: Speed and Pitch Plugin'
-            'libnotify: libnotify OSD'
-            'lirc: LIRC'
-            'curl: AudioScrobbler Client'
-            'libmtp: Upload to MTP device'
-            'libbs2b: Bauer stereophonic-to-binaural DSP'
-
-            'neon: neon-based http transport'
-            'libmms: libmms-based mms transport'
-            'libcue: CUE playlist format')
-
+depends=('audacious-git'
+         'alsa-lib' 'curl' 'dbus-glib' 'faad2' 'ffmpeg' 'flac' 'fluidsynth'
+         'jack' 'lame' 'libcdio-paranoia' 'libcue' 'libmms' 'libmodplug'
+         'libmtp' 'libnotify' 'libsamplerate' 'libsidplayfp' 'libvorbis'
+         'lirc' 'mpg123' 'neon' 'pulseaudio' 'wavpack')
+makedepends=('glib2' 'python' 'git')
 source=("git://github.com/audacious-media-player/$_pkgname.git")
 sha256sums=('SKIP')