deadbeef: dependency fixes

4 files changed, 67 insertions, 13 deletions

diff --git a/audio-players/deadbeef/BUILD b/audio-players/deadbeef/BUILD
new file mode 100755
index 0000000000..f65c94f288
--- /dev/null
+++ b/audio-players/deadbeef/BUILD
@@ -0,0 +1,3 @@
+OPTS="$DEADBEEF_OPTS $OPTS" &&
+
+default_build
diff --git a/audio-players/deadbeef/DEPENDS b/audio-players/deadbeef/DEPENDS
index c0589f952e..17af1702f7 100755
--- a/audio-players/deadbeef/DEPENDS
+++ b/audio-players/deadbeef/DEPENDS
@@ -1,69 +1,110 @@
 if [[ "$GTK3" == y ]]; then
-  depends gtk+3 "--enable-gtk3" 
+  depends gtk+3 "--enable-gtk3"
 else
-  depends gtk+2
+  depends gtk+2 "--enable-gtk2 --disable-gtk3"
 fi &&
+
 optional_depends alsa-lib \
                  "--enable-alsa" \
                  "--disable-alsa" \
                  "For alsa output plugin" &&
+
 optional_depends pulseaudio \
                  "--enable-pulse" \
                  "--disable-pulse" \
                  "For PulseAudio output plugin" &&
+
 optional_depends libvorbis \
                  "--enable-vorbis" \
                  "--disable-vorbis" \
                  "For ogg vorbis playback" &&
+
 optional_depends libmad \
                  "--enable-mad" \
                  "--disable-mad" \
                  "For mp1/2/3 playback" &&
+
 optional_depends flac \
                  "--enable-flac" \
                  "--disable-flac" \
                  "For flac playback" &&
+
 optional_depends wavpack \
                  "--enable-wavpack" \
                  "--disable-wavpack" \
                  "For wv playback" &&
+
 optional_depends libsndfile \
-                 "--enable-wavpack" \
-                 "--disable-wavpack" \
-                 "For wav playback" &&
-optional_depends LIBAVCODEC \
+                 "--enable-sndfile" \
+                 "--disable-sndfile" \
+                 "For PCM wave (wav, aiff) playback" &&
+
+# FFMPEG 0.11 and higher is unsupported
+optional_depends -sub LEGACY ffmpeg \
                  "--enable-ffmpeg" \
                  "--disable-ffmpeg" \
                  "For wma, mpc, shn, aa3, oma, ac3, etc" &&
+
 optional_depends faad2 \
                  "--enable-aac" \
                  "--disable-aac" \
                  "For aac playback" &&
+
+if is_depends_enabled $SPELL faad2; then
+  config_query_option DEADBEEF_OPTS "Build with ALAC playback support?" y \
+                                    "--enable-alac" \
+                                    "--disable-alac"
+else
+  list_add DEADBEEF_OPTS "--disable-alac"
+fi &&
+
 optional_depends libzip \
                  "--enable-vfs-zip" \
                  "--disable-vfs-zip" \
                  "To play files from zip files without unpacking" &&
+
 optional_depends libsamplerate \
                  "--enable-src" \
                  "--disable-src" \
                  "For resampler plugin" &&
+
 optional_depends libcdio \
-                 "" \
-                 "" \
-                 "For audio cd playback" &&
-optional_depends libcddb \
-                 "" \
-                 "" \
+                 "--enable-cdda" \
+                 "--disable-cdda" \
                  "For audio cd playback" &&
+
+if is_depends_enabled $SPELL libcdio; then
+  depends libcddb
+else
+  list_add DEADBEEF_OPTS "--disable-cdda"
+fi &&
+
 optional_depends curl \
                  "--enable-vfs-curl --enable-lfm" \
                  "--disable-vfs-curl --disable-lfm" \
                  "For lastfm scrobbler, shoutcast, icecast, podcast support" &&
+
 optional_depends libx11 \
                  "--enable-hotkeys" \
                  "--disable-hotkeys" \
                  "For global hotkeys plugin" &&
+
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "to use Native Language Support" &&
+
+optional_depends dbus \
+                 "--enable-notify" \
+                 "--disable-notify" \
+                 "for notification-daemon support" &&
+
 optional_depends imlib2 \
                  "--enable-artwork-imlib2" \
                  "--disable-artwork-imlib2" \
-                 "For artwork plugin"
+                 "For artwork plugin" &&
+
+suggest_depends timidity \
+                "--enable-wildmidi" \
+                "--disable-wildmidi" \
+                "to build wildmidi plugin"
diff --git a/audio-players/deadbeef/FINAL b/audio-players/deadbeef/FINAL
new file mode 100755
index 0000000000..b374499e3a
--- /dev/null
+++ b/audio-players/deadbeef/FINAL
@@ -0,0 +1 @@
+gtk-update-icon-cache -q -t -f "$INSTALL_ROOT/usr/share/icons/hicolor"
diff --git a/audio-players/deadbeef/HISTORY b/audio-players/deadbeef/HISTORY
index 8773d3d5ee..60eff36867 100644
--- a/audio-players/deadbeef/HISTORY
+++ b/audio-players/deadbeef/HISTORY
@@ -1,3 +1,12 @@
+2013-09-23 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: readability++; fixed libsndfile flags; added disable flag
+	  for disabled gtk+3 operation; added missing gettext and dbus optional
+	  dependencies; added timidity suggest dependency; corrected libcdio
+	  and libcddb dependency order; added flags for ALAC; fixed ffmpeg
+	  support
+	* BUILD: added, to keep DEADBEEF_OPTS
+	* FINAL: added, to rebuild gtk icon cache
+
 2012-11-09 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.5.6