sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (32e880d98335d3d96f63b2cfd774e9aba945bbee)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (32e880d98335d3d96f63b2cfd774e9aba945bbee)
- Date: Sun, 22 Dec 2024 19:21:19 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
audio-players/audacious/BUILD | 12 --
audio-players/audacious/CONFIGURE | 1
audio-players/audacious/DEPENDS | 45 ++++----
audio-players/audacious/DETAILS | 9 -
audio-players/audacious/HISTORY | 7 +
audio-plugins/audacious-plugins/BUILD | 12 --
audio-plugins/audacious-plugins/CONFIGURE | 44 --------
audio-plugins/audacious-plugins/DEPENDS | 157
+++++++-----------------------
audio-plugins/audacious-plugins/DETAILS | 10 +
audio-plugins/audacious-plugins/HISTORY | 8 +
audio-plugins/audacious-plugins/PRE_BUILD | 4
11 files changed, 106 insertions(+), 203 deletions(-)
New commits:
commit 32e880d98335d3d96f63b2cfd774e9aba945bbee
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
audacious-plugins - massive rewrite
commit 723f3c8bc5317c92e6ef04f5dea9fc7b8013cb13
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
audacious - tweaks
commit 760781fb4b330444f46a1959de87929fcc8b16b6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
audacious-plugins: => 4.4.2
commit ded04d588d5fddd2131e70707b6c1145fcfe394c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
audacious: => 4.4.2
diff --git a/audio-players/audacious/BUILD b/audio-players/audacious/BUILD
index 7fa8cd3..eb5d492 100755
--- a/audio-players/audacious/BUILD
+++ b/audio-players/audacious/BUILD
@@ -1,10 +1,6 @@
-if is_depends_enabled ${SPELL} llvm; then
- OPTS="CXX=clang++ ${OPTS}" &&
-
- CXXFLAGS="-stdlib=libc++ ${CXXFLAGS}" &&
- LDFLAGS="-lc++ -lc++abi ${LDFLAGS}"
+OPTS+=" buildstamp=SMGL" &&
+if is_depends_enabled ${SPELL} qt6base;then
+ export QT6DIR=$INSTALL_ROOT/opt/qt6
+ export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig"
fi &&
-
-OPTS="--with-buildstamp=SMGL $OPTS" &&
-
default_build
diff --git a/audio-players/audacious/CONFIGURE
b/audio-players/audacious/CONFIGURE
new file mode 100755
index 0000000..d0bac55
--- /dev/null
+++ b/audio-players/audacious/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/MESON_CONFIGURE
diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index e351e30..3493379 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -1,34 +1,33 @@
-depends glib2 &&
-
-optional_depends llvm "" "" "to build ${SPELL} with clang++" &&
+source $GRIMOIRE/MESON_DEPENDS
-if is_depends_enabled ${SPELL} llvm; then
- depends libc++
-else
- depends -sub CXX gcc
-fi &&
+depends glib2 &&
-optional_depends gtk+2 \
- "--enable-gtk" \
- "--disable-gtk" \
+optional_depends gtk+3 \
+ ' gtk=true' \
+ ' gtk=false' \
"for GTK+ interface" &&
-if is_depends_enabled ${SPELL} gtk+2; then
+if is_depends_enabled ${SPELL} gtk+3; then
depends pango &&
depends cairo
fi &&
-optional_depends qtbase \
- "--enable-qt" \
- "--disable-qt" \
- "for QT interface" &&
+optional_depends qt6base \
+ ' qt=true' \
+ ' qt=false' \
+ 'for QT interface' &&
optional_depends dbus \
- "--enable-dbus" \
- "--disable-dbus" \
- "for D-Bus notifications support" &&
+ ' dbus=true' \
+ ' dbus=false' \
+ 'for D-Bus notifications support' &&
+
+optional_depends libarchive\
+ ' libarchive=true' \
+ ' libarchive=false' \
+ 'libarchive support'
-optional_depends GETTEXT \
- "--enable-nls" \
- "--disable-nls" \
- "for Native Language Support"
+#optional_depends GETTEXT \
+# "--enable-nls" \
+# "--disable-nls" \
+# "for Native Language Support"
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index d59bf4e..771b0e1 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,10 +1,11 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=audacious
- VERSION=4.1
+ VERSION=4.4.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
-
SOURCE_HASH=sha512:6e603108c245a146c3bb360e99d85e949b25a50a4d97eca6a0519cb457a93e8d73131504ae10f86c34c0e9d98fb5fdf6660accc0bb3bb480332cb674ac27ac9f
+ SOURCE_URL[0]=https://distfiles.audacious-media-player.org/$SOURCE
+
SOURCE_HASH=sha512:a1a561ac969863555aa349c068d85398bc6e58c3f11b74842799c7ed1287a826bd6ce9624421b9da47354a632d2e0ccb8326de27c0730028d98dd85fa0c061c1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://audacious-media-player.org"
+ WEB_SITE="https://audacious-media-player.org"
LICENSE[0]=GPL
ENTERED=20070520
SHORT="advanced audio player"
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index d4ec513..3af87b2 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,10 @@
+2024-12-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4.2
+ * *: meson build
+ * DEPENDS: qt6, gtk+3
+ * CONFIGURE: added
+ * BUILD DEPENDS: remove refs to llvm
+
2021-02-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.1
diff --git a/audio-plugins/audacious-plugins/BUILD
b/audio-plugins/audacious-plugins/BUILD
index 24a5a11..51c18bc 100755
--- a/audio-plugins/audacious-plugins/BUILD
+++ b/audio-plugins/audacious-plugins/BUILD
@@ -1,10 +1,8 @@
-if is_depends_enabled ${SPELL} llvm; then
- OPTS="CXX=clang++ ${OPTS}" &&
+if is_depends_enabled $SPELL qt6base; then
+ export QT6DIR=$INSTALL_ROOT/opt/qt6
+ export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig"
+fi &&
- CXXFLAGS="-stdlib=libc++ ${CXXFLAGS}" &&
- LDFLAGS="-lc++ -lc++abi ${LDFLAGS}"
-fi &&
-
-OPTS="$AUDACIOUS_OPTS $OPTS" &&
+OPTS+=" $AUDACIOUS_OPTS" &&
default_build
diff --git a/audio-plugins/audacious-plugins/CONFIGURE
b/audio-plugins/audacious-plugins/CONFIGURE
index 8aea0dd..1ed6094 100755
--- a/audio-plugins/audacious-plugins/CONFIGURE
+++ b/audio-plugins/audacious-plugins/CONFIGURE
@@ -1,47 +1,9 @@
-# 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
-fi &&
-if [[ -n $AUDACIOUS_AD ]]; then
- persistent_remove AUDACIOUS_AD
-fi &&
-
-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 &&
+source $GRIMOIRE/MESON_CONFIGURE &&
config_query_option AUDACIOUS_OPTS \
"Enable Song Change Plugin?" y \
- "--enable-songchange" \
- "--disable-songchange" &&
+ songchange=true '' &&
config_query_option AUDACIOUS_OPTS \
"Enable mpris2 plugin?" y \
- "--enable-mpris2" \
- "--disable-mpris2"
+ mpris2=true ''
diff --git a/audio-plugins/audacious-plugins/DEPENDS
b/audio-plugins/audacious-plugins/DEPENDS
index eab8eb6..50e5a75 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -1,29 +1,17 @@
+source $GRIMOIRE/MESON_DEPENDS &&
+
depends glib2 &&
-depends libxml2 '--with-system-libxml2=yes' &&
+depends libxml2 &&
depends audacious &&
-optional_depends llvm "" "" "to build ${SPELL} with clang++" &&
-
-if is_depends_enabled ${SPELL} llvm; then
- depends libc++
-else
- depends -sub CXX gcc
-fi &&
-
-optional_depends gtk+2 \
- "--enable-gtk" \
- "--disable-gtk" \
+optional_depends gtk+3 gtk=true '' \
"for GTK+ interface" &&
-if is_depends_enabled ${SPELL} gtk+2; then
+if is_depends_enabled ${SPELL} gtk+3; then
depends pango &&
- depends cairo &&
-
- optional_depends OPENGL \
- "--enable-glspectrum" \
- "--disable-glspectrum" \
- "for OpenGL Spectrum Analyzer" &&
+ depends cairo
+if false;then
config_query_option AUDACIOUS_OPTS \
"Enable OSD plugin" y \
"--enable-aosd" \
@@ -33,158 +21,101 @@ if is_depends_enabled ${SPELL} gtk+2; then
"Enable global hotkey plugin?" y \
"--enable-hotkey" \
"--disable-hotkey"
+fi
fi &&
-optional_depends qtbase \
- "--enable-qt" \
- "--disable-qt" \
+optional_depends qt6base qt=true ''\
"for QT interface" &&
-if is_depends_enabled ${SPELL} qtbase; then
- optional_depends qtmultimedia \
- "--enable-qtaudio" \
- "--disable-qtaudio" \
+if is_depends_enabled ${SPELL} qt6base; then
+ optional_depends qt6multimedia qtaudio=true '' \
"for QtMultimedia output" &&
config_query_option AUDACIOUS_OPTS \
"Enable Ampache browser?" y \
- "--enable-ampache" \
- "--disable-ampache" &&
+ ampache=true '' &&
config_query_option AUDACIOUS_OPTS \
"Enable Stream tuner?" y \
- "--enable-streamtuner" \
- "--disable-streamtuner" &&
-
- if is_depends_enabled qtbase $(get_spell_provider qtbase OPENGL); then
- optional_depends $(get_spell_provider qtbase OPENGL) \
- "--enable-qtglspectrum" \
- "--disable-qtglspectrum" \
- "for Qt OpenGL spectrum analyzer"
- fi
+ streamtuner=true ''
+
fi &&
-optional_depends GETTEXT \
- "--enable-nls" \
- "--disable-nls" \
- "for Native Language Support" &&
+optional_depends OPENGL gl-spectrum=true '' \
+ "for OpenGL Spectrum Analyzer" &&
# control plugins
-optional_depends lirc \
- "--enable-lirc" \
- "--disable-lirc" \
+optional_depends lirc lirc=true '' \
"for LIRC support" &&
# output plugins
-optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
+optional_depends alsa-lib alsa=true '' \
"for ALSA support" &&
-optional_depends pulseaudio \
- "--enable-pulse" \
- "--disable-pulse" \
+optional_depends pulseaudio pulse=true ''\
"for PulseAudio support" &&
-optional_depends JACK-DRIVER \
- "--enable-jack" \
- "--disable-jack" \
+optional_depends JACK-DRIVER jack=true '' \
"for JACK support" &&
-optional_depends sndio \
- "--enable-sndio" \
- "--disable-sndio" \
+optional_depends sndio sndio=true '' \
"for Sndio support" &&
# filetype plugins
-optional_depends zlib \
- "--enable-console" \
- "--disable-console" \
+optional_depends zlib console=true ''\
"for game music decoder (console) plugin" &&
-optional_depends LIBAVCODEC \
- "--with-ffmpeg" \
- "--without-ffmpeg" \
+optional_depends LIBAVCODEC ffaudio=true '' \
"for ffmpeg WMA (ffaudio plugin) support" &&
-optional_depends libvorbis \
- "--enable-vorbis --disable-filewriter" \
- "--disable-vorbis --disable-filewriter" \
+optional_depends libvorbis vorbis=true '' \
"for Ogg Vorbis support" &&
if is_depends_enabled ${SPELL} libvorbis; then
depends libogg
fi &&
-optional_depends flac \
- "--enable-flac" \
- "--disable-flac" \
+optional_depends flac flac=true '' \
"for FLAC support" &&
-optional_depends mpg123 \
- "--enable-mpg123" \
- "--disable-mpg123" \
+optional_depends mpg123 mpg123=true '' \
"for MP3 support" &&
-optional_depends lame \
- "--enable-filewriter_mp3" \
- "--disable-filewriter_mp3" \
+optional_depends lame filewriter-mp3=true '' \
"for MP3 filewriter" &&
-optional_depends fluidsynth \
- "--enable-amidiplug" \
- "--disable-amidiplug" \
+optional_depends fluidsynth amidiplug=true '' \
"for MIDI synthesizer" &&
-optional_depends wavpack \
- "--enable-wavpack" \
- "--disable-wavpack" \
+optional_depends wavpack wavpack=true '' \
"for WavPack support" &&
-optional_depends faad2 \
- "--enable-aac" \
- "--disable-aac" \
+optional_depends faad2 aac=true '' \
"for AAC support" &&
-optional_depends libsndfile \
- "--enable-sndfile" \
- "--disable-sndfile" \
+optional_depends libsndfile sndfile=true '' \
"for libsndfile decoder" &&
-optional_depends libmodplug \
- "--enable-modplug" \
- "--disable-modplug" \
+optional_depends libmodplug modplug=true '' \
"for ModPlug support" &&
-optional_depends libsidplayfp \
- "--enable-sid" \
- "--disable-sid" \
+optional_depends libsidplayfp sid=true ''\
"for Commodore 64 audio support" &&
# other plugins
-optional_depends neon \
- "--enable-neon" \
- "--disable-neon" \
+optional_depends neon neon=true '' \
"Enable Neon HTTP support?" &&
-optional_depends curl \
- "--enable-scrobbler2" \
- "--disable-scrobbler2" \
+optional_depends curl scrobbler2=true '' \
"Enable Scrobbler 2 plugin?" &&
-optional_depends libnotify \
- "--enable-notify" \
- "--disable-notify" \
+optional_depends libnotify notify=true '' \
"Enable notify plugin?" &&
-optional_depends sdl \
- "--enable-sdlout" \
- "--disable-sdlout" \
+optional_depends sdl2 sdlout=true '' \
"Enable SDL output plugin?" &&
-optional_depends libcdio \
- "--enable-cdaudio" \
- "--disable-cdaudio" \
+optional_depends libcdio cdaudio=true '' \
"Enable CD Audio Plugin?" &&
if is_depends_enabled $SPELL libcdio; then
@@ -192,17 +123,11 @@ if is_depends_enabled $SPELL libcdio; then
depends libcddb
fi &&
-optional_depends libmms \
- "--enable-mms" \
- "--disable-mms" \
+optional_depends libmms mms=true '' \
"Enable MMS support?" &&
-optional_depends libcue \
- "--enable-cue" \
- "--disable-cue" \
+optional_depends libcue cue=true '' \
"Enable CUE support?" &&
-optional_depends libsamplerate \
- "--enable-resample --enable-speedpitch" \
- "--disable-resample --disable-speedpitch" \
+optional_depends libsamplerate ' resample=true speedpitch=true' '' \
"Enable Resample Effect and Speed and Pitch plugins?"
diff --git a/audio-plugins/audacious-plugins/DETAILS
b/audio-plugins/audacious-plugins/DETAILS
index c7c107f..7169d21 100755
--- a/audio-plugins/audacious-plugins/DETAILS
+++ b/audio-plugins/audacious-plugins/DETAILS
@@ -1,10 +1,12 @@
+source $GRIMOIRE/MESON_FUNCTIONS
+
SPELL=audacious-plugins
- VERSION=4.1
+ VERSION=4.4.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
-
SOURCE_HASH=sha512:4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f
+ SOURCE_URL[0]=https://distfiles.audacious-media-player.org/$SOURCE
+
SOURCE_HASH=sha512:d7951b779a0d2d56efc2372125a4565cb2054bd64d7f1e25dfa7bb0042e7df0b6a40d776910b444fda61ba79aeb7bb010316ec1353a877f89f2bc8f1a3e9b342
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://audacious-media-player.org"
+ WEB_SITE="https://audacious-media-player.org"
LICENSE[0]=GPL
ENTERED=20070520
SHORT="plugins for audacious"
diff --git a/audio-plugins/audacious-plugins/HISTORY
b/audio-plugins/audacious-plugins/HISTORY
index 5fbbcb0..815b635 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,11 @@
+2024-12-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4.2
+ * *: meson build
+ * DEPENDS: qt6, gtk+3
+ * BUILD DEPENDS: remove refs to llvm
+ * PRE_BUILD: added
+ * DEPENDS CONFIGURE: massive rewrite
+
2021-02-07 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Updated dependency; libsidplayfp replaces sidplay-libs
diff --git a/audio-plugins/audacious-plugins/PRE_BUILD
b/audio-plugins/audacious-plugins/PRE_BUILD
new file mode 100755
index 0000000..34d91f4
--- /dev/null
+++ b/audio-plugins/audacious-plugins/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+#disable all options, simplifies dependency handling
+sed -i '/option/s/true/false/g' meson_options.txt
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (32e880d98335d3d96f63b2cfd774e9aba945bbee), Treeve Jelbert, 12/22/2024
Archive powered by MHonArc 2.6.24.