gentoo auto-resync : 24:03:2024 - 19:00:40

6 files changed, 126 insertions, 7 deletions

diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 0e812cf8d675..7bbfae198c21 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,6 @@
+AUX libsoundtouch-2.3.2-configure-bashism.patch 1134 BLAKE2B fcb5153cdf22f46061bdc5cac4d71e6f0db92b05b20907457b4ae37f613a2851fd04d00274fe9f40a471c1a356b4c7ebc066eca014fc2da76eed6ccecfbba368 SHA512 b0f9c26575f660c647a41a1812162262f4cbe107ead10ba8d821af206fd0e066d1384fae854b5bcf0229ff74cf15f8d75831bbdc6939754c2a7d41253ec1f344
+AUX libsoundtouch-2.3.2-flags.patch 677 BLAKE2B 9fb460e75adf0d0223b96882e2ae0cbfcd6e33e7073824a35e599974bbdacf7b6c539f171fa6e80e999a86a767cee8ecab30c0c0c4be21def49704a19adec9b3 SHA512 851d46691867cf2021f53b27706ff8e3ede4f3300de91c9bd1edbb51a8972e45fd5a1443197bf531b388e551e7756583ef3cf950fc21f7f5e3c331b7d248d5bd
 DIST soundtouch-2.3.2.tar.gz 583373 BLAKE2B cd3c8fffaa81a2ed867f5a564dd7ff3047b4de576536c3c116162981261bf3789d16def1c94e5be2450373be3f61fd67fa44e3552e19cad7b7d5d56500b98255 SHA512 72cd38f3e11f3c55ff7ed3691fd9a749a5f8d072e08ed03f2fd43a8664962138afaf3e4647116940e86f6ae374a1ba3bcd4b108280da29f3ffa6091cf383ea35
-EBUILD libsoundtouch-2.3.2.ebuild 1553 BLAKE2B 0b4bf6bd4cba07486963d24c410405c256a976e514adaefa24d8d0719e5c6b1863f387dbbb83d09bad139a9053f9ce7b4a72908c395890bfc8ea025bbff493ca SHA512 f4fb640263e6b1870e6f9f6e97094f1ca06c9277ee485f62f8cac305cac1ae975578984bffbb5171eec9630b3d902499a0000c6d922ebb9c88b3ef24964bc699
-MISC metadata.xml 340 BLAKE2B 79434139d8b16ccc23413b2d7edeb5ac184e75c88db217aacec899034da6bd355bb764b25954d7857f6abf9bc7136708ed5313abbc2b58ed580b22c705a9191d SHA512 9dce73f2eef4da8acf3d2bfc4e2c44faefe42ca63173db09adfd00943a9de363716a6090817016b422b7bc12305b995ccd379ff649ac7c38cb3c95948ceb2319
+EBUILD libsoundtouch-2.3.2-r1.ebuild 1592 BLAKE2B 87e6a634297fc30d74f04b0ff1d05829a62961499e6f6a06ed57152355e62095fd1a0d878d4e8c67019aa7d71ab1ca19fd3c739e65441581f12f2b8c66d496de SHA512 a8e841bcbff6672ea8c4d8ed6decef89d05d2c4def2456d228479eb6838066b3b2d63789c97460fb1b2b7d06588c0b77c52e1cb8375d570b74555784d0f7abf0
+EBUILD libsoundtouch-2.3.2.ebuild 1549 BLAKE2B 7cbe6be88e41e0dc047d5f0d9b8e665f710d7d4d39d0001e124a0e34940896f87fbafc5a6c87b3def415b0609e195a389e2051b59d06bbf4082e4d4ad84d0b7d SHA512 eb4a5180a332f98596bd5bcb9c54775b408f4f1eaf901e89a647cccbb1b95a3bc693e6b69bca2584af64f5ae7beb46ce915bf3bcfdcf459b225ed18a6c959dfd
+MISC metadata.xml 342 BLAKE2B e6cf68e7f7b3388d470217ab284df262c30c97ab45dee72af996dffaf6da83dccdc20d9637838a4af5ba841dc83de91e4d7221b91d1c530ad87905cf776145d5 SHA512 8255b1dcaeab7ee22bca3c7625a534a1c41c4c5adf94471f46f5a6516c9cafc1525cff4c16d6424ab6e9962b5030553d969526da804bd9ae6df98788c1556121
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-2.3.2-configure-bashism.patch b/media-libs/libsoundtouch/files/libsoundtouch-2.3.2-configure-bashism.patch
new file mode 100644
index 000000000000..b49ebcd38aae
--- /dev/null
+++ b/media-libs/libsoundtouch/files/libsoundtouch-2.3.2-configure-bashism.patch
@@ -0,0 +1,33 @@
+https://codeberg.org/soundtouch/soundtouch/pulls/34
+
+From 429a4669cfee54ec69f8be61cc4b5ac2d87d1254 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 24 Mar 2024 07:19:34 +0000
+Subject: [PATCH 2/2] configure.ac: fix bashism in CXXFLAGS assignment
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking whether make supports nested variables... (cached) yes
+configure: 3698: CXXFLAGS+= -Ofast: not found
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_LANG(C++)
+ 
+ # Compiler flags. Apply -Ofast (implies -O3 -ffast-math) to allow gcc autovectorization
+ # generate effective SIMD code.
+-CXXFLAGS+=" -Ofast"
++CXXFLAGS="${CXXFLAGS} -Ofast"
+ 
+ # Set AR_FLAGS to avoid build warning "ar: `u' modifier ignored since `D' is the default (see `U')"
+ AR_FLAGS='cr'
diff --git a/media-libs/libsoundtouch/files/libsoundtouch-2.3.2-flags.patch b/media-libs/libsoundtouch/files/libsoundtouch-2.3.2-flags.patch
new file mode 100644
index 000000000000..badd42e43b26
--- /dev/null
+++ b/media-libs/libsoundtouch/files/libsoundtouch-2.3.2-flags.patch
@@ -0,0 +1,18 @@
+https://codeberg.org/soundtouch/soundtouch/pulls/35
+--- a/source/SoundTouchDLL/Makefile.am
++++ b/source/SoundTouchDLL/Makefile.am
+@@ -34,7 +34,7 @@ libSoundTouchDll_la_SOURCES=../SoundTouch/AAFilter.cpp ../SoundTouch/FIRFilter.c
+ # Compiler flags

+ 

+ # Modify the default 0.0.0 to LIB_SONAME.0.0

+-LDFLAGS=-version-info @LIB_SONAME@

++AM_LDFLAGS=$(LDFLAGS) -version-info @LIB_SONAME@

+ 

+ if X86

+ CXXFLAGS1=-mstackrealign -msse

+@@ -44,4 +44,4 @@ if X86_64
+ CXXFLAGS2=-fPIC

+ endif

+ 

+-CXXFLAGS+=$(AM_CXXFLAGS) $(CXXFLAGS1) $(CXXFLAGS2) -shared -DDLL_EXPORTS -fvisibility=hidden

++AM_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS1) $(CXXFLAGS2) -shared -DDLL_EXPORTS -fvisibility=hidden

diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.2-r1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..642ab60742a3
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_PN=${PN/lib}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
+HOMEPAGE="https://www.surina.net/soundtouch/ https://codeberg.org/soundtouch/soundtouch"
+SRC_URI="https://www.surina.net/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="LGPL-2.1"
+# subslot = libSoundTouch.so soname
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_sse openmp static-libs"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2-configure-bashism.patch
+	"${FILESDIR}"/${PN}-2.3.2-flags.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-integer-samples
+		$(use_enable cpu_flags_x86_sse x86-optimizations)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild
index 36bff7c7e4a5..65fd97ae6c73 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,8 +8,9 @@ inherit autotools multilib-minimal toolchain-funcs
 MY_PN=${PN/lib}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
+HOMEPAGE="https://www.surina.net/soundtouch/ https://codeberg.org/soundtouch/soundtouch"
 SRC_URI="https://www.surina.net/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
@@ -19,7 +20,9 @@ IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_PN}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2-configure-bashism.patch
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -32,7 +35,6 @@ pkg_setup() {
 src_prepare() {
 	default
 	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
 	eautoreconf
 }
 
diff --git a/media-libs/libsoundtouch/metadata.xml b/media-libs/libsoundtouch/metadata.xml
index 80c5adc46a80..fe8f7a319269 100644
--- a/media-libs/libsoundtouch/metadata.xml
+++ b/media-libs/libsoundtouch/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="gitlab">soundtouch/soundtouch</remote-id>
+		<remote-id type="codeberg">soundtouch/soundtouch</remote-id>
 	</upstream>
 </pkgmetadata>