sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (e62c46c65ed27c1797b46cdc0268a2b3c40f13ec)
- From: Thomas Orgis <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 Thomas Orgis (e62c46c65ed27c1797b46cdc0268a2b3c40f13ec)
- Date: Sat, 31 May 2025 18:10:38 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
audio-libs/id3lib/DETAILS
| 8
audio-libs/id3lib/HISTORY
| 8
audio-libs/id3lib/PREPARE
| 1
audio-libs/id3lib/PRE_BUILD
| 9
audio-libs/id3lib/gcc43.patch
| 86 --
audio-libs/id3lib/patches/00-add-libz-to-compilation.patch
| 14
audio-libs/id3lib/patches/05-create-m4-directory.patch
| 12
audio-libs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch
| 22
audio-libs/id3lib/patches/15-fix-headers-of-main-functions.patch
| 45 +
audio-libs/id3lib/patches/20-create-manpages.patch
| 198 ++++++
audio-libs/id3lib/patches/30-fix-utf16.patch
| 38 +
audio-libs/id3lib/patches/31-fix-utf16-stringlists.patch
| 24
audio-libs/id3lib/patches/40-deal-with-mkstemp.patch
| 54 +
audio-libs/id3lib/patches/50-remove-outdated-check.patch
| 11
audio-libs/id3lib/patches/60-add-c-wrapper-functions.patch
| 58 +
audio-libs/id3lib/patches/60-fix_make_check.patch
| 50 +
audio-libs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch
| 12
audio-libs/id3lib/patches/60-spelling.patch
| 107 +++
audio-libs/id3lib/patches/61-fix_vbr_stack_smash.patch
| 19
audio-libs/id3lib/patches/62-remove-remote-icons.patch
| 32 +
audio-soft/normalize/DETAILS
| 6
audio-soft/normalize/HISTORY
| 15
audio-soft/normalize/PRE_BUILD
| 5
audio-soft/normalize/patches/01-maxpow-init.patch
| 15
audio-soft/normalize/patches/02-debian-compressed-wav-files.patch
| 17
audio-soft/normalize/patches/03-debian-fix-exdev-error.patch
| 21
audio-soft/normalize/patches/04-debian-fix-flac.patch
| 22
audio-soft/normalize/patches/05-debian-fix-encoder-decoder-detection.patch
| 34 +
audio-soft/normalize/patches/06-smgl-prefer-mpg123-because-faster-and-also-accurate.patch
| 18
audio-soft/normalize/patches/07-debian-fix-configure-ac.patch
| 39 +
audio-soft/normalize/patches/08-debian-fix-zero-power-handling.patch
| 26
audio-soft/normalize/patches/09-debian-fix-parallel-test-suite.patch
| 295 ++++++++++
audio-soft/normalize/patches/10-debian-fix-c23.patch
| 28
database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
| 53 -
database/db/HISTORY
| 3
database/db/PRE_BUILD
| 6
database/db/javafix.diff
| 19
database/db/patches/0001-db-fix-conftest-gcc14.patch
| 119 ++++
database/db/patches/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
| 53 +
database/db/patches/0003-javafix.patch
| 19
dev/null
|binary
libs/apr-util/HISTORY
| 4
libs/apr-util/PRE_BUILD
| 3
libs/apr-util/patches/001-apr-util-1.6.3-fix-db-detection.patch
| 146 ++++
44 files changed, 1591 insertions(+), 183 deletions(-)
New commits:
commit e62c46c65ed27c1797b46cdc0268a2b3c40f13ec
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
normalize: further fixing of bugs and build
commit d23a82ffca95e2f63186848fe2c55e4266ce0ca3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
normalize: fix missing initialization of power value
This triggered wildly inaccurate results in certain environments that do
not
initialize a specfic variable to zero by chance.
commit 6887346a78686ac9147b3fd3f02b2de5c616ad70
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
calf-plugins: is not scribbled
commit 32510c70fa2480d102e2bf9f4ae1655014daef9f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
id3lib: import various fixes from Debian for life support
commit 598f4b337acfc9facd876642ce30c26d13a03ffa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
apr-util: fix build with current gcc
commit 540942c3c28156017f5bcc9090e8f42653987d34
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
db: fix build with gcc14
diff --git a/audio-libs/id3lib/DETAILS b/audio-libs/id3lib/DETAILS
index 36bf697..040d66d 100755
--- a/audio-libs/id3lib/DETAILS
+++ b/audio-libs/id3lib/DETAILS
@@ -1,16 +1,10 @@
SPELL=id3lib
VERSION=3.8.3
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/id3lib/$SOURCE
SOURCE_HASH=sha512:3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-
-if [[ "${ID3LIB_UNICODE}" == "y" ]] ;
-then SOURCE2=patch_id3lib_3.8.3_UTF16_writing_bug.diff
- SOURCE2_GPG=gurus.gpg:${SOURCE2}.sig
- SOURCE2_URL=http://sobukus.de/misc/${SOURCE2}
-fi
-
LICENSE[0]=LGPL
WEB_SITE=http://sourceforge.net/projects/id3lib/
ENTERED=20020116
diff --git a/audio-libs/id3lib/HISTORY b/audio-libs/id3lib/HISTORY
index 9042995..92748de 100644
--- a/audio-libs/id3lib/HISTORY
+++ b/audio-libs/id3lib/HISTORY
@@ -1,3 +1,11 @@
+2025-05-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches/*: added, just use the Debian patch set for abandoned
+ project, to keep up with compiler changes, among others
+ * gcc43.patch: included in above
+ * unicode patch: included in the above
+ * PRE_BUILD: implement the patch changes, force configure regeneration
+ * DETAILS: ++PATCHLEVEL
+
2021-06-23 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: force with-pic, needed by kid3
diff --git a/audio-libs/id3lib/PREPARE b/audio-libs/id3lib/PREPARE
deleted file mode 100755
index 3a9e9fa..0000000
--- a/audio-libs/id3lib/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query ID3LIB_UNICODE "Apply unicode patch?" y
diff --git a/audio-libs/id3lib/PRE_BUILD b/audio-libs/id3lib/PRE_BUILD
index 1a1def0..012ca00 100755
--- a/audio-libs/id3lib/PRE_BUILD
+++ b/audio-libs/id3lib/PRE_BUILD
@@ -1,10 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
-autoconf &&
-
-if [[ "${ID3LIB_UNICODE}" == "y" ]] ; then
- verify_file 2 &&
- patch -p1 < ${SOURCE_CACHE}/${SOURCE2}
-fi &&
+apply_patch_dir patches &&
+autoconf -f &&
sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/audio-libs/id3lib/gcc43.patch b/audio-libs/id3lib/gcc43.patch
deleted file mode 100644
index f4c8179..0000000
--- a/audio-libs/id3lib/gcc43.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# From http://bugs.gentoo.org/show_bug.cgi?id=212455
-#
-diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in
---- id3lib-3.8.3-orig/configure.in 2008-03-05 18:03:25.000000000 -0600
-+++ id3lib-3.8.3/configure.in 2008-03-05 18:15:42.000000000 -0600
-@@ -227,7 +227,6 @@
- )
- AC_CHECK_HEADERS( \
- string \
-- iomanip.h \
- ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
- )
-
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h
id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2008-03-05
18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000
-0600
-@@ -30,6 +30,7 @@
- #define _ID3LIB_STRINGS_H_
-
- #include <string>
-+#include <cstring>
-
- #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER
> 1000))
- namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h
id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-01 18:23:00.000000000
-0600
-+++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600
-@@ -30,7 +30,7 @@
-
- #include "id3/writer.h"
- #include "id3/id3lib_streams.h"
--//#include <string.h>
-+#include <string.h>
-
- class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
- {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp
id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp 2003-03-01
18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000
-0600
-@@ -84,7 +84,7 @@
- }
- }
-
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
- flags_t ulFlag = ID3TT_ALL;
- gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp
id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp 2003-03-01 18:23:00.000000000
-0600
-+++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000
-0600
-@@ -309,7 +309,7 @@
-
- #define DEBUG
-
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
- ID3D_INIT_DOUT();
-
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp
id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000
-0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600
-@@ -46,7 +46,7 @@
- os << "v2";
- }
-
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
- int ulFlag = ID3TT_ID3;
- ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp
id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000
-0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000
-0600
-@@ -81,7 +81,7 @@
- }
- }
-
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
- int ulFlag = ID3TT_ID3;
- ID3D_INIT_DOUT();
-
diff --git a/audio-libs/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff.sig
b/audio-libs/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff.sig
deleted file mode 100644
index 1850a06..0000000
Binary files
a/audio-libs/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff.sig and
/dev/null differ
diff --git a/audio-libs/id3lib/patches/00-add-libz-to-compilation.patch
b/audio-libs/id3lib/patches/00-add-libz-to-compilation.patch
new file mode 100644
index 0000000..e937877
--- /dev/null
+++ b/audio-libs/id3lib/patches/00-add-libz-to-compilation.patch
@@ -0,0 +1,14 @@
+This patch was first introduced in version 3.8.3-3
+
+It fixes http://bugs.debian.org/208672
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,8 @@
+
+ if ID3_NEEDZLIB
+ LDADD = $(top_builddir)/zlib/src/libz.la
++else
++libid3_la_LIBADD = -lz
+ endif
+
+ libid3_la_LDFLAGS = \
diff --git a/audio-libs/id3lib/patches/05-create-m4-directory.patch
b/audio-libs/id3lib/patches/05-create-m4-directory.patch
new file mode 100644
index 0000000..d811120
--- /dev/null
+++ b/audio-libs/id3lib/patches/05-create-m4-directory.patch
@@ -0,0 +1,12 @@
+Create a local m4 subdirectory
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,6 +12,8 @@
+ # require automake 1.5
+ AUTOMAKE_OPTIONS = 1.5
+
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST = \
+ HISTORY \
+ config.h.win32 \
diff --git
a/audio-libs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch
b/audio-libs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch
new file mode 100644
index 0000000..a9b45ab
--- /dev/null
+++ b/audio-libs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch
@@ -0,0 +1,22 @@
+This patch imports the proper C++ headers
+--- a/include/id3/id3lib_strings.h
++++ b/include/id3/id3lib_strings.h
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+
+ #include <string>
++#include <cstring>
+
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER
> 1000))
+ namespace std
+--- a/include/id3/writers.h
++++ b/include/id3/writers.h
+@@ -30,7 +30,7 @@
+
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <cstring>
+
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
diff --git a/audio-libs/id3lib/patches/15-fix-headers-of-main-functions.patch
b/audio-libs/id3lib/patches/15-fix-headers-of-main-functions.patch
new file mode 100644
index 0000000..48e01d1
--- /dev/null
+++ b/audio-libs/id3lib/patches/15-fix-headers-of-main-functions.patch
@@ -0,0 +1,45 @@
+This patch fixes some function headers in demo code used during 'make check'
+--- a/examples/demo_info.cpp
++++ b/examples/demo_info.cpp
+@@ -309,7 +309,7 @@
+
+ #define DEBUG
+
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+ ID3D_INIT_DOUT();
+
+--- a/examples/demo_convert.cpp
++++ b/examples/demo_convert.cpp
+@@ -84,7 +84,7 @@
+ }
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+ flags_t ulFlag = ID3TT_ALL;
+ gengetopt_args_info args;
+--- a/examples/demo_copy.cpp
++++ b/examples/demo_copy.cpp
+@@ -81,7 +81,7 @@
+ }
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+ int ulFlag = ID3TT_ID3;
+ ID3D_INIT_DOUT();
+--- a/examples/demo_tag.cpp
++++ b/examples/demo_tag.cpp
+@@ -46,7 +46,7 @@
+ os << "v2";
+ }
+
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+ int ulFlag = ID3TT_ID3;
+ ID3D_INIT_DOUT();
diff --git a/audio-libs/id3lib/patches/20-create-manpages.patch
b/audio-libs/id3lib/patches/20-create-manpages.patch
new file mode 100644
index 0000000..cebf3d4
--- /dev/null
+++ b/audio-libs/id3lib/patches/20-create-manpages.patch
@@ -0,0 +1,198 @@
+This patch adds debian-made man pages
+--- /dev/null
++++ b/doc/man/id3info.1
+@@ -0,0 +1,31 @@
++.TH ID3INFO 1 "May 2000" local "User Command"
++.SH NAME
++id3info \- Display id3 tag information.
++.SH SYNOPSIS
++.B id3info
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3info
++displays both the id3v1 and id3v2 tag information for a file.
++Id3info will not differentiate between the two types of tags.
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3tag(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 AT cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw AT debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3tag.1
+@@ -0,0 +1,69 @@
++.TH ID3TAG 1 "May 2000" local "User Command"
++.SH NAME
++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
++.SH SYNOPSIS
++.B id3tag
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I FILE
++.RB ] ...
++.br
++.SH DESCRIPTION
++.B Id3tag
++will render both types of tag by default. Only the last
++tag type indicated in the option list will be used. Non-
++rendered will remain unchanged in the original file. Will
++also parse and convert Lyrics3 v2.0 frames, but will not
++render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.TP
++.B \-a, \-\-artist ARTIST
++Set the artist information
++.TP
++.B \-s, \-\-song SONG
++Set the song title information
++.TP
++.B \-A, \-\-album ALBUM
++Set the album title information
++.TP
++.B \-c, \-\-comment COMMENT
++Set the comment information
++.TP
++.B \-C, \-\-desc DESCRIPTION
++Set the comment description
++.TP
++.B \-g, \-\-genre num
++Set the genre number
++.TP
++.B \-y, \-\-year num
++Set the year
++.TP
++.B \-t, \-\-track num
++Set the track number
++.TP
++.B \-T, \-\-total num
++Set the total number of tracks on the album
++
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 AT cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw AT debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3convert.1
+@@ -0,0 +1,47 @@
++.TH ID3CONVERT 1 "May 2000" local "User Command"
++.SH NAME
++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
++.SH SYNOPSIS
++.B id3convert
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3convert
++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
++both types of tag by default. Only the last tag type indicated in the option
++list will be used. Non-rendered tags will remain unchanged in the original
++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
++not render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-s, \-\-strip
++Strip, rather than render, the tags
++.TP
++.B \-p, \-\-padding
++Use padding in the tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++
++.SH SEE ALSO
++id3tag(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 AT cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw AT debian.org>.
+--- /dev/null
++++ b/doc/man/id3cp.1
+@@ -0,0 +1,38 @@
++.TH ID3CP 1 "July 2001" local "User Command"
++.SH NAME
++id3cp \- Copies tags from one file to another.
++.SH SYNOPSIS
++.B id3cp
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I SOURCE
++.RB ]
++.RB [
++.I DEST
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3cp
++copies tags from SOURCE to DEST.
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 AT cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw AT debian.org>.
diff --git a/audio-libs/id3lib/patches/30-fix-utf16.patch
b/audio-libs/id3lib/patches/30-fix-utf16.patch
new file mode 100644
index 0000000..3d3f50f
--- /dev/null
+++ b/audio-libs/id3lib/patches/30-fix-utf16.patch
@@ -0,0 +1,38 @@
+Patch from 'Spoon' to fix issues with writing certain unicode characters
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2006-02-17 Jerome Couderc
++
++ * Patch from Spoon to fix UTF-16 writing bug
++
http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++
+ 2003-03-02 Sunday 17:38 Thijmen Klok <thijmen AT id3lib.org>
+
+ * THANKS (1.20): added more people
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
+@@ -363,11 +363,22 @@
+ // Write the BOM: 0xFEFF
+ unicode_t BOM = 0xFEFF;
+ writer.writeChars((const unsigned char*) &BOM, 2);
++ // Patch from Spoon : 2004-08-25 14:17
++ //
http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++ // Wrong code
++ //for (size_t i = 0; i < size; i += 2)
++ //{
++ // unicode_t ch = (data[i] << 8) | data[i+1];
++ // writer.writeChars((const unsigned char*) &ch, 2);
++ //}
++ // Right code
++ unsigned char *pdata = (unsigned char *) data.c_str();
+ for (size_t i = 0; i < size; i += 2)
+ {
+- unicode_t ch = (data[i] << 8) | data[i+1];
++ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+ writer.writeChars((const unsigned char*) &ch, 2);
+ }
++ // End patch
+ }
+ return writer.getCur() - beg;
+ }
diff --git a/audio-libs/id3lib/patches/31-fix-utf16-stringlists.patch
b/audio-libs/id3lib/patches/31-fix-utf16-stringlists.patch
new file mode 100644
index 0000000..3582238
--- /dev/null
+++ b/audio-libs/id3lib/patches/31-fix-utf16-stringlists.patch
@@ -0,0 +1,24 @@
+This patch fixes tag corruption after pipe characters.
+
+Author: Urs Fleisch <urs.fleisch AT gmail.com>
+Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680915
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
+@@ -373,10 +373,17 @@
+ //}
+ // Right code
+ unsigned char *pdata = (unsigned char *) data.c_str();
++ unicode_t lastCh = BOM;
+ for (size_t i = 0; i < size; i += 2)
+ {
+ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
++ if (lastCh == 0 && ch != BOM)
++ {
++ // Last character was NULL, so start next string with BOM.
++ writer.writeChars((const unsigned char*) &BOM, 2);
++ }
+ writer.writeChars((const unsigned char*) &ch, 2);
++ lastCh = ch;
+ }
+ // End patch
+ }
diff --git a/audio-libs/id3lib/patches/40-deal-with-mkstemp.patch
b/audio-libs/id3lib/patches/40-deal-with-mkstemp.patch
new file mode 100644
index 0000000..36c8417
--- /dev/null
+++ b/audio-libs/id3lib/patches/40-deal-with-mkstemp.patch
@@ -0,0 +1,54 @@
+This patch fixes an issues where temporary files were created in an insecure
+way.
+
+It was first intruduced in version 3.8.3-7 and fixes
+http://bugs.debian.org/438540
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
+@@ -242,8 +242,8 @@
+ strcpy(sTempFile, filename.c_str());
+ strcat(sTempFile, sTmpSuffix.c_str());
+
+-#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
+- // This section is for Windows folk && gcc 3.x folk
++#if !defined(HAVE_MKSTEMP)
++ // This section is for Windows folk
+ fstream tmpOut;
+ createFile(sTempFile, tmpOut);
+
+@@ -257,7 +257,7 @@
+ tmpOut.write((char *)tmpBuffer, nBytes);
+ }
+
+-#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP))
++#else //!defined(HAVE_MKSTEMP)
+
+ // else we gotta make a temp file, copy the tag into it, copy the
+ // rest of the old file after the tag, delete the old file, rename
+@@ -270,7 +270,7 @@
+ //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
+ }
+
+- ofstream tmpOut(fd);
++ ofstream tmpOut(sTempFile);
+ if (!tmpOut)
+ {
+ tmpOut.close();
+@@ -285,14 +285,14 @@
+ uchar tmpBuffer[BUFSIZ];
+ while (file)
+ {
+- file.read(tmpBuffer, BUFSIZ);
++ file.read((char *)tmpBuffer, BUFSIZ);
+ size_t nBytes = file.gcount();
+- tmpOut.write(tmpBuffer, nBytes);
++ tmpOut.write((char *)tmpBuffer, nBytes);
+ }
+
+ close(fd); //closes the file
+
+-#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) ||
!defined(HAVE_MKSTEMP))
++#endif ////!defined(HAVE_MKSTEMP)
+
+ tmpOut.close();
+ file.close();
diff --git a/audio-libs/id3lib/patches/50-remove-outdated-check.patch
b/audio-libs/id3lib/patches/50-remove-outdated-check.patch
new file mode 100644
index 0000000..386da27
--- /dev/null
+++ b/audio-libs/id3lib/patches/50-remove-outdated-check.patch
@@ -0,0 +1,11 @@
+We don't actually need iomanip.h
+--- a/configure.in
++++ b/configure.in
+@@ -227,7 +227,6 @@
+ )
+ AC_CHECK_HEADERS( \
+ string \
+- iomanip.h \
+ ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+
diff --git a/audio-libs/id3lib/patches/60-add-c-wrapper-functions.patch
b/audio-libs/id3lib/patches/60-add-c-wrapper-functions.patch
new file mode 100644
index 0000000..d72e81c
--- /dev/null
+++ b/audio-libs/id3lib/patches/60-add-c-wrapper-functions.patch
@@ -0,0 +1,58 @@
+This patch adds C wrapper functions for field encoding.
+
+It was first introduced in version 3.8.3-8 and fixes
+http://bugs.debian.org/281292
+--- a/include/id3.h
++++ b/include/id3.h
+@@ -104,6 +104,9 @@
+ ID3_C_EXPORT void CCONV ID3Field_GetBINARY
(const ID3Field *field, uchar *buffer, size_t buffLength);
+ ID3_C_EXPORT void CCONV ID3Field_FromFile
(ID3Field *field, const char *fileName);
+ ID3_C_EXPORT void CCONV ID3Field_ToFile
(const ID3Field *field, const char *fileName);
++ ID3_C_EXPORT bool CCONV ID3Field_SetEncoding
(ID3Field *field, ID3_TextEnc enc);
++ ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding
(const ID3Field *field);
++ ID3_C_EXPORT bool CCONV ID3Field_IsEncodable
(const ID3Field *field);
+
+ /* field-info wrappers */
+ ID3_C_EXPORT char* CCONV ID3FrameInfo_ShortName
(ID3_FrameID frameid);
+--- a/src/c_wrapper.cpp
++++ b/src/c_wrapper.cpp
+@@ -681,6 +681,39 @@
+ }
+ }
+
++ ID3_C_EXPORT bool CCONV
++ ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
++ {
++ bool changed = false;
++ if (field)
++ {
++ ID3_CATCH(changed = reinterpret_cast<ID3_Field
*>(field)->SetEncoding(enc));
++ }
++ return changed;
++ }
++
++ ID3_C_EXPORT ID3_TextEnc CCONV
++ ID3Field_GetEncoding(const ID3Field *field)
++ {
++ ID3_TextEnc enc = ID3TE_NONE;
++ if (field)
++ {
++ ID3_CATCH(enc = reinterpret_cast<const ID3_Field
*>(field)->GetEncoding());
++ }
++ return enc;
++ }
++
++ ID3_C_EXPORT bool CCONV
++ ID3Field_IsEncodable(const ID3Field *field)
++ {
++ bool isEncodable = false;
++ if (field)
++ {
++ ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field
*>(field)->IsEncodable());
++ }
++ return isEncodable;
++ }
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
diff --git a/audio-libs/id3lib/patches/60-fix_make_check.patch
b/audio-libs/id3lib/patches/60-fix_make_check.patch
new file mode 100644
index 0000000..e2bb1b0
--- /dev/null
+++ b/audio-libs/id3lib/patches/60-fix_make_check.patch
@@ -0,0 +1,50 @@
+This patch fixes some function headers and imports in order for 'make check'
+to work.
+
+It was first introduced in version 3.8.3-9
+diff -Naur id3lib-3.8.3.orig/examples/findeng.cpp
id3lib-3.8.3/examples/findeng.cpp
+--- id3lib-3.8.3.orig/examples/findeng.cpp 2003-03-02 01:23:00.000000000
+0100
++++ id3lib-3.8.3/examples/findeng.cpp 2009-12-10 00:58:12.173795997 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ ID3D_INIT_DOUT();
+ ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/findstr.cpp
id3lib-3.8.3/examples/findstr.cpp
+--- id3lib-3.8.3.orig/examples/findstr.cpp 2003-03-02 01:23:00.000000000
+0100
++++ id3lib-3.8.3/examples/findstr.cpp 2009-12-10 00:57:48.036819825 +0100
+@@ -9,7 +9,7 @@
+ using std::cout;
+ using std::endl;
+
+-int main(unsigned argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ ID3D_INIT_DOUT();
+ ID3D_INIT_WARNING();
+diff -Naur id3lib-3.8.3.orig/examples/test_io.cpp
id3lib-3.8.3/examples/test_io.cpp
+--- id3lib-3.8.3.orig/examples/test_io.cpp 2003-03-02 01:23:00.000000000
+0100
++++ id3lib-3.8.3/examples/test_io.cpp 2009-12-10 00:57:03.612111640 +0100
+@@ -11,6 +11,9 @@
+ #include <id3/io_strings.h>
+ #include <id3/utils.h>
+
++using std::cin;
++using std::hex;
++using std::dec;
+ using std::cout;
+ using std::endl;
+ using std::cerr;
+@@ -18,7 +21,7 @@
+ using namespace dami;
+
+ int
+-main(size_t argc, const char** argv)
++main(int argc, const char** argv)
+ {
+ ID3D_INIT_DOUT();
+ ID3D_INIT_WARNING();
diff --git
a/audio-libs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch
b/audio-libs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch
new file mode 100644
index 0000000..d4ca5d2
--- /dev/null
+++ b/audio-libs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch
@@ -0,0 +1,12 @@
+This patch adds a check for a null pointer
+--- a/src/header_tag.cpp
++++ b/src/header_tag.cpp
+@@ -54,7 +54,7 @@
+ {
+ size_t bytesUsed = ID3_TagHeader::SIZE;
+
+- if (_info->is_extended)
++ if (_info && _info->is_extended)
+ {
+ bytesUsed += _info->extended_bytes;
+ }
diff --git a/audio-libs/id3lib/patches/60-spelling.patch
b/audio-libs/id3lib/patches/60-spelling.patch
new file mode 100644
index 0000000..7547aa3
--- /dev/null
+++ b/audio-libs/id3lib/patches/60-spelling.patch
@@ -0,0 +1,107 @@
+This patch fixes some minor spelling mistakes
+diff -Naur id3lib-3.8.3.orig//ChangeLog id3lib-3.8.3//ChangeLog
+--- id3lib-3.8.3.orig//ChangeLog 2010-06-08 05:21:47.817061336 +0200
++++ id3lib-3.8.3//ChangeLog 2010-06-08 05:21:05.320811354 +0200
+@@ -2266,7 +2266,7 @@
+ * examples/demo_info.cpp (1.19):
+ (PrintInformation): When printing synced lyrics info, now uses a
+ MemoryReader, BinaryNumberReader, and TextReader to extract the
+- infromation from the binary field. This is a cheat, since these
++ information from the binary field. This is a cheat, since these
+ classes aren't normally exposed to folks using the library.
+ Hopefully they will be exposed soon enough for the next major
+ release.
+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.html
id3lib-3.8.3//doc/id3v2.3.0.html
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.html 2010-06-08 05:21:47.859810543
+0200
++++ id3lib-3.8.3//doc/id3v2.3.0.html 2010-06-08 05:21:05.373811128 +0200
+@@ -2157,7 +2157,7 @@
+ 64.Native American
+ 65.Cabaret
+ 66.New Wave
+- 67.Psychadelic
++ 67.Psychedelic
+ 68.Rave
+ 69.Showtunes
+ 70.Trailer
+@@ -2254,4 +2254,4 @@
+ Email: <a href="mailto:johan AT id3.org";>johan AT id3.org</a>
+ </p>
+
+-</body></html>
+\ No newline at end of file
++</body></html>
+diff -Naur id3lib-3.8.3.orig//doc/id3v2.3.0.txt
id3lib-3.8.3//doc/id3v2.3.0.txt
+--- id3lib-3.8.3.orig//doc/id3v2.3.0.txt 2010-06-08 05:21:47.860810639
+0200
++++ id3lib-3.8.3//doc/id3v2.3.0.txt 2010-06-08 05:21:05.374811307 +0200
+@@ -1929,7 +1929,7 @@
+ 64.Native American
+ 65.Cabaret
+ 66.New Wave
+- 67.Psychadelic
++ 67.Psychedelic
+ 68.Rave
+ 69.Showtunes
+ 70.Trailer
+diff -Naur id3lib-3.8.3.orig//id3com/id3com.idl
id3lib-3.8.3//id3com/id3com.idl
+--- id3lib-3.8.3.orig//id3com/id3com.idl 2010-06-08 05:21:47.818060988
+0200
++++ id3lib-3.8.3//id3com/id3com.idl 2010-06-08 05:21:05.355061546 +0200
+@@ -179,7 +179,7 @@
+ /* USER */ ID3_TERMSOFUSE, /**< Terms of use */
+ /* USLT */ ID3_UNSYNCEDLYRICS, /**< Unsynchronized lyric/text
transcription */
+ /* WCOM */ ID3_WWWCOMMERCIALINFO, /**< Commercial information */
+- /* WCOP */ ID3_WWWCOPYRIGHT, /**< Copyright/Legal infromation */
++ /* WCOP */ ID3_WWWCOPYRIGHT, /**< Copyright/Legal information */
+ /* WOAF */ ID3_WWWAUDIOFILE, /**< Official audio file webpage */
+ /* WOAR */ ID3_WWWARTIST, /**< Official artist/performer
webpage */
+ /* WOAS */ ID3_WWWAUDIOSOURCE, /**< Official audio source webpage
*/
+diff -Naur id3lib-3.8.3.orig//include/id3/globals.h
id3lib-3.8.3//include/id3/globals.h
+--- id3lib-3.8.3.orig//include/id3/globals.h 2010-06-08 05:21:47.818060988
+0200
++++ id3lib-3.8.3//include/id3/globals.h 2010-06-08 05:22:27.395811102
+0200
+@@ -313,7 +313,7 @@
+ /* USER */ ID3FID_TERMSOFUSE, /**< Terms of use */
+ /* USLT */ ID3FID_UNSYNCEDLYRICS, /**< Unsynchronized lyric/text
transcription */
+ /* WCOM */ ID3FID_WWWCOMMERCIALINFO, /**< Commercial information */
+- /* WCOP */ ID3FID_WWWCOPYRIGHT, /**< Copyright/Legal infromation */
++ /* WCOP */ ID3FID_WWWCOPYRIGHT, /**< Copyright/Legal information */
+ /* WOAF */ ID3FID_WWWAUDIOFILE, /**< Official audio file webpage */
+ /* WOAR */ ID3FID_WWWARTIST, /**< Official artist/performer
webpage */
+ /* WOAS */ ID3FID_WWWAUDIOSOURCE, /**< Official audio source webpage */
+@@ -608,7 +608,7 @@
+ "Native American", //64
+ "Cabaret", //65
+ "New Wave", //66
+- "Psychadelic", //67
++ "Psychedelic", //67
+ "Rave", //68
+ "Showtunes", //69
+ "Trailer", //70
+@@ -686,7 +686,7 @@
+ "Christian Rock ", //141
+ "Merengue", //142
+ "Salsa", //143
+- "Trash Metal", //144
++ "Thrash Metal", //144
+ "Anime", //145
+ "JPop", //146
+ "Synthpop" //147
+diff -Naur id3lib-3.8.3.orig//src/field.cpp id3lib-3.8.3//src/field.cpp
+--- id3lib-3.8.3.orig//src/field.cpp 2010-06-08 05:21:47.818060988 +0200
++++ id3lib-3.8.3//src/field.cpp 2010-06-08 05:21:05.373811128 +0200
+@@ -719,7 +719,7 @@
+ // USER ID3FID_TERMSOFUSE Terms of use
+ // USLT ULT ID3FID_UNSYNCEDLYRICS Unsynchronized lyric/text
transcription
+ // WCOM WCM ID3FID_WWWCOMMERCIALINFO Commercial information
+-// WCOP WCM ID3FID_WWWCOPYRIGHT Copyright/Legal infromation
++// WCOP WCM ID3FID_WWWCOPYRIGHT Copyright/Legal information
+ // WOAF WCP ID3FID_WWWAUDIOFILE Official audio file webpage
+ // WOAR WAF ID3FID_WWWARTIST Official artist/performer webpage
+ // WOAS WAR ID3FID_WWWAUDIOSOURCE Official audio source webpage
+@@ -813,7 +813,7 @@
+ {ID3FID_TERMSOFUSE, "" , "USER", false, false, ID3FD_TermsOfUse,
"Terms of use"},
+ {ID3FID_UNSYNCEDLYRICS, "ULT", "USLT", false, false,
ID3FD_GeneralText, "Unsynchronized lyric/text transcription"},
+ {ID3FID_WWWCOMMERCIALINFO, "WCM", "WCOM", false, false, ID3FD_URL,
"Commercial information"},
+- {ID3FID_WWWCOPYRIGHT, "WCP", "WCOP", false, false, ID3FD_URL,
"Copyright/Legal infromation"},
++ {ID3FID_WWWCOPYRIGHT, "WCP", "WCOP", false, false, ID3FD_URL,
"Copyright/Legal information"},
+ {ID3FID_WWWAUDIOFILE, "WAF", "WOAF", false, false, ID3FD_URL,
"Official audio file webpage"},
+ {ID3FID_WWWARTIST, "WAR", "WOAR", false, false, ID3FD_URL,
"Official artist/performer webpage"},
+ {ID3FID_WWWAUDIOSOURCE, "WAS", "WOAS", false, false, ID3FD_URL,
"Official audio source webpage"},
diff --git a/audio-libs/id3lib/patches/61-fix_vbr_stack_smash.patch
b/audio-libs/id3lib/patches/61-fix_vbr_stack_smash.patch
new file mode 100644
index 0000000..9bf33e9
--- /dev/null
+++ b/audio-libs/id3lib/patches/61-fix_vbr_stack_smash.patch
@@ -0,0 +1,19 @@
+Description: Fix crashes when reading VBR MP3 file.
+Bug-Ubuntu: https://launchpad.net/bugs/444466
+Origin: upstream,
http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
+Forwarded: yes
+Author: Urs Fleisch
+
+Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
+===================================================================
+--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp 2009-10-06 23:12:10.381250132
+0200
++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp 2009-10-06 23:14:09.545252591
+0200
+@@ -465,7 +465,7 @@
+ // from http://www.xingtech.com/developer/mp3/
+
+ const size_t VBR_HEADER_MIN_SIZE = 8; // "xing" + flags are fixed
+- const size_t VBR_HEADER_MAX_SIZE = 116; // frames, bytes, toc and scale
are optional
++ const size_t VBR_HEADER_MAX_SIZE = 120; // frames, bytes, toc and scale
are optional
+
+ if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE)
+ {
diff --git a/audio-libs/id3lib/patches/62-remove-remote-icons.patch
b/audio-libs/id3lib/patches/62-remove-remote-icons.patch
new file mode 100644
index 0000000..6d92995
--- /dev/null
+++ b/audio-libs/id3lib/patches/62-remove-remote-icons.patch
@@ -0,0 +1,32 @@
+This patch removes two icons from the documentation which would be loaded
from
+remote servers, thereby exposing the reader's IP address to potential
tracking
+(lintian keywords privacy-breach-logo and privacy-breach-w3c-valid-html).
+
+Author: Stefan Ott <stefan AT ott.net>
+--- a/doc/index.html
++++ b/doc/index.html
+@@ -427,24 +427,5 @@
+ </td>
+ </tr>
+ </table>
+-
+- <br><br>
+-
+- <table align="center" width="80%" border="0">
+- <tr>
+- <td align="left">
+- <a href="http://sourceforge.net">
+- <IMG
src="http://sourceforge.net/sflogo.php?group_id=979&type=1" width="88"
height="31" border="0" alt="SourceForge.net"></A>
+- </td>
+- <td align="right">
+-
+- <a href="http://validator.w3.org/check/referer">
+- <img border=0
+- src="http://validator.w3.org/images/vh401"
+- alt="Valid HTML 4.01!" height=31 width=88></a>
+- </td>
+- </tr>
+- </table>
+- <br>
+ </body>
+ </html>
diff --git a/audio-plugins/calf-plugins/SCRIBBLED
b/audio-plugins/calf-plugins/SCRIBBLED
deleted file mode 100644
index e69de29..0000000
diff --git a/audio-soft/normalize/83FE7486.gpg
b/audio-soft/normalize/83FE7486.gpg
deleted file mode 100644
index e4ddee3..0000000
Binary files a/audio-soft/normalize/83FE7486.gpg and /dev/null differ
diff --git a/audio-soft/normalize/DETAILS b/audio-soft/normalize/DETAILS
index fd76036..4e786e1 100755
--- a/audio-soft/normalize/DETAILS
+++ b/audio-soft/normalize/DETAILS
@@ -1,14 +1,12 @@
SPELL=normalize
VERSION=0.7.7
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://savannah.nongnu.org/download/normalize/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+
SOURCE_HASH=sha512:5fb2265eac93b243682cedb955d2ddfe05f55cafdeb1d757aaef0afb36bc9907ea3321b8554e128f6228bdeeaeef96e3e9ba000d0ad84282cc76a50b3e460ce4
WEB_SITE=http://normalize.nongnu.org/
ENTERED=20011217
- SOURCE_GPG=83FE7486.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
LICENSE[0]=GPL
KEYWORDS="tools audio"
SHORT="WAV file volume normalizer"
diff --git a/audio-soft/normalize/HISTORY b/audio-soft/normalize/HISTORY
index d7422fa..68c40ce 100644
--- a/audio-soft/normalize/HISTORY
+++ b/audio-soft/normalize/HISTORY
@@ -1,3 +1,18 @@
+2025-05-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches/02-* up to patches/10-*: import fixes from Debian to
+ make it even build, again for gcc 15 / newer glibc, omitting
+ the rename and doc changes
+ * PRE_BUILD: also autoreconf now
+ * DETAILS: ++PATCHLEVEL
+
+2025-05-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, patches/01-maxpow-init.patch: fix
+ uninitialized power value that strangely only
+ causes wrong computations in certain setups (accidental memory
+ initialization to zero most of the times)
+ * DETAILS: ++PATCHLEVEL, also switch to hash, not relying on
+ decades old signature
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 83FE7486.gpg: added gpg keyring
diff --git a/audio-soft/normalize/PRE_BUILD b/audio-soft/normalize/PRE_BUILD
new file mode 100755
index 0000000..d14422a
--- /dev/null
+++ b/audio-soft/normalize/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+touch AUTHORS ChangeLog &&
+autoreconf -iv
diff --git a/audio-soft/normalize/patches/01-maxpow-init.patch
b/audio-soft/normalize/patches/01-maxpow-init.patch
new file mode 100644
index 0000000..9358094
--- /dev/null
+++ b/audio-soft/normalize/patches/01-maxpow-init.patch
@@ -0,0 +1,15 @@
+The intial value of the maximum power (from mean square values >= 0)
+is undefined in the code and only by chance usually ends up being zero.
+But on some systems (Ubuntu), the luck runs out.
+
+diff -ruN normalize-0.7.7.orig/src/mpegvolume.c
normalize-0.7.7/src/mpegvolume.c
+--- normalize-0.7.7.orig/src/mpegvolume.c 2005-09-09 22:24:26.000000000
+0200
++++ normalize-0.7.7/src/mpegvolume.c 2025-05-30 21:09:37.712286503 +0200
+@@ -175,6 +175,7 @@
+ ds.eof = 0;
+ ds.windowsz = 0;
+ ds.samples_so_far = 0;
++ ds.maxpow = 0;
+ /* initialize peaks to effectively -inf and +inf */
+ si->max_sample = samplemin;
+ si->min_sample = samplemax;
diff --git
a/audio-soft/normalize/patches/02-debian-compressed-wav-files.patch
b/audio-soft/normalize/patches/02-debian-compressed-wav-files.patch
new file mode 100644
index 0000000..97e5ae2
--- /dev/null
+++ b/audio-soft/normalize/patches/02-debian-compressed-wav-files.patch
@@ -0,0 +1,17 @@
+Author: Stefan Fritsch <sf AT sfritsch.de>
+Description: afGetVirtualFrameSize() needs to be used instead of
afGetFrameSize(),
+otherwise the allocated buffer size is too small for compressed
+WAV files (see #558399).
+--- a/src/adjust.c
++++ b/src/adjust.c
+@@ -277,8 +277,8 @@
+
+ /* set up buffer to hold 1/100 of a second worth of frames */
+ frames_in_buf = samp_rate / 100;
+- src_framesz = afGetFrameSize(fhin, AF_DEFAULT_TRACK, 1);
+- dst_framesz = afGetFrameSize(fhout, AF_DEFAULT_TRACK, 1);
++ src_framesz = afGetVirtualFrameSize(fhin, AF_DEFAULT_TRACK, 1);
++ dst_framesz = afGetVirtualFrameSize(fhout, AF_DEFAULT_TRACK, 1);
+ src_buf = (unsigned char *)xmalloc(frames_in_buf * src_framesz);
+ dst_buf = (unsigned char *)xmalloc(frames_in_buf * dst_framesz);
+
diff --git a/audio-soft/normalize/patches/03-debian-fix-exdev-error.patch
b/audio-soft/normalize/patches/03-debian-fix-exdev-error.patch
new file mode 100644
index 0000000..3945681
--- /dev/null
+++ b/audio-soft/normalize/patches/03-debian-fix-exdev-error.patch
@@ -0,0 +1,21 @@
+Author: Joachim Reichel <reichel AT debian.org>
+Description: use move instead of rename to avoid EXDEV, see #336808 and
#337396
+--- a/src/normalize-mp3.in
++++ b/src/normalize-mp3.in
+@@ -47,6 +47,7 @@
+ #######################################################################
+
+ use Fcntl;
++use File::Copy;
+
+ sub usage {
+ print <<EOF
+@@ -214,7 +215,7 @@
+ close(IN);
+ close(OUT);
+ unlink $fname;
+- rename($tmpfile, $fname)
++ move($tmpfile, $fname)
+ || die "Can't rename temp file, leaving in $tmpfile, stopped";
+ }
+ }
diff --git a/audio-soft/normalize/patches/04-debian-fix-flac.patch
b/audio-soft/normalize/patches/04-debian-fix-flac.patch
new file mode 100644
index 0000000..ab44456
--- /dev/null
+++ b/audio-soft/normalize/patches/04-debian-fix-flac.patch
@@ -0,0 +1,22 @@
+Author: Joachim Reichel <reichel AT debian.org>
+Description: fix typo w.r.t. flac support
+--- a/src/normalize-mp3.in
++++ b/src/normalize-mp3.in
+@@ -295,7 +295,7 @@
+ $path = find_prog("flac");
+ if ($path) {
+ $path .= " -s -d -o %w %m";
+- $FLAC = $path;
++ $FLACDECODE = $path;
+ }
+ }
+
+@@ -304,7 +304,7 @@
+ $path = find_prog("flac");
+ if ($path) {
+ $path .= " -s -o %m %w";
+- $FLAC = $path;
++ $FLACENCODE = $path;
+ }
+ }
+
diff --git
a/audio-soft/normalize/patches/05-debian-fix-encoder-decoder-detection.patch
b/audio-soft/normalize/patches/05-debian-fix-encoder-decoder-detection.patch
new file mode 100644
index 0000000..8c83798
--- /dev/null
+++
b/audio-soft/normalize/patches/05-debian-fix-encoder-decoder-detection.patch
@@ -0,0 +1,34 @@
+Author: Joachim Reichel <reichel AT debian.org>
+Description: Detect encoder and decoder dynamically at runtime. This results
in
+better defaults depending on the user's environment and avoids data loss if
no
+suitable encoder/decoder is found.
+--- a/src/normalize-mp3.in
++++ b/src/normalize-mp3.in
+@@ -26,12 +26,12 @@
+ # %b becomes bitrate of re-encoded file, as specified by the -b option
+ # Example: $OGGENCODE="oggenc -Q -b %b -o %m %w"
+
+-$MP3DECODE = "@MP3DECODE@";
+-$MP3ENCODE = "@MP3ENCODE@";
+-$OGGDECODE = "@OGGDECODE@";
+-$OGGENCODE = "@OGGENCODE@";
+-$FLACDECODE = "@FLACDECODE@";
+-$FLACENCODE = "@FLACENCODE@";
++# $MP3DECODE = "@MP3DECODE@";
++# $MP3ENCODE = "@MP3ENCODE@";
++# $OGGDECODE = "@OGGDECODE@";
++# $OGGENCODE = "@OGGENCODE@";
++# $FLACDECODE = "@FLACDECODE@";
++# $FLACENCODE = "@FLACENCODE@";
+
+ # The %w etc. substitutions should *not* be used in the following, as
+ # this script knows about their options already.
+@@ -614,7 +614,7 @@
+ }
+
+ unless ($encoder) {
+- print STDERR "$progname: $output_file: no decoder
available\n";
++ print STDERR "$progname: $output_file: no encoder
available\n";
+ print STDERR "$progname: leaving output in $tmp_file\n";
+ next;
+ }
diff --git
a/audio-soft/normalize/patches/06-smgl-prefer-mpg123-because-faster-and-also-accurate.patch
b/audio-soft/normalize/patches/06-smgl-prefer-mpg123-because-faster-and-also-accurate.patch
new file mode 100644
index 0000000..5952ab7
--- /dev/null
+++
b/audio-soft/normalize/patches/06-smgl-prefer-mpg123-because-faster-and-also-accurate.patch
@@ -0,0 +1,18 @@
+--- normalize-0.7.7/src/normalize-mp3.in.orig 2025-05-31 16:55:10.567869537
+0200
++++ normalize-0.7.7/src/normalize-mp3.in 2025-05-31 16:56:48.309869525
+0200
+@@ -241,11 +241,11 @@
+
+ sub find_mp3decode {
+ my ($path);
+- $path = find_prog("madplay");
+- if ($path) { $path .= " -q -o %w %m"; }
++ $path = find_prog("mpg123");
++ if ($path) { $path .= " -q -w %w %m"; }
+ unless ($path) {
+- $path = find_prog("mpg123");
+- if ($path) { $path .= " -q -w %w %m"; }
++ $path = find_prog("madplay");
++ if ($path) { $path .= " -q -o %w %m"; }
+ }
+ if ($path) { $MP3DECODE = $path; }
+ }
diff --git a/audio-soft/normalize/patches/07-debian-fix-configure-ac.patch
b/audio-soft/normalize/patches/07-debian-fix-configure-ac.patch
new file mode 100644
index 0000000..ab5d25d
--- /dev/null
+++ b/audio-soft/normalize/patches/07-debian-fix-configure-ac.patch
@@ -0,0 +1,39 @@
+Author: Ilya Barygin <randomaction AT ubuntu.com>
+Description: - Add AM_PROG_CC_C_O required by newer automake versions.
+- Avoid autoconf errors related to AM_PATH_GLIB, AM_PATH_GTK, and
AM_PATH_XMMS
+ by using pkg-config instead.
+- audiofile >= 0.3.2-1 does no longer provide audiofile-config and the
+ AM_PATH_AUDIOFILE macro based on it. Use pkg-config instead (see #655181).
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,7 @@
+
+ AC_CANONICAL_HOST
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -221,9 +222,9 @@
+
+ dnl *** Stuff for xmms plugin ***
+ have_xmms=true
+-AM_PATH_GLIB(1.2.2, , [ have_xmms=false ])
+-AM_PATH_GTK(1.2.2, , [ have_xmms=false ], gthread)
+-AM_PATH_XMMS(1.0.0, , [ have_xmms=false ])
++PKG_CHECK_MODULES([GLIB], [glib-2.0], , [ have_xmms=false ])
++PKG_CHECK_MODULES([GTK], [gtk-2.0], , [ have_xmms=false ])
++PKG_CHECK_MODULES([XMMS], [xmms2-client], , [ have_xmms=false ])
+ AM_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ AC_ARG_ENABLE(xmms,
+@@ -249,7 +250,8 @@
+
+ dnl *** Stuff for audiofile library ***
+ dnl v0.2.1 and before have bugs with 24-bit LE files
+-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
++PKG_CHECK_MODULES([AUDIOFILE], [audiofile >= 0.2.2], [have_audiofile=true],
[])
++dnl AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
+ dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
+ AH_TEMPLATE([USE_AUDIOFILE],
+ [Define if you want to use the audiofile library.])
diff --git
a/audio-soft/normalize/patches/08-debian-fix-zero-power-handling.patch
b/audio-soft/normalize/patches/08-debian-fix-zero-power-handling.patch
new file mode 100644
index 0000000..3471fac
--- /dev/null
+++ b/audio-soft/normalize/patches/08-debian-fix-zero-power-handling.patch
@@ -0,0 +1,26 @@
+Author: Matthias Heintze <ma AT fam-heintze.de>
+Description: Correctly skip multiple subsequent files with zero power
+ (see #791890).
+Index: normalize-audio-0.7.7/src/normalize.c
+===================================================================
+--- normalize-audio-0.7.7.orig/src/normalize.c
++++ normalize-audio-0.7.7/src/normalize.c
+@@ -466,7 +466,7 @@ warranty; not even for MERCHANTABILITY o
+ compute_levels(sis, fnames, nfiles);
+
+ /* anything that came back with a level of -1 was bad, so remove it */
+- for (i = 0; i < nfiles; i++) {
++ for (i = 0; i < nfiles; ) {
+ if (sis[i].level < 0) {
+ nfiles--;
+ memmove(sis + i, sis + i + 1,
+@@ -475,7 +475,8 @@ warranty; not even for MERCHANTABILITY o
+ (nfiles - i) * sizeof(char *));
+ memmove(progress_info.file_sizes + i, progress_info.file_sizes + i +
1,
+ (nfiles - i) * sizeof(off_t));
+- }
++ } else
++ ++i;
+ }
+
+ if (batch_mode || mix_mode) {
diff --git
a/audio-soft/normalize/patches/09-debian-fix-parallel-test-suite.patch
b/audio-soft/normalize/patches/09-debian-fix-parallel-test-suite.patch
new file mode 100644
index 0000000..0f9cc83
--- /dev/null
+++ b/audio-soft/normalize/patches/09-debian-fix-parallel-test-suite.patch
@@ -0,0 +1,295 @@
+Author: Joachim Reichel <reichel AT debian.org>
+Description: Make test suite thread-safe.
+ Use distinct filenames for temporary files.
+ Add dependency on test-tools.
+
+Index: normalize-audio-0.7.7/test/Makefile.am
+===================================================================
+--- normalize-audio-0.7.7.orig/test/Makefile.am
++++ normalize-audio-0.7.7/test/Makefile.am
+@@ -19,9 +19,11 @@
+
+ TESTS = test-tools test8bit.sh test16bit.sh test24bit.sh
+
++$(TESTS): test-tools
++
+ EXTRA_DIST = $(TESTS)
+
+-CLEANFILES = test-tools mono.wav stereo.wav test.log
++CLEANFILES = test-tools mono8.wav stereo8.wav test8.log mono16.wav
stereo16.wav test16.log mono24.wav stereo24.wav test24.log
+
+ test-tools: ../src/mktestwav
+ -rm -f test.log
+Index: normalize-audio-0.7.7/test/test16bit.sh
+===================================================================
+--- normalize-audio-0.7.7.orig/test/test16bit.sh
++++ normalize-audio-0.7.7/test/test16bit.sh
+@@ -7,64 +7,64 @@ export LC_ALL LC_NUMERIC
+ # correct answers
+ MONO_BEFORE=40d859e7c05a93883eff84077edaef52
+ STEREO_BEFORE=3f5fb4e39d2ad8c6b1cf7bf7e6eed20b
+-LVL_MONO="-6.0211dBFS -3.0106dBFS -5.9789dB mono.wav"
+-LVL_STEREO="-6.0211dBFS -3.0106dBFS -5.9789dB stereo.wav"
++LVL_MONO="-6.0211dBFS -3.0106dBFS -5.9789dB mono16.wav"
++LVL_STEREO="-6.0211dBFS -3.0106dBFS -5.9789dB stereo16.wav"
+ MONO_AFTER=3b41f1dc0623c53473f603a0451d59ca
+ STEREO_AFTER=8312e5c583e5cb60dda29d0289895cb2
+
+-exec 3>> test.log
++exec 3>> test16.log
+ echo "Testing 16-bit wavs..." >&3
+
+-../src/mktestwav -a 0.5 -b 2 -c 1 mono.wav
+-../src/mktestwav -a 0.5 -b 2 -c 2 stereo.wav
++../src/mktestwav -a 0.5 -b 2 -c 1 mono16.wav
++../src/mktestwav -a 0.5 -b 2 -c 2 stereo16.wav
+
+ # Check that the files written by mktestwav are correct
+-CHKSUM=`tail -c +44 mono.wav | md5sum`
++CHKSUM=`tail -c +44 mono16.wav | md5sum`
+ case "$CHKSUM" in
+ $MONO_BEFORE*) ;;
+- *) echo "FAIL: created mono.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: created mono16.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+-CHKSUM=`tail -c +44 stereo.wav | md5sum`
++CHKSUM=`tail -c +44 stereo16.wav | md5sum`
+ case "$CHKSUM" in
+ $STEREO_BEFORE*) ;;
+- *) echo "FAIL: created stereo.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: created stereo16.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+
+-echo "mono.wav and stereo.wav created..." >&3
++echo "mono16.wav and stereo16.wav created..." >&3
+
+ # Check that normalize correctly measures the volume of the files
+-NORM=`../src/normalize -qn mono.wav`
++NORM=`../src/normalize -qn mono16.wav`
+ if test x"$NORM" != x"$LVL_MONO"; then
+- echo "FAIL: measured volume of mono.wav is incorrect:" >&3
++ echo "FAIL: measured volume of mono16.wav is incorrect:" >&3
+ echo " should be: $LVL_MONO" >&3
+ echo " got: $NORM" >&3
+ exit 1
+ fi
+-NORM=`../src/normalize -qn stereo.wav`
++NORM=`../src/normalize -qn stereo16.wav`
+ if test x"$NORM" != x"$LVL_STEREO"; then
+- echo "FAIL: measured volume of stereo.wav is incorrect:" >&3
++ echo "FAIL: measured volume of stereo16.wav is incorrect:" >&3
+ echo " should be: $LVL_STEREO" >&3
+ echo " got: $NORM" >&3
+ exit 1
+ fi
+
+-echo "mono.wav and stereo.wav measured successfully..." >&3
++echo "mono16.wav and stereo16.wav measured successfully..." >&3
+
+ # Check that normalize correctly normalizes the volume of the files
+-../src/normalize -q mono.wav
+-../src/normalize -q stereo.wav
+-CHKSUM=`tail -c +44 mono.wav | md5sum`
++../src/normalize -q mono16.wav
++../src/normalize -q stereo16.wav
++CHKSUM=`tail -c +44 mono16.wav | md5sum`
+ case "$CHKSUM" in
+ $MONO_AFTER*) ;;
+- *) echo "FAIL: adjusted mono.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: adjusted mono16.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+-CHKSUM=`tail -c +44 stereo.wav | md5sum`
++CHKSUM=`tail -c +44 stereo16.wav | md5sum`
+ case "$CHKSUM" in
+ $STEREO_AFTER*) ;;
+- *) echo "FAIL: adjusted stereo.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: adjusted stereo16.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+
+-echo "mono.wav and stereo.wav adjusted successfully..." >&3
++echo "mono16.wav and stereo16.wav adjusted successfully..." >&3
+ echo "PASSED!" >&3
+
+ exit 0
+Index: normalize-audio-0.7.7/test/test24bit.sh
+===================================================================
+--- normalize-audio-0.7.7.orig/test/test24bit.sh
++++ normalize-audio-0.7.7/test/test24bit.sh
+@@ -7,64 +7,64 @@ export LC_ALL LC_NUMERIC
+ # correct answers
+ MONO_BEFORE=1f6586aa8a849a3bd8b24b42eb9e3f63
+ STEREO_BEFORE=24d9a4de01f11c0a4e37c1f0fedb1675
+-LVL_MONO="-6.0206dBFS -3.0104dBFS -5.9794dB mono.wav"
+-LVL_STEREO="-6.0206dBFS -3.0104dBFS -5.9794dB stereo.wav"
++LVL_MONO="-6.0206dBFS -3.0104dBFS -5.9794dB mono24.wav"
++LVL_STEREO="-6.0206dBFS -3.0104dBFS -5.9794dB stereo24.wav"
+ MONO_AFTER=1553f2c735477f1de783365db1bec012
+ STEREO_AFTER=cf7581a8924eb3b29b93e93bc6a9f7dc
+
+-exec 3>> test.log
++exec 3>> test24.log
+ echo "Testing 24-bit wavs..." >&3
+
+-../src/mktestwav -a 0.5 -b 3 -c 1 mono.wav
+-../src/mktestwav -a 0.5 -b 3 -c 2 stereo.wav
++../src/mktestwav -a 0.5 -b 3 -c 1 mono24.wav
++../src/mktestwav -a 0.5 -b 3 -c 2 stereo24.wav
+
+ # Check that the files written by mktestwav are correct
+-CHKSUM=`tail -c +44 mono.wav | md5sum`
++CHKSUM=`tail -c +44 mono24.wav | md5sum`
+ case "$CHKSUM" in
+ $MONO_BEFORE*) ;;
+- *) echo "FAIL: created mono.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: created mono24.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+-CHKSUM=`tail -c +44 stereo.wav | md5sum`
++CHKSUM=`tail -c +44 stereo24.wav | md5sum`
+ case "$CHKSUM" in
+ $STEREO_BEFORE*) ;;
+- *) echo "FAIL: created stereo.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: created stereo24.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+
+-echo "mono.wav and stereo.wav created..." >&3
++echo "mono24.wav and stereo24.wav created..." >&3
+
+ # Check that normalize correctly measures the volume of the files
+-NORM=`../src/normalize -qn mono.wav`
++NORM=`../src/normalize -qn mono24.wav`
+ if test x"$NORM" != x"$LVL_MONO"; then
+- echo "FAIL: measured volume of mono.wav is incorrect:" >&3
++ echo "FAIL: measured volume of mono24.wav is incorrect:" >&3
+ echo " should be: $LVL_MONO" >&3
+ echo " got: $NORM" >&3
+ exit 1
+ fi
+-NORM=`../src/normalize -qn stereo.wav`
++NORM=`../src/normalize -qn stereo24.wav`
+ if test x"$NORM" != x"$LVL_STEREO"; then
+- echo "FAIL: measured volume of stereo.wav is incorrect:" >&3
++ echo "FAIL: measured volume of stereo24.wav is incorrect:" >&3
+ echo " should be: $LVL_STEREO" >&3
+ echo " got: $NORM" >&3
+ exit 1
+ fi
+
+-echo "mono.wav and stereo.wav measured successfully..." >&3
++echo "mono24.wav and stereo24.wav measured successfully..." >&3
+
+ # Check that normalize correctly normalizes the volume of the files
+-../src/normalize -q mono.wav
+-../src/normalize -q stereo.wav
+-CHKSUM=`tail -c +44 mono.wav | md5sum`
++../src/normalize -q mono24.wav
++../src/normalize -q stereo24.wav
++CHKSUM=`tail -c +44 mono24.wav | md5sum`
+ case "$CHKSUM" in
+ $MONO_AFTER*) ;;
+- *) echo "FAIL: adjusted mono.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: adjusted mono24.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+-CHKSUM=`tail -c +44 stereo.wav | md5sum`
++CHKSUM=`tail -c +44 stereo24.wav | md5sum`
+ case "$CHKSUM" in
+ $STEREO_AFTER*) ;;
+- *) echo "FAIL: adjusted stereo.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: adjusted stereo24.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+
+-echo "mono.wav and stereo.wav adjusted successfully..." >&3
++echo "mono24.wav and stereo24.wav adjusted successfully..." >&3
+ echo "PASSED!" >&3
+
+ exit 0
+Index: normalize-audio-0.7.7/test/test8bit.sh
+===================================================================
+--- normalize-audio-0.7.7.orig/test/test8bit.sh
++++ normalize-audio-0.7.7/test/test8bit.sh
+@@ -7,64 +7,64 @@ export LC_ALL LC_NUMERIC
+ # correct answers
+ MONO_BEFORE=0e37a15946316f3db6fc9a23abf3f946
+ STEREO_BEFORE=449a7f8dc0f38912606e1ebcfc5bac85
+-LVL_MONO="-6.1497dBFS -3.0883dBFS -5.8503dB mono.wav"
+-LVL_STEREO="-6.1497dBFS -3.0883dBFS -5.8503dB stereo.wav"
++LVL_MONO="-6.1497dBFS -3.0883dBFS -5.8503dB mono8.wav"
++LVL_STEREO="-6.1497dBFS -3.0883dBFS -5.8503dB stereo8.wav"
+ MONO_AFTER=b684ba44e69d7171c7938acc3ae4d1c6
+ STEREO_AFTER=7a0d972b53f9c63bf714da73eac9f86a
+
+-exec 3>> test.log
++exec 3>> test8.log
+ echo "Testing 8-bit wavs..." >&3
+
+-../src/mktestwav -a 0.5 -b 1 -c 1 mono.wav
+-../src/mktestwav -a 0.5 -b 1 -c 2 stereo.wav
++../src/mktestwav -a 0.5 -b 1 -c 1 mono8.wav
++../src/mktestwav -a 0.5 -b 1 -c 2 stereo8.wav
+
+ # Check that the files written by mktestwav are correct
+-CHKSUM=`tail -c +44 mono.wav | md5sum`
++CHKSUM=`tail -c +44 mono8.wav | md5sum`
+ case "$CHKSUM" in
+ $MONO_BEFORE*) ;;
+- *) echo "FAIL: created mono.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: created mono8.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+-CHKSUM=`tail -c +44 stereo.wav | md5sum`
++CHKSUM=`tail -c +44 stereo8.wav | md5sum`
+ case "$CHKSUM" in
+ $STEREO_BEFORE*) ;;
+- *) echo "FAIL: created stereo.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: created stereo8.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+
+-echo "mono.wav and stereo.wav created..." >&3
++echo "mono8.wav and stereo8.wav created..." >&3
+
+ # Check that normalize correctly measures the volume of the files
+-NORM=`../src/normalize -qn mono.wav`
++NORM=`../src/normalize -qn mono8.wav`
+ if test x"$NORM" != x"$LVL_MONO"; then
+- echo "FAIL: measured volume of mono.wav is incorrect:" >&3
++ echo "FAIL: measured volume of mono8.wav is incorrect:" >&3
+ echo " should be: $LVL_MONO" >&3
+ echo " got: $NORM" >&3
+ exit 1
+ fi
+-NORM=`../src/normalize -qn stereo.wav`
++NORM=`../src/normalize -qn stereo8.wav`
+ if test x"$NORM" != x"$LVL_STEREO"; then
+- echo "FAIL: measured volume of stereo.wav is incorrect:" >&3
++ echo "FAIL: measured volume of stereo8.wav is incorrect:" >&3
+ echo " should be: $LVL_STEREO" >&3
+ echo " got: $NORM" >&3
+ exit 1
+ fi
+
+-echo "mono.wav and stereo.wav measured successfully..." >&3
++echo "mono8.wav and stereo8.wav measured successfully..." >&3
+
+ # Check that normalize correctly normalizes the volume of the files
+-../src/normalize -q mono.wav
+-../src/normalize -q stereo.wav
+-CHKSUM=`tail -c +44 mono.wav | md5sum`
++../src/normalize -q mono8.wav
++../src/normalize -q stereo8.wav
++CHKSUM=`tail -c +44 mono8.wav | md5sum`
+ case "$CHKSUM" in
+ $MONO_AFTER*) ;;
+- *) echo "FAIL: adjusted mono.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: adjusted mono8.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+-CHKSUM=`tail -c +44 stereo.wav | md5sum`
++CHKSUM=`tail -c +44 stereo8.wav | md5sum`
+ case "$CHKSUM" in
+ $STEREO_AFTER*) ;;
+- *) echo "FAIL: adjusted stereo.wav has bad checksum!" >&3; exit 1 ;;
++ *) echo "FAIL: adjusted stereo8.wav has bad checksum!" >&3; exit 1 ;;
+ esac
+
+-echo "mono.wav and stereo.wav adjusted successfully..." >&3
++echo "mono8.wav and stereo8.wav adjusted successfully..." >&3
+ echo "PASSED!" >&3
+
+ exit 0
diff --git a/audio-soft/normalize/patches/10-debian-fix-c23.patch
b/audio-soft/normalize/patches/10-debian-fix-c23.patch
new file mode 100644
index 0000000..225f582
--- /dev/null
+++ b/audio-soft/normalize/patches/10-debian-fix-c23.patch
@@ -0,0 +1,28 @@
+Index: normalize-audio/nid3lib/write.c
+===================================================================
+--- normalize-audio.orig/nid3lib/write.c
++++ normalize-audio/nid3lib/write.c
+@@ -20,8 +20,6 @@
+ * id3_write(), and many helper functions.
+ */
+
+-#define _POSIX_C_SOURCE 2
+-
+ #include "config.h"
+
+ #include <stdio.h>
+@@ -59,14 +57,6 @@
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
+-#if HAVE_FTRUNCATE
+-/*
+- * ftruncate() shouldn't be declared yet, since we turn on
+- * _POSIX_C_SOURCE, but you never know, so we use an old style
+- * declaration to lessen the chance of conflict.
+- */
+-int ftruncate();
+-#endif
+
+ #include "nid3P.h"
+
diff --git
a/database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
b/database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
deleted file mode 100644
index 7b3bc04..0000000
---
a/database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# From https://patchwork.ozlabs.org/patch/909328/
-From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem AT gmail.com>
-Date: Wed, 22 Mar 2017 15:32:26 +0000
-Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid
clash
- with builtins
-
-Helps building with clang
-
-Fixes
-
-../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin
function '__atomic_compare_exchange'
-static inline int __atomic_compare_exchange(
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem AT gmail.com>
-
-Downloaded from
-http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
-
-Fixes gcc-8 build error.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls AT t-online.de>
----
- src/dbinc/atomic.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
-index 6a858f7..1b49de5 100644
---- a/src/dbinc/atomic.h
-+++ b/src/dbinc/atomic.h
-@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
- #define atomic_inc(env, p) __atomic_inc(p)
- #define atomic_dec(env, p) __atomic_dec(p)
- #define atomic_compare_exchange(env, p, o, n) \
-- __atomic_compare_exchange((p), (o), (n))
-+ __db_atomic_compare_exchange((p), (o), (n))
- static inline int __atomic_inc(db_atomic_t *p)
- {
- int temp;
-@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
- * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
- * which configure could be changed to use.
- */
--static inline int __atomic_compare_exchange(
-+static inline int __db_atomic_compare_exchange(
- db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
- {
- atomic_value_t was;
---
-1.8.3.1
-
diff --git a/database/db/HISTORY b/database/db/HISTORY
index 443741a..00d6f56 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,6 @@
+2025-04-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, patches: fixups, moved, gcc14 build
+
2019-05-17 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, db-5.3.28-musl-detect.patch: Replaced patch w/sed expr.
diff --git a/database/db/PRE_BUILD b/database/db/PRE_BUILD
index 5528e71..0f3af50 100755
--- a/database/db/PRE_BUILD
+++ b/database/db/PRE_BUILD
@@ -1,11 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-message "${MESSAGE_COLOR}Applying Java compiler fix...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/javafix.diff &&
-
-message "${MESSAGE_COLOR}Applying GCC 8.x Clang fix...${DEFAULT_COLOR}" &&
-patch -p1 <
"${SPELL_DIRECTORY}"/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
&&
+apply_patch_dir patches &&
sedit 's!maybe_os in$!& linux-musl*|\\!' dist/config.sub &&
diff --git a/database/db/javafix.diff b/database/db/javafix.diff
deleted file mode 100644
index ada3b53..0000000
--- a/database/db/javafix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur db-4.3.27.orig/dist/configure db-4.3.27/dist/configure
---- db-4.3.27.orig/dist/configure 2005-02-24 22:46:57.845051456 -0800
-+++ db-4.3.27/dist/configure 2005-02-24 22:47:09.964209064 -0800
-@@ -21468,7 +21468,6 @@
- System.exit (0);
- } }
- EOF
--if test x$ac_cv_prog_uudecode_base64 != xyes; then
- if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -21483,7 +21482,6 @@
- echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check
the CLASSPATH?)" >&2;}
- { (exit 1); exit 1; }; }
- fi
--fi
- if { ac_try='$JAVA $JAVAFLAGS $TEST'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
diff --git a/database/db/patches/0001-db-fix-conftest-gcc14.patch
b/database/db/patches/0001-db-fix-conftest-gcc14.patch
new file mode 100644
index 0000000..0809f98
--- /dev/null
+++ b/database/db/patches/0001-db-fix-conftest-gcc14.patch
@@ -0,0 +1,119 @@
+--- db-5.3.28/dist/configure.orig 2025-04-28 01:00:42.322977454 +0200
++++ db-5.3.28/dist/configure 2025-04-28 01:04:29.314975385 +0200
+@@ -20609,7 +20609,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -20669,7 +20669,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_condattr_t condattr;
+ exit(pthread_condattr_init(&condattr) ||
+@@ -20719,7 +20719,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_rwlock_t rwlock;
+ pthread_rwlockattr_t rwlockattr;
+ exit(pthread_rwlockattr_init(&rwlockattr) ||
+@@ -20783,7 +20783,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -20843,7 +20843,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_condattr_t condattr;
+ exit(pthread_condattr_init(&condattr) ||
+@@ -20893,7 +20893,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_rwlock_t rwlock;
+ pthread_rwlockattr_t rwlockattr;
+ exit(pthread_rwlockattr_init(&rwlockattr) ||
+@@ -20958,7 +20958,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -21016,7 +21016,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_condattr_t condattr;
+ exit(pthread_condattr_init(&condattr) ||
+@@ -21066,7 +21066,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_rwlock_t rwlock;
+ pthread_rwlockattr_t rwlockattr;
+ exit(pthread_rwlockattr_init(&rwlockattr) ||
+@@ -21128,7 +21128,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_mutex_t mutex;
+ pthread_condattr_t condattr;
+@@ -21186,7 +21186,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_cond_t cond;
+ pthread_condattr_t condattr;
+ exit(pthread_condattr_init(&condattr) ||
+@@ -21236,7 +21236,7 @@
+
+ #include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+ pthread_rwlock_t rwlock;
+ pthread_rwlockattr_t rwlockattr;
+ exit(pthread_rwlockattr_init(&rwlockattr) ||
+@@ -23454,7 +23454,7 @@
+ /* end confdefs.h. */
+
+ #include <sys/time.h>
+-main() {
++int main() {
+ struct timespec t;
+ return (clock_gettime(CLOCK_MONOTONIC, &t) != 0);
+ }
diff --git
a/database/db/patches/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
b/database/db/patches/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
new file mode 100644
index 0000000..7b3bc04
--- /dev/null
+++
b/database/db/patches/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
@@ -0,0 +1,53 @@
+# From https://patchwork.ozlabs.org/patch/909328/
+From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem AT gmail.com>
+Date: Wed, 22 Mar 2017 15:32:26 +0000
+Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid
clash
+ with builtins
+
+Helps building with clang
+
+Fixes
+
+../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin
function '__atomic_compare_exchange'
+static inline int __atomic_compare_exchange(
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem AT gmail.com>
+
+Downloaded from
+http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+
+Fixes gcc-8 build error.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls AT t-online.de>
+---
+ src/dbinc/atomic.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
+index 6a858f7..1b49de5 100644
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define atomic_inc(env, p) __atomic_inc(p)
+ #define atomic_dec(env, p) __atomic_dec(p)
+ #define atomic_compare_exchange(env, p, o, n) \
+- __atomic_compare_exchange((p), (o), (n))
++ __db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ int temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+ * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+ * which configure could be changed to use.
+ */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ atomic_value_t was;
+--
+1.8.3.1
+
diff --git a/database/db/patches/0003-javafix.patch
b/database/db/patches/0003-javafix.patch
new file mode 100644
index 0000000..ada3b53
--- /dev/null
+++ b/database/db/patches/0003-javafix.patch
@@ -0,0 +1,19 @@
+diff -Naur db-4.3.27.orig/dist/configure db-4.3.27/dist/configure
+--- db-4.3.27.orig/dist/configure 2005-02-24 22:46:57.845051456 -0800
++++ db-4.3.27/dist/configure 2005-02-24 22:47:09.964209064 -0800
+@@ -21468,7 +21468,6 @@
+ System.exit (0);
+ } }
+ EOF
+-if test x$ac_cv_prog_uudecode_base64 != xyes; then
+ if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+@@ -21483,7 +21482,6 @@
+ echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check
the CLASSPATH?)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-fi
+ if { ac_try='$JAVA $JAVAFLAGS $TEST'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 5947d03..7e1c05a 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,7 @@
+2025-04-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, patches/001-apr-util-1.6.3-fix-db-detection.patch:
+ hack configure to fix db detection with current gcc
+
2023-04-14 David C. Haley <khoralin AT gmail.com>
* DETAILS: version bump -> 1.6.5
SECURITY_PATCH++: CVE-2022-25147
diff --git a/libs/apr-util/PRE_BUILD b/libs/apr-util/PRE_BUILD
index 8626c82..4820564 100755
--- a/libs/apr-util/PRE_BUILD
+++ b/libs/apr-util/PRE_BUILD
@@ -5,4 +5,5 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
if ! [[ -x configure ]]; then
./buildconf --with-apr=$INSTALL_ROOT/usr/share/apache2
-fi
+fi &&
+apply_patch_dir patches
diff --git a/libs/apr-util/patches/001-apr-util-1.6.3-fix-db-detection.patch
b/libs/apr-util/patches/001-apr-util-1.6.3-fix-db-detection.patch
new file mode 100644
index 0000000..fb13e83
--- /dev/null
+++ b/libs/apr-util/patches/001-apr-util-1.6.3-fix-db-detection.patch
@@ -0,0 +1,146 @@
+--- apr-util-1.6.3/configure.orig 2023-01-31 21:57:52.000000000 +0100
++++ apr-util-1.6.3/configure 2025-04-28 00:48:36.267984071 +0200
+@@ -13004,7 +13004,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -13409,7 +13409,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -13810,7 +13810,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -14211,7 +14211,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -14612,7 +14612,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -15027,7 +15027,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -15431,7 +15431,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -15835,7 +15835,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -16239,7 +16239,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -16647,7 +16647,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -17058,7 +17058,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -17478,7 +17478,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -17883,7 +17883,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -18284,7 +18284,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -18685,7 +18685,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
+@@ -19086,7 +19086,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+ int major, minor, patch;
+
- [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (e62c46c65ed27c1797b46cdc0268a2b3c40f13ec), Thomas Orgis, 05/31/2025
Archive powered by MHonArc 2.6.24.