Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b63d1f293485b1d8e47fb22818d2e5e3b36e1387)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <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 Ismael Luceno (b63d1f293485b1d8e47fb22818d2e5e3b36e1387)
  • Date: Sun, 23 Jun 2024 15:07:18 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-creation/audacity/BUILD |
6
audio-creation/audacity/CONFIGURE |
9
audio-creation/audacity/DEPENDS |
128 ++++++----
audio-creation/audacity/DETAILS |
13 -
audio-creation/audacity/HISTORY |
8
audio-creation/audacity/PRE_BUILD |
3
audio-creation/audacity/patches/0001-Fix-build-against-FFmpeg-6.1.1.patch |
104 ++++++++
7 files changed, 204 insertions(+), 67 deletions(-)

New commits:
commit b63d1f293485b1d8e47fb22818d2e5e3b36e1387
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

audacity 3.5.1

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 5e1772b..0967a16 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -1,5 +1,5 @@
-# Rationale: prevent untracked dependencies.
-# Generally, external libs are not that well tested.
+# Disable Conan, sometimes it fails to build
+OPTS+=" -Daudacity_conan_enabled=OFF" &&
+# Prevent untracked dependencies.
OPTS+=" -Daudacity_lib_preference=local" &&
-OPTS+=" $AUDACITY_NYQUIST $AUDACITY_VST2" &&
cmake_build
diff --git a/audio-creation/audacity/CONFIGURE
b/audio-creation/audacity/CONFIGURE
index 1fea642..a5cfecf 100755
--- a/audio-creation/audacity/CONFIGURE
+++ b/audio-creation/audacity/CONFIGURE
@@ -1,7 +1,4 @@
-config_query_option AUDACITY_NYQUIST \
- "Compile with Nyquist plug-in support?" y \
- -Daudacity_use_nyquist={local,off} &&
+persistent_remove AUDACITY_NYQUIST &&
+persistent_remove AUDACITY_VST2 &&

-config_query_option AUDACITY_VST2 \
- "Compiler with VST2 plug-in support?" y \
- -Daudacity_use_vst={ON,OFF}
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 3a2be19..d0980b1 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,44 +1,82 @@
-depends cmake &&
-depends python3 &&
-depends WXWIDGET -Daudacity_use_wxwidgets=system &&
-# Dunno what for, but is checked explicitly.
-depends gtk+3 &&
-depends glib2 &&
-depends expat -Daudacity_use_expat=system &&
-
-optional_depends ffmpeg \
- -Daudacity_use_ffmpeg={loaded,off} \
- "for conversions" &&
+. "$GRIMOIRE/CMAKE_DEPENDS" &&
+. "$GRIMOIRE/VDEPENDS" &&
+vdepends <<! &&
+ # FIXME catch2 flags: -Daudacity_use_catch2=system
+ expat flags: -Daudacity_use_expat=system
+ lame flags: -Daudacity_use_libmp3lame=system
+ portaudio19 flags: -Daudacity_use_portaudio=system
-Daudacity_use_midi=system
+ python3
+ rapidjson flags: -Daudacity_use_rapidjson=system
+ soxr flags: -Daudacity_use_soxr=system
+ sqlite
+ wxgtk-3.2 >= 3.2.5 flags: -Daudacity_use_wxwidgets=system
+ zlib flags: -Daudacity_use_zlib=system
+!
+
+optional_depends LIBAVCODEC \
+ -Daudacity_use_ffmpeg=loaded \
+ -Daudacity_use_ffmpeg=off \
+ "for FFmpeg CODECs support" &&
+
+optional_depends JPEG \
+ -Daudacity_use_jpeg=system \
+ -Daudacity_use_jpeg=off \
+ "for JPEG support" &&
+
+optional_depends libpng \
+ -Daudacity_use_png=system \
+ -Daudacity_use_png=off \
+ "for PNG support" &&
+
+optional_depends libogg \
+ -Daudacity_use_libogg=system \
+ -Daudacity_use_libogg=off \
+ "for OGG container support" &&

optional_depends flac \
- -Daudacity_use_flac={system,off} \
- "for FLAC support" &&
+ -Daudacity_use_libflac=system \
+ -Daudacity_use_libflac=off \
+ "for FLAC codec support" &&

-optional_depends libmad \
- -Daudacity_use_mad={system,off} \
- "as mp3 decoder" &&
+optional_depends wavpack \
+ -Daudacity_use_wavpack=system \
+ -Daudacity_use_wavpack=off \
+ "for WavPack format support" &&
+
+optional_depends mpg123 \
+ -Daudacity_use_libmpg123=system \
+ -Daudacity_use_libmpg123=off \
+ "for MP3 decoding support" &&

optional_depends libid3tag \
- -Daudacity_use_id3tag={system,off} \
+ -Daudacity_use_libid3tag=system \
+ -Daudacity_use_libid3tag=off \
"for ID3 tagging" &&

-depends libsndfile -Daudacity_use_sndfile=system &&
-
-optional_depends libvorbis \
- -Daudacity_use_vorbis={system,off} &&
+optional_depends libsndfile \
+ -Daudacity_use_libsndfile=system \
+ -Daudacity_use_libsndfile=off \
+ "for raw PCM container formats support" &&

-# Not strictly necessary, as the API is a shipped
-# header, but it helps to have the basic set of
-# example plugins present, and it's cheap.
+optional_depends opus \
+ -Daudacity_use_libopus=system \
+ -Daudacity_use_libopus=off \
+ "for Opus codec support" &&

-depends ladspa -Daudacity_use_ladspa=ON &&
+optional_depends libvorbis \
+ -Daudacity_use_libvorbis=system \
+ -Daudacity_use_libvorbis=off \
+ "for Vorbis codec support" &&

-# insists on using shipped copy of lame, strange
-# so no depends here
+optional_depends vst3sdk \
+ -Daudacity_use_vst3sdk=system \
+ -Daudacity_has_vst3=OFF \
+ "for VST3 plugins" && # FIXME package missing

optional_depends lv2 \
- -Daudacity_use_lv2={system,off} \
- "for LV2 plugins (triggers some more related deps)" &&
+ -Daudacity_use_lv2=system \
+ -Daudacity_use_lv2=off \
+ "for LV2 plugins (triggers some more related deps)" && # FIXME option
doesn't work

if is_depends_enabled "$SPELL" lv2; then
depends serd &&
@@ -48,31 +86,19 @@ if is_depends_enabled "$SPELL" lv2; then
depends suil-0
fi &&

-# dunno about smbms, keep it local
+# FIXME smbms / sbsms

optional_depends soundtouch \
- -Daudacity_use_soundtouch={system,off} \
- "for effects" &&
-
-depends soxr \
- -Daudacity_use_soxr=system &&
+ -Daudacity_use_soundtouch=system \
+ -Daudacity_use_soundtouch=off \
+ "for effects" && # FIXME option doesn't work

optional_depends vamp-plugin-sdk \
- -Daudacity_use_vamp={system,off} &&
+ -Daudacity_use_vamp=system \
+ -Daudacity_use_vamp=off \
+ "for Vamp support" && # FIXME option doesn't work

optional_depends twolame \
- -Daudacity_use_twolame={system,off} \
- "for MP2 creation" &&
-
-# Not trying to force portaudio stuff,
-# that can be sensitive and is core to audacity.
-
-optional_depends alsa-lib \
- -Daudacity_use_pa_alsa={YES,NO} \
- "for audio I/O" &&
-
-optional_depends JACK-DRIVER \
- -Daudacity_use_pa_jack={loaded,off} \
- "for audio I/O" &&
-
-true
+ -Daudacity_use_twolame=system \
+ -Daudacity_use_twolame=off \
+ "for MP2 creation" # FIXME option doesn't work
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index ba1a8fd..e67d9c9 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,14 +1,15 @@
# Watch: https://www.audacityteam.org/download/
audacity-sources-([0-9.]+)[.]tar
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=audacity
- VERSION=2.4.2
- SOURCE=audacity-minsrc-$VERSION.tar.xz
- SOURCE_URL[0]=http://sobukus.de/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:0fcbb2d9e131b3d683b3f0b0d16f565f034d46e57dab1749c52fc8e72f2bc8c64606fd749ed13d925aecef31f38258ad8b79f8e1baa23c99c7b805686e5445b4
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.xz}
+ VERSION=3.5.1
+ SOURCE=$SPELL-sources-$VERSION.tar.gz
+
SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/releases/download/Audacity-$VERSION/$SOURCE
+ SOURCE_URL[1]=http://sobukus.de/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:7f1025d6c99d909a891812faf7023313f1e8af2e2d51d8e097aafdcc4e9c8ad48bd09b07560e256fc1ee91f77c2c82a8d1163fa5e37661ef9a85d7a54dccd42c
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.?z}
WEB_SITE=http://audacityteam.org/
ENTERED=20011217
LICENSE[0]=GPL
- PATCHLEVEL=2
KEYWORDS="editors audio"
SHORT="Simple soundfile editor"
cat << EOF
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index a545684..00c1389 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,10 @@
+2024-06-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.5.1
+ * DEPENDS: updated dependencies and flags
+ * CONFIGURE: removed AUDACITY_NYQUIST & AUDACITY_VST2
+ * patches/0001-Fix-build-against-FFmpeg-6.1.1.patch:
+ fixed build against ffmpeg 6.1.1
+
2020-09-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.4.2

@@ -201,4 +208,3 @@

2002-06-12 Unet <unet AT sourcemage.org>
* Created this.
-
diff --git a/audio-creation/audacity/PRE_BUILD
b/audio-creation/audacity/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/audio-creation/audacity/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/audio-creation/audacity/patches/0001-Fix-build-against-FFmpeg-6.1.1.patch
b/audio-creation/audacity/patches/0001-Fix-build-against-FFmpeg-6.1.1.patch
new file mode 100644
index 0000000..45341d6
--- /dev/null
+++
b/audio-creation/audacity/patches/0001-Fix-build-against-FFmpeg-6.1.1.patch
@@ -0,0 +1,104 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sun, 23 Jun 2024 15:50:03 +0200
+Subject: [PATCH] Fix build against FFmpeg 6.1.1
+
+Upstream-Status: Pending
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h |
4 ++++
+ modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h |
4 ++++
+ modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h |
4 ++++
+ modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h |
4 ++++
+ modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h |
4 ++++
+ 5 files changed, 20 insertions(+)
+
+diff --git
audacity-sources-3.5.1.orig/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h

audacity-sources-3.5.1/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h
+index 44834eef7eb5..635c82492ec4 100644
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-2.3.6-single-header.h
+@@ -568,8 +568,12 @@ static av_always_inline uint64_t av_double2int(double f)
+ #define M_PI_2 1.57079632679489661923
+ #define M_SQRT1_2 0.70710678118654752440
+ #define M_SQRT2 1.41421356237309504880
++#ifndef NAN
+ #define NAN av_int2float(0x7fc00000)
++#endif
++#ifndef INFINITY
+ #define INFINITY av_int2float(0x7f800000)
++#endif
+
+ enum AVRounding {
+ AV_ROUND_ZERO = 0,
+diff --git
audacity-sources-3.5.1.orig/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h

audacity-sources-3.5.1/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h
+index e078a3c2ae14..85c0149ca756 100644
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-3.4.8-single-header.h
+@@ -611,8 +611,12 @@ static av_always_inline uint64_t av_double2int(double f)
+ #define M_PI_2 1.57079632679489661923
+ #define M_SQRT1_2 0.70710678118654752440
+ #define M_SQRT2 1.41421356237309504880
++#ifndef NAN
+ #define NAN av_int2float(0x7fc00000)
++#endif
++#ifndef INFINITY
+ #define INFINITY av_int2float(0x7f800000)
++#endif
+
+ enum AVRounding {
+ AV_ROUND_ZERO = 0,
+diff --git
audacity-sources-3.5.1.orig/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h

audacity-sources-3.5.1/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h
+index 76674204b00e..6ca39ec150d9 100644
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-4.2.4-single-header.h
+@@ -611,8 +611,12 @@ static av_always_inline uint64_t av_double2int(double f)
+ #define M_PI_2 1.57079632679489661923
+ #define M_SQRT1_2 0.70710678118654752440
+ #define M_SQRT2 1.41421356237309504880
++#ifndef NAN
+ #define NAN av_int2float(0x7fc00000)
++#endif
++#ifndef INFINITY
+ #define INFINITY av_int2float(0x7f800000)
++#endif
+
+ enum AVRounding {
+ AV_ROUND_ZERO = 0,
+diff --git
audacity-sources-3.5.1.orig/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h

audacity-sources-3.5.1/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h
+index a25b78c4a7ce..7b9a2fa059cd 100644
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-5.0.1-single-header.h
+@@ -620,8 +620,12 @@ static av_always_inline uint64_t av_double2int(double f)
+ #define M_PI_2 1.57079632679489661923
+ #define M_SQRT1_2 0.70710678118654752440
+ #define M_SQRT2 1.41421356237309504880
++#ifndef NAN
+ #define NAN av_int2float(0x7fc00000)
++#endif
++#ifndef INFINITY
+ #define INFINITY av_int2float(0x7f800000)
++#endif
+
+ enum AVRounding {
+ AV_ROUND_ZERO = 0,
+diff --git
audacity-sources-3.5.1.orig/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h

audacity-sources-3.5.1/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h
+index 3e3a7cb1cc23..5a3fe8471fe8 100644
+--- a/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h
++++ b/modules/mod-ffmpeg/lib-ffmpeg-support/impl/ffmpeg-6.0.0-single-header.h
+@@ -673,8 +673,12 @@ static av_always_inline uint64_t av_double2int(double f)
+ #define M_PI_2 1.57079632679489661923
+ #define M_SQRT1_2 0.70710678118654752440
+ #define M_SQRT2 1.41421356237309504880
++#ifndef NAN
+ #define NAN av_int2float(0x7fc00000)
++#endif
++#ifndef INFINITY
+ #define INFINITY av_int2float(0x7f800000)
++#endif
+
+ enum AVRounding {
+ AV_ROUND_ZERO = 0,
+--
+Fixed up by sm-checkpatch 0.1
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b63d1f293485b1d8e47fb22818d2e5e3b36e1387), Ismael Luceno, 06/23/2024

Archive powered by MHonArc 2.6.24.

Top of Page