commit: d6a89cfa42256fa939239ae0fdcfd91edc73d865 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Fri Aug 29 08:44:12 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 4 20:46:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a89cfa
media-sound/sox: add 14.4.4.1 Migrate to a new upstream. Enable build option to include backwards compatibility symlinks. Renaming the package could be idea in the future. Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43149 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/sox/Manifest | 1 + .../sox/files/sox-14.4.4.1-fix-opusfile.patch | 25 +++++ media-sound/sox/sox-14.4.4.1.ebuild | 108 +++++++++++++++++++++ 3 files changed, 134 insertions(+) diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest index 375678ec78d6..065cb6d26620 100644 --- a/media-sound/sox/Manifest +++ b/media-sound/sox/Manifest @@ -1,3 +1,4 @@ DIST sox-14.4.2_p20210509-patchset.tar.xz 3560 BLAKE2B 8f575dbff121d749c83c6074dadeb92475472f36ad5b9c389e1591b60cff853167c22f7c059731fa5b78c497817bcae6be93ace21bfe605faf2445301a0fe2af SHA512 4b57689bc85ac7664693c6344fd17c7fc7991e04d5e6628c2455c8e541ecfec073690d4dc23a909474ba93fd24cd877aa77f1e7fcc5b52773daa794689212bb8 DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934 +DIST sox_ng-14.4.4.1.tar.gz 1617773 BLAKE2B 23faae4872c5aa18ea5240fd8613275369aed21ad9114b9cb082023f714dc4cfd404b3fe64db307e9e1d4cc6c2499e55a3155c7d353a8102b07790045029e97f SHA512 4498036622a7ec0faa7ff7be2ad5d582afee70660b9d8b19e41305cc87330bfe6abcb218ff9a26de3e1a0fdf64c45062b8ee431a18261c8adc7e42d82c3b2f4f DIST sox_ng-14.6.0.2.tar.gz 1746640 BLAKE2B 76380ba885e6570ecea30466d6d804747983a940ac7a5c3347f4844bb0054b1a476227543aaa70ad6703634bd434e76824dbea375821ba3ba96a63321707c6a3 SHA512 9468cd15b83b2500210d54355ed5d7ae2a97171148b8a54c47007d1a7d9c57e378211c0429ee4d8065f0ba5ab97b31c9abb8795b659585c523942c044fe49b1d diff --git a/media-sound/sox/files/sox-14.4.4.1-fix-opusfile.patch b/media-sound/sox/files/sox-14.4.4.1-fix-opusfile.patch new file mode 100644 index 000000000000..ffabc16bf054 --- /dev/null +++ b/media-sound/sox/files/sox-14.4.4.1-fix-opusfile.patch @@ -0,0 +1,25 @@ +https://codeberg.org/sox_ng/sox_ng/commit/f6bb3e67a0cf84fa6afb4f252fddba66bb081664 + +From f6bb3e67a0cf84fa6afb4f252fddba66bb081664 Mon Sep 17 00:00:00 2001 +From: Martin Guy <[email protected]> +Date: Thu, 26 Jun 2025 21:52:32 +0200 +Subject: [PATCH] Fix opusfile detection, broken in 3245ebe + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 437d1e1c..4d9246ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -648,8 +648,8 @@ else + opus_old_cflags="$CFLAGS" + # Extra square brackets are required otherwise m4 mangles them + OPUS_CFLAGS="$(echo $CFLAGS | sed 's|\(-I[[^ ]]*\)|\1 \1/opus|g') -I/usr/local/include/opus -I/usr/include/opus" +- CFLAGS="$CFLAGS $OPUS_CFLAGS" + fi ++CFLAGS="$CFLAGS $OPUS_CFLAGS" + + AC_OPTIONAL_FORMAT(opus, OPUS, [AC_CHECK_HEADER(opus/opusfile.h, + [AC_CHECK_LIB(opus, opus_decoder_create, OPUS_LIBS="$OPUS_LIBS -lopus", using_opus=no) diff --git a/media-sound/sox/sox-14.4.4.1.ebuild b/media-sound/sox/sox-14.4.4.1.ebuild new file mode 100644 index 000000000000..294d50724606 --- /dev/null +++ b/media-sound/sox/sox-14.4.4.1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_PN="sox_ng" +MY_PV="${PV/_rc/-rc}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="The swiss army knife of sound processing programs" +HOMEPAGE="https://codeberg.org/sox_ng/sox_ng" +SRC_URI="https://codeberg.org/sox_ng/sox_ng/releases/download/${MY_P}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +# https://codeberg.org/sox_ng/sox_ng/wiki/Copyright +LICENSE="GPL-2" +SLOT="0/3" # SHLIB_VERSION in configure.ac +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio twolame wavpack" + +RDEPEND=" + dev-libs/libltdl:0= + >=media-sound/gsm-1.0.12-r1 + sys-apps/file + alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + ao? ( media-libs/libao:= ) + encode? ( >=media-sound/lame-3.98.4 ) + flac? ( >=media-libs/flac-1.1.3:= ) + id3tag? ( media-libs/libid3tag:= ) + ladspa? ( media-libs/ladspa-sdk ) + mad? ( media-libs/libmad ) + ogg? ( + media-libs/libogg + media-libs/libvorbis + ) + opus? ( + media-libs/opus + media-libs/opusfile + ) + png? ( + media-libs/libpng:0= + sys-libs/zlib + ) + pulseaudio? ( media-libs/libpulse ) + sndfile? ( >=media-libs/libsndfile-1.0.11 ) + sndio? ( media-sound/sndio:= ) + twolame? ( media-sound/twolame ) + wavpack? ( media-sound/wavpack ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog ) + +PATCHES=( + "${FILESDIR}"/sox-14.6.0.2-fix-symlinks.patch + "${FILESDIR}"/sox-14.4.4.1-fix-opusfile.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Workaround for LLD (bug #914867) + # https://codeberg.org/sox_ng/sox_ng/issues/69 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + local myeconfargs=( + $(use_with alsa) + $(use_with amr amrnb) + $(use_with amr amrwb) + $(use_with ao) + $(use_with encode lame) + $(use_with flac) + $(use_with id3tag) + $(use_with ladspa ladspa dyn) + $(use_with mad) + --with-magic + $(use_enable openmp) + $(use_with ogg oggvorbis) + $(use_with oss) + $(use_with opus) + $(use_with png) + $(use_with pulseaudio) + $(use_with sndfile) + $(use_with sndio) + $(use_with twolame) + $(use_with wavpack) + + --with-dyn-default + --enable-replace # bug #960558 + --disable-debug # user cflags + --with-distro="Gentoo" + + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" \( -type f -or -type l \) -name '*.la' -delete || die +}
