Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ed1ce53763f8de040b3f531c38972b49b4226bf2)

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 master grimoire by Vlad Glagolev (ed1ce53763f8de040b3f531c38972b49b4226bf2)
  • Date: Mon, 11 Sep 2017 18:14:53 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-players/audacious/DEPENDS | 20 +++--
audio-players/audacious/DETAILS | 4 -
audio-players/audacious/FINAL | 4 -
audio-players/audacious/HISTORY | 7 +
audio-players/audacious/LC_ALL-fix.patch | 12 ---
audio-players/audacious/PRE_BUILD | 4 -
audio-players/mpg123/CONFIGURE | 4 -
audio-players/mpg123/HISTORY | 3
audio-plugins/audacious-plugins/CONFIGURE | 65 ++++-------------
audio-plugins/audacious-plugins/DEPENDS | 110
++++++++++++++++-------------
audio-plugins/audacious-plugins/DETAILS | 4 -
audio-plugins/audacious-plugins/HISTORY | 7 +
audio-plugins/audacious-plugins/PRE_BUILD | 3
audio-plugins/audacious-plugins/cdda.patch | 16 ----
14 files changed, 116 insertions(+), 147 deletions(-)

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

audacious-plugins: => 3.9

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

audacious: => 3.9

commit 774393dc9386d909a032408e5331dfc05ddc51d8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mpg123: set 'auto' to the top

diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index 2710691..4871471 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -1,15 +1,19 @@
depends glib2 &&
-depends pango &&
-depends cairo &&
-depends gtk+3 &&

-optional_depends libguess \
- "--enable-chardet" "--disable-chardet" \
- "Enable libguess character set detection?" &&
+optional_depends gtk+2 \
+ "--enable-gtk" \
+ "--disable-gtk" \
+ "for GTK+ interface" &&
+
+if is_depends_enabled ${SPELL} gtk+2; then
+ depends pango &&
+ depends cairo
+fi &&

optional_depends dbus \
- "--enable-dbus" "--disable-dbus" \
- "support for dbus notifications" &&
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for D-Bus notifications support" &&

optional_depends gettext \
"--enable-nls" \
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index 3e65c1c..0bd3fc6 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,8 +1,8 @@
SPELL=audacious
- VERSION=3.5.2
+ VERSION=3.9
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
-
SOURCE_HASH=sha512:70fd5bf81fd86a867102917c9328e1e647e9566ecfbc773b15fe0d181f176cfb333976c817493b1e485f15a045da054f19a9d6d81106d55636fca14ac09f8008
+
SOURCE_HASH=sha512:d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://audacious-media-player.org";
LICENSE[0]=GPL
diff --git a/audio-players/audacious/FINAL b/audio-players/audacious/FINAL
index 48dba5a..57e0f25 100755
--- a/audio-players/audacious/FINAL
+++ b/audio-players/audacious/FINAL
@@ -1,3 +1,5 @@
update_desktop_database &&

-gtk-update-icon-cache -q -t -f "${INSTALL_ROOT}/usr/share/icons/hicolor"
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache -q -t -f "${INSTALL_ROOT}/usr/share/icons/hicolor"
+fi
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index fb9c6d4..ac4d829 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,10 @@
+2017-09-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.9
+ * DEPENDS: switched back to gtk+2 -- becomes optional; removed chardet
+ * PRE_BUILD: dropped, no longer needed
+ * FINAL: add condition for gtk-update-icon-cache
+ * LC_ALL-fix.patch: dropped, unsupported
+
2017-09-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.5.2; updated descriptions; quoting
paths
diff --git a/audio-players/audacious/LC_ALL-fix.patch
b/audio-players/audacious/LC_ALL-fix.patch
deleted file mode 100644
index e43ccd4..0000000
--- a/audio-players/audacious/LC_ALL-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur audacious-orig/src/audacious/main.c
audacious-3.3.2/src/audacious/main.c
---- audacious-orig/src/audacious/main.c 2012-10-19 20:21:07.223245571
-0500
-+++ audacious-3.3.2/src/audacious/main.c 2012-10-19 20:21:57.147245213
-0500
-@@ -439,7 +439,7 @@
- init_paths ();
- make_dirs ();
-
-- setlocale (LC_ALL, "");
-+// setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, aud_paths[AUD_PATH_LOCALE_DIR]);
- bind_textdomain_codeset (PACKAGE, "UTF-8");
- bindtextdomain (PACKAGE "-plugins", aud_paths[AUD_PATH_LOCALE_DIR]);
diff --git a/audio-players/audacious/PRE_BUILD
b/audio-players/audacious/PRE_BUILD
deleted file mode 100755
index 9544f90..0000000
--- a/audio-players/audacious/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/LC_ALL-fix.patch
diff --git a/audio-players/mpg123/CONFIGURE b/audio-players/mpg123/CONFIGURE
index 7260934..2ca73b5 100755
--- a/audio-players/mpg123/CONFIGURE
+++ b/audio-players/mpg123/CONFIGURE
@@ -4,8 +4,8 @@ config_query_option MPG123_QUALITY "Prefer highest accuracy
for 16bit output (in
message "${MESSAGE_COLOR}Optimization is chosen automatically now, though
you can force your will via custom spell options.$DEFAULT_COLOR" &&
config_query_option MPG123_MODULES "Build output modules?" y \
--enable-modules --disable-modules &&
-local modlist="oss alsa portaudio jack esd nas sdl \
- pulse openal dummy auto" &&
+local modlist="auto oss alsa portaudio jack esd nas sdl \
+ pulse openal dummy" &&
message "${MESSAGE_COLOR}\"auto\" will select (a) working output(s) at build
time, disregarding spell dependencies.$DEFAULT_COLOR" &&
if [[ "$MPG123_MODULES" == "--enable-modules" ]]; then
config_query_multi MPG123_AUDIO "Select the modules you want:" \
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 7fc2101..639d194 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2017-09-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: set 'auto' to the top
+
2017-08-11 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 1.25.6, ++SECURITY_PATCH

diff --git a/audio-plugins/audacious-plugins/CONFIGURE
b/audio-plugins/audacious-plugins/CONFIGURE
index 2c789db..8aea0dd 100755
--- a/audio-plugins/audacious-plugins/CONFIGURE
+++ b/audio-plugins/audacious-plugins/CONFIGURE
@@ -1,3 +1,19 @@
+# remove obsolete options from AUDACIOUS_OPTS
+list_remove AUDACIOUS_OPTS '--enable-statusicon' &&
+list_remove AUDACIOUS_OPTS '--disable-statusicon' &&
+list_remove AUDACIOUS_OPTS '--enable-aosd-xcomp' &&
+list_remove AUDACIOUS_OPTS '--disable-aosd-xcomp' &&
+list_remove AUDACIOUS_OPTS '--enable-skins' &&
+list_remove AUDACIOUS_OPTS '--disable-skins' &&
+list_remove AUDACIOUS_OPTS '--enable-lyricwiki' &&
+list_remove AUDACIOUS_OPTS '--disable-lyricwiki' &&
+list_remove AUDACIOUS_OPTS '--enable-xsf' &&
+list_remove AUDACIOUS_OPTS '--disable-xsf' &&
+list_remove AUDACIOUS_OPTS '--enable-psf' &&
+list_remove AUDACIOUS_OPTS '--disable-psf' &&
+list_remove AUDACIOUS_OPTS '--enable-gtkui' &&
+list_remove AUDACIOUS_OPTS '--disable-gtkui' &&
+
# remove deprecated options
if [[ -n $AUDACIOUS_IPV6 ]]; then
persistent_remove AUDACIOUS_IPV6
@@ -21,58 +37,11 @@ for o in AUDACIOUS_STATUS AUDACIOUS_OSD AUDACIOUS_COSD
AUDACIOUS_SONGCHANGE \
done &&

config_query_option AUDACIOUS_OPTS \
- 'Enable X11 Status Icon plugin?' y \
- '--enable-statusicon' \
- '--disable-statusicon' &&
-
-config_query_option AUDACIOUS_OPTS \
- 'Enable OSD plugin' y \
- '--enable-aosd' \
- '--disable-aosd' &&
-
-if list_find "$AUDACIOUS_OPTS" '--enable-aosd'; then
- config_query_option AUDACIOUS_OPTS \
- 'Enable X Composite OSD plugin' y \
- '--enable-aosd-xcomp' \
- '--disable-aosd-xcomp'
-fi &&
-
-config_query_option AUDACIOUS_OPTS \
"Enable Song Change Plugin?" y \
"--enable-songchange" \
"--disable-songchange" &&

config_query_option AUDACIOUS_OPTS \
- "Enable global hotkey plugin?" y \
- "--enable-hotkey" \
- "--disable-hotkey" &&
-
-config_query_option AUDACIOUS_OPTS \
"Enable mpris2 plugin?" y \
"--enable-mpris2" \
- "--disable-mpris2" &&
-
-config_query_option AUDACIOUS_OPTS \
- "Enable GTK Interface?" y \
- "--enable-gtkui" \
- "--disable-gtkui" &&
-
-config_query_option AUDACIOUS_OPTS \
- "Enable Winamp Classic interface?" y \
- "--enable-skins" \
- "--disable-skins" &&
-
-config_query_option AUDACIOUS_OPTS \
- "Enable LyricWiki plugin?" y \
- "--enable-lyricwiki" \
- "--disable-lyricwiki" &&
-
-config_query_option AUDACIOUS_OPTS \
- "Enable Nintendo DS audio decoder (xsf) plugin?" y \
- "--enable-xsf" \
- "--disable-xsf" &&
-
-config_query_option AUDACIOUS_OPTS \
- "Enable PlayStation (psf/psf2) audio decoder plugin?" y \
- "--enable-psf" \
- "--disable-psf"
+ "--disable-mpris2"
diff --git a/audio-plugins/audacious-plugins/DEPENDS
b/audio-plugins/audacious-plugins/DEPENDS
index 07dc2d4..ae1542f 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -1,9 +1,32 @@
depends glib2 &&
-depends pango &&
-depends cairo &&
-depends gtk+3 &&
+depends libxml2 '--with-system-libxml2=yes' &&
depends audacious &&

+optional_depends gtk+2 \
+ "--enable-gtk" \
+ "--disable-gtk" \
+ "for GTK+ interface" &&
+
+if is_depends_enabled ${SPELL} gtk+2; then
+ depends pango &&
+ depends cairo &&
+
+ optional_depends OPENGL \
+ "--enable-glspectrum" \
+ "--disable-glspectrum" \
+ "for OpenGL Spectrum Analyzer" &&
+
+ config_query_option AUDACIOUS_OPTS \
+ "Enable OSD plugin" y \
+ "--enable-aosd" \
+ "--disable-aosd" &&
+
+ config_query_option AUDACIOUS_OPTS \
+ "Enable global hotkey plugin?" y \
+ "--enable-hotkey" \
+ "--disable-hotkey"
+fi &&
+
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
@@ -11,25 +34,25 @@ optional_depends gettext \

# control plugins
optional_depends lirc \
- "" \
+ "--enable-lirc" \
"--disable-lirc" \
- "for lirc support" &&
+ "for LIRC support" &&

# output plugins
optional_depends alsa-lib \
- "" \
+ "--enable-alsa" \
"--disable-alsa" \
- "for alsa support" &&
+ "for ALSA support" &&

optional_depends pulseaudio \
- "" \
+ "--enable-pulse" \
"--disable-pulse" \
- "for pulseaudio support" &&
+ "for PulseAudio support" &&

optional_depends JACK-DRIVER \
- "" \
+ "--enable-jack" \
"--disable-jack" \
- "support for jack" &&
+ "for JACK support" &&

# filetype plugins
optional_depends zlib \
@@ -38,69 +61,63 @@ optional_depends zlib \
"for game music decoder (console) plugin" &&

optional_depends LIBAVCODEC \
- "" \
- "--disable-ffmpeg" \
+ "--with-ffmpeg" \
+ "--without-ffmpeg" \
"for ffmpeg WMA (ffaudio plugin) support" &&

optional_depends libvorbis \
- "" \
+ "--enable-vorbis --disable-filewriter" \
"--disable-vorbis --disable-filewriter" \
- "for vorbis support" &&
+ "for Ogg Vorbis support" &&

-optional_depends libogg \
- "" \
- "" \
- "for ogg support" &&
+if is_depends_enabled ${SPELL} libvorbis; then
+ depends libogg
+fi &&

optional_depends flac \
- "" \
- "--disable-flacng --disable-filewriter_flac" \
- "for flac support" &&
+ "--enable-flac" \
+ "--disable-flac" \
+ "for FLAC support" &&

optional_depends mpg123 \
- "" \
- "--disable-mp3" \
- "for reading MP3 files" &&
+ "--enable-mpg123" \
+ "--disable-mpg123" \
+ "for MP3 support" &&

optional_depends lame \
- "" \
+ "--enable-filewriter_mp3" \
"--disable-filewriter_mp3" \
"for MP3 filewriter" &&

-optional_depends libbinio \
- "" \
- "--disable-adplug" \
- "for AdPlug plugin" &&
-
optional_depends fluidsynth \
- "" \
+ "--enable-amidiplug" \
"--disable-amidiplug" \
- "for amidi-plug input plugin" &&
+ "for MIDI synthesizer" &&

optional_depends wavpack \
- "" \
+ "--enable-wavpack" \
"--disable-wavpack" \
- "for wavpack support" &&
+ "for WavPack support" &&

optional_depends faad2 \
- "" \
+ "--enable-aac" \
"--disable-aac" \
- "for aac support" &&
+ "for AAC support" &&

optional_depends libsndfile \
- "" \
+ "--enable-sndfile" \
"--disable-sndfile" \
- "sndfile support" &&
+ "for libsndfile decoder" &&

optional_depends libmodplug \
- "" \
+ "--enable-modplug" \
"--disable-modplug" \
- "support for modplug" &&
+ "for ModPlug support" &&

optional_depends sidplay-libs \
- "" \
+ "--enable-sid" \
"--disable-sid" \
- "support for sid" &&
+ "for Commodore 64 audio support" &&

# other plugins
optional_depends neon \
@@ -151,9 +168,4 @@ optional_depends libcue \
optional_depends libsamplerate \
"--enable-resample --enable-speedpitch" \
"--disable-resample --disable-speedpitch" \
- "Enable Resample Effect and Speed and Pitch plugins?" &&
-
-optional_depends OPENGL \
- "--enable-glspectrum" \
- "--disable-glspectrum" \
- "for OpenGL Spectrum Analyzer"
+ "Enable Resample Effect and Speed and Pitch plugins?"
diff --git a/audio-plugins/audacious-plugins/DETAILS
b/audio-plugins/audacious-plugins/DETAILS
index a74c20b..86061de 100755
--- a/audio-plugins/audacious-plugins/DETAILS
+++ b/audio-plugins/audacious-plugins/DETAILS
@@ -1,8 +1,8 @@
SPELL=audacious-plugins
- VERSION=3.5.2
+ VERSION=3.9
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
-
SOURCE_HASH=sha512:eaf46f403a77b5de63f26e096b968a6d94bbe3917df4400e5791143d846c1f3cbf83f2937210055a9b493dfa56ddb36b12d6d57b1453708b23dd41c0e2a94a72
+
SOURCE_HASH=sha512:00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://audacious-media-player.org";
LICENSE[0]=GPL
diff --git a/audio-plugins/audacious-plugins/HISTORY
b/audio-plugins/audacious-plugins/HISTORY
index 1fa29f8..f379a31 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,10 @@
+2017-09-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.9
+ * CONFIGURE: deprecate old flags; moved aosd/hotkey to DEPENDS
+ * DEPENDS: refreshed for new release; added missing flags
+ * PRE_BUILD: removed, no longer needed
+ * cdda.patch: removed, fixed by upstream
+
2017-09-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.5.2
* DEPENDS: refreshed dependencies
diff --git a/audio-plugins/audacious-plugins/PRE_BUILD
b/audio-plugins/audacious-plugins/PRE_BUILD
deleted file mode 100755
index 6a08469..0000000
--- a/audio-plugins/audacious-plugins/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/cdda.patch
diff --git a/audio-plugins/audacious-plugins/cdda.patch
b/audio-plugins/audacious-plugins/cdda.patch
deleted file mode 100644
index 5780e96..0000000
--- a/audio-plugins/audacious-plugins/cdda.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur audacious-plugins-3.3.4/src/cdaudio-ng/cdaudio-ng.c
audacious-plugins-mod/src/cdaudio-ng/cdaudio-ng.c
---- audacious-plugins-3.3.4/src/cdaudio-ng/cdaudio-ng.c 2013-02-03
14:09:33.000000000 -0600
-+++ audacious-plugins-mod/src/cdaudio-ng/cdaudio-ng.c 2013-02-17
20:43:38.505087973 -0600
-@@ -29,12 +29,7 @@
- #include <cdio/audio.h>
- #include <cdio/sector.h>
- #include <cdio/cd_types.h>
--
--#if LIBCDIO_VERSION_NUM >= 90
--#include <cdio/paranoia/cdda.h>
--#else
- #include <cdio/cdda.h>
--#endif
-
- /* libcdio's header files #define these */
- #undef PACKAGE



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ed1ce53763f8de040b3f531c38972b49b4226bf2), Vlad Glagolev, 09/11/2017

Archive powered by MHonArc 2.6.24.

Top of Page