Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (9074c590370507ba461453e1c5c3c2689bb4f604)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (9074c590370507ba461453e1c5c3c2689bb4f604)
  • Date: Fri, 24 Apr 2015 02:05:26 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-plugins/audacious-plugins/BUILD | 4 --
audio-plugins/audacious-plugins/CONFIGURE | 51
++++++++++++++++++------------
audio-plugins/audacious-plugins/DEPENDS | 24 +++++++-------
audio-plugins/audacious-plugins/HISTORY | 9 ++++-
4 files changed, 53 insertions(+), 35 deletions(-)

New commits:
commit 9074c590370507ba461453e1c5c3c2689bb4f604
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

audacious-plugins: post-update fixes

(cherry picked from commit ac5b49480326d6b851f83d52b318b425560eb978)

commit 9e29842870c18a5b1ca437d4cb6331e1dff8ffd9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "audacious-plugins needs libbinio"

This reverts commit 061e683e02493dd5e83ad0645dced151cec493dc.

Reason: libbinio is optional, see configure.ac
(cherry picked from commit 1c7399ee11dddb1773def061ee1be8f7f26603d0)

diff --git a/audio-plugins/audacious-plugins/BUILD
b/audio-plugins/audacious-plugins/BUILD
index 84b3ceb..402b30b 100755
--- a/audio-plugins/audacious-plugins/BUILD
+++ b/audio-plugins/audacious-plugins/BUILD
@@ -1,4 +1,2 @@
-OPTS="$AUDACIOUS_IPV6 $AUDACIOUS_STATUS $AUDACIOUS_OSD $AUDACIOUS_COSD
$OPTS" &&
-OPTS="$AUDACIOUS_SONGCHANGE $AUDACIOUS_HOTKEY $AUDACIOUS_MPRIS $OPTS" &&
-OPTS="$AUDACIOUS_AD $AUDACIOUS_GTKUI $AUDACIOUS_SKINS $AUDACIOUS_LYRIC
$OPTS" &&
+OPTS="$AUDACIOUS_OPTS $OPTS" &&
default_build
diff --git a/audio-plugins/audacious-plugins/CONFIGURE
b/audio-plugins/audacious-plugins/CONFIGURE
index 468b97c..10cbeed 100755
--- a/audio-plugins/audacious-plugins/CONFIGURE
+++ b/audio-plugins/audacious-plugins/CONFIGURE
@@ -1,55 +1,68 @@
-config_query_option AUDACIOUS_IPV6 \
- 'Enable IPv6 support?' n \
- '--enable-ipv6' \
- '--disable-ipv6' &&
+# remove deprecated options
+if [[ -n $AUDACIOUS_IPV6 ]]; then
+ persistent_remove AUDACIOUS_IPV6
+fi &&
+if [[ -n $AUDACIOUS_AD ]]; then
+ persistent_remove AUDACIOUS_AD
+fi &&

-config_query_option AUDACIOUS_STATUS \
+if [[ ! -v AUDACIOUS_OPTS ]]; then
+ persistent_add AUDACIOUS_OPTS
+fi &&
+
+# backport legacy options
+for o in AUDACIOUS_STATUS AUDACIOUS_OSD AUDACIOUS_COSD AUDACIOUS_SONGCHANGE \
+ AUDACIOUS_HOTKEY AUDACIOUS_MPRIS AUDACIOUS_GTKUI AUDACIOUS_SKINS \
+ AUDACIOUS_LYRIC; do
+ if [[ -n ${!o} ]]; then
+ list_add "AUDACIOUS_OPTS" "${!o}" &&
+ persistent_remove ${o}
+ fi
+done &&
+
+config_query_option AUDACIOUS_OPTS \
'Enable X11 Status Icon plugin?' y \
'--enable-statusicon' \
'--disable-statusicon' &&

-config_query_option AUDACIOUS_OSD \
+config_query_option AUDACIOUS_OPTS \
'for OSD plugin' y \
'--enable-aosd' \
'--disable-aosd' &&
-if [[ "$AUDACIOUS_OSD" == '--enable-aosd' ]]; then
- config_query_option AUDACIOUS_COSD \
+
+if list_find "$AUDACIOUS_OPTS" '--enable-aosd'; then
+ config_query_option AUDACIOUS_OPTS \
'for X Composite OSD plugin' y \
'--enable-aosd-xcomp' \
'--disable-aosd-xcomp'
fi &&

-config_query_option AUDACIOUS_SONGCHANGE \
+config_query_option AUDACIOUS_OPTS \
"Enable Song Change Plugin?" y \
"--enable-songchange" \
"--disable-songchange" &&

-config_query_option AUDACIOUS_HOTKEY \
+config_query_option AUDACIOUS_OPTS \
"Enable global hotkey plugin?" y \
"--enable-hotkey" \
"--disable-hotkey" &&

-config_query_option AUDACIOUS_MPRIS \
+config_query_option AUDACIOUS_OPTS \
"Enable mpris2 plugin?" y \
"--enable-mpris2" \
"--disable-mpris2" &&

-config_query_option AUDACIOUS_AD \
- "Enable AdPlug plugin?" y \
- "--enable-adplug" \
- "--disable-adplug" &&
-
-config_query_option AUDACIOUS_GTKUI \
+config_query_option AUDACIOUS_OPTS \
"Enable GTK Interface?" y \
"--enable-gtkui" \
"--disable-gtkui" &&

-config_query_option AUDACIOUS_SKINS \
+config_query_option AUDACIOUS_OPTS \
"Enable Winamp Classic interface?" y \
"--enable-skins" \
"--disable-skins" &&

-config_query_option AUDACIOUS_LYRIC \
+config_query_option AUDACIOUS_OPTS \
"Enable LyricWiki plugin?" y \
"--enable-lyricwiki" \
"--disable-lyricwiki"
diff --git a/audio-plugins/audacious-plugins/DEPENDS
b/audio-plugins/audacious-plugins/DEPENDS
index c1a2150..0c9e699 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -3,7 +3,6 @@ depends pango &&
depends cairo &&
depends gtk+3 &&
depends audacious &&
-depends libbinio &&

# control plugins
optional_depends lirc \
@@ -58,6 +57,11 @@ optional_depends lame \
"--disable-filewriter_mp3" \
"for MP3 filewriter" &&

+optional_depends libbinio \
+ "" \
+ "--disable-adplug" \
+ "for AdPlug plugin" &&
+
optional_depends wavpack \
"" \
"--disable-wavpack" \
@@ -90,9 +94,9 @@ optional_depends neon \
"Enable Neon HTTP support?" &&

optional_depends curl \
- "--enable-scrobbler" \
- "--disable-scrobbler" \
- "Enable Scrobbler plugin?" &&
+ "--enable-scrobbler2" \
+ "--disable-scrobbler2" \
+ "Enable Scrobbler 2 plugin?" &&

optional_depends libnotify \
"--enable-notify" \
@@ -109,13 +113,10 @@ optional_depends libcdio \
"--disable-cdaudio" \
"Enable CD Audio Plugin?" &&

-optional_depends libcdio-paranoia \
- "" "" \
- "Needed for CD Audio plugin" &&
-
-optional_depends libcddb \
- "" "" \
- "Needed for CD Audio plugin" &&
+if is_depends_enabled $SPELL libcdio; then
+ depends libcdio-paranoia &&
+ depends libcddb
+fi &&

optional_depends libmms \
"--enable-mms" \
@@ -131,4 +132,3 @@ optional_depends libsamplerate \
"--enable-resample --enable-speedpitch" \
"--disable-resample --disable-speedpitch" \
"Enable Resample Effect and Speed and Pitch plugins?"
-
diff --git a/audio-plugins/audacious-plugins/HISTORY
b/audio-plugins/audacious-plugins/HISTORY
index 97d0e2c..f706b45 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,6 +1,13 @@
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: dropped AUDACIOUS_* spaghetti
+ * DEPENDS: libcdio-paranoia and libcddb are _required_ for cdaudio-ng
+ plugin; scrobbler has been renamed to scrobbler2; added libbinio for
+ AdPlug plugin
+ * CONFIGURE: removed deprecated IPv6 setting; migrate options to
+ AUDACIOUS_OPTS; moved adplug setting to DEPENDS
+
2013-07-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4
- * DEPENDS: libbinio added

2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 3.3.4



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (9074c590370507ba461453e1c5c3c2689bb4f604), Vlad Glagolev, 04/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page