diff options
Diffstat (limited to 'media-libs/speex')
| -rw-r--r-- | media-libs/speex/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/speex/files/speex-1.2.1-valgrind.patch | 53 | ||||
| -rw-r--r-- | media-libs/speex/speex-1.2.1-r1.ebuild | 1 | ||||
| -rw-r--r-- | media-libs/speex/speex-1.2.1.ebuild | 5 |
4 files changed, 61 insertions, 3 deletions
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest index 8cbaa62fc12c..408a0169c32a 100644 --- a/media-libs/speex/Manifest +++ b/media-libs/speex/Manifest @@ -1,6 +1,7 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd +AUX speex-1.2.1-valgrind.patch 1619 BLAKE2B 913c8b175637922364717084f892a6a7c7853f6b29cad146244e18f86de1a13d74b7aa1ffbf116de6d56547a2e625d1b70e19f5a7d5eb869197e8a14fb9e46ae SHA512 829a3e84e9f70e12fdd2d05d476cb622691203c945fbe6cce7bd6999a82c61449db21b455bb89deae60021a28dd2f64791159b2deaf1251b9cfb50a7f1b547b4 AUX speex-1.2.1-vla-detection.patch 725 BLAKE2B ca4ba1fa56bf6bcd49c6b65d30e8d15331eeb4fbd8811b07a90659ff060e379e5446d0f8fe40769a4e19d7b4950ca510a865b7e26f9a2a2c3dc8d7d327c2219a SHA512 c759fcb9c18b498c69147c6e22aaec85bc508abf6c6a988536325f3dbfc9a15783b1e3d49f25d915f7b8d935c6a4aab28b0cef021c78b5fd0d7e053974eb544c DIST speex-1.2.1.tar.gz 1043278 BLAKE2B 60afa7eb9ff87ebb1b69e2716b7fa6727b49f6c06ed6eb6fe81236c65dc4128769618dd1f4df31af56a00e9b766c4050c1b3e415c8f972d64d1fb9e7a537a650 SHA512 52e00300df82e1c7fb527b245af02b99a1f37faef74d004b7cd981052f1aa22a412cb18f5c7a5618df4c958f727c97eb7385beec99d68548d5b02e76192d4e0a -EBUILD speex-1.2.1-r1.ebuild 1861 BLAKE2B 4d0b6e2ad461361aa60c808c77d73a680260453155dc7703f9efee038303109271b077bd2e5c3b609b8ddb932a16e5fe6ec17c14a1249cf67a23c40a5c2d8b6e SHA512 8c822e46c11f8a1e507bd8f04b742c4c6ea53cbe2b0fd08f296982227d29b923507ea372561934fc9b5be5bc587293aa6b3b09e5b5fc7c2708021cebd391cbab -EBUILD speex-1.2.1.ebuild 1752 BLAKE2B fd5c4e779950f00de25c1f980accd615ee84850dba4cf1895068bf3ff954bf9ddd118640512bc53e5e9035f51216a487819879ca7ee4392f470115163bf12e36 SHA512 fee6b9f8371e1e3247d2aa3eb2d0e391fc3c3f47a3fd83c582f060e3390d244854216bb77a2fffaae747bef90b8cc141cef8f53ba830bb5fa200cd9e0df3bb86 +EBUILD speex-1.2.1-r1.ebuild 1903 BLAKE2B 2a94ed3c6bbf759491b3fa709af9c81686a02b0f7b8624bc0f17a4e03e18e7cef619791e3b231830f09293a70f52a3338042cea8d856ea06a85ce564d3900f34 SHA512 2f9ea5bbee7a39efae38a05fb53d4f52a0170b607fd6f8f93e863b9ebc05a12f915fc1c8b4d814468e496b3446b4a37d7c73d5defd3adfd7a240604835bcedbb +EBUILD speex-1.2.1.ebuild 1795 BLAKE2B d50ddb110044b2ce9b11773c9c99594c218070cd47078838196d225aa31b4f1d817c245a6026802ba1e727976eeb3a3d83e13b7a6b5e64b9cc214c72eeb031f8 SHA512 d920ef5d9ba74ca94b0812c1ec8ebe8f25053cf3329ec555a01013d6c3cce1356e3fc98f05f99065374f6cd5b10752da7da193a9358a6d0442a943d15ecc4621 MISC metadata.xml 548 BLAKE2B 20ca971e89b8e1b610855fd5c4b05bafbc4b4cfd8e36e7a28f77b5555f01ee6e3f0b971b57accd8faa00c2ff60c9af12648a55b29878917354e5e9fbc6de9b5f SHA512 ef4cb05574ab0bb73081c67a50c866b6cc6b8f20a6de5cb6511eb3881804980dd57eb71a6e0fe5607c4898e593c762e63e91304afde8b3118bfd8bb69943b2a1 diff --git a/media-libs/speex/files/speex-1.2.1-valgrind.patch b/media-libs/speex/files/speex-1.2.1-valgrind.patch new file mode 100644 index 000000000000..a9fd9789a127 --- /dev/null +++ b/media-libs/speex/files/speex-1.2.1-valgrind.patch @@ -0,0 +1,53 @@ +https://gitlab.xiph.org/xiph/speex/-/merge_requests/13 + +From b15993fd560c90658ff2e4974e8b3a1afcfcfff2 Mon Sep 17 00:00:00 2001 +From: Andrei Slavoiu <ansla80@yahoo.com> +Date: Tue, 16 May 2023 04:49:45 +0100 +Subject: [PATCH] Fix --enable-valgrind build + +VALGRIND_MAKE_READABLE has been replaced with VALGRIND_MAKE_MEM_DEFINED +starting with version 3.2 (2006) https://valgrind.org/docs/manual/dist.news.old.html. + +Bug: https://bugs.gentoo.org/906455 +--- a/libspeex/nb_celp.c ++++ b/libspeex/nb_celp.c +@@ -172,7 +172,7 @@ void *nb_encoder_init(const SpeexMode *m) + st->highpass_enabled = 1; + + #ifdef ENABLE_VALGRIND +- VALGRIND_MAKE_READABLE(st, NB_ENC_STACK); ++ VALGRIND_MAKE_MEM_DEFINED(st, NB_ENC_STACK); + #endif + return st; + } +@@ -1113,7 +1113,7 @@ void *nb_decoder_init(const SpeexMode *m) + st->highpass_enabled = 1; + + #ifdef ENABLE_VALGRIND +- VALGRIND_MAKE_READABLE(st, NB_DEC_STACK); ++ VALGRIND_MAKE_MEM_DEFINED(st, NB_DEC_STACK); + #endif + return st; + } +--- a/libspeex/sb_celp.c ++++ b/libspeex/sb_celp.c +@@ -223,7 +223,7 @@ void *sb_encoder_init(const SpeexMode *m) + speex_encoder_ctl(st->st_low, SPEEX_GET_SAMPLING_RATE, &st->sampling_rate); + st->sampling_rate*=2; + #ifdef ENABLE_VALGRIND +- VALGRIND_MAKE_READABLE(st, (st->stack-(char*)st)); ++ VALGRIND_MAKE_MEM_DEFINED(st, (st->stack-(char*)st)); + #endif + return st; + } +@@ -1017,7 +1017,7 @@ void *sb_decoder_init(const SpeexMode *m) + st->seed = 1000; + + #ifdef ENABLE_VALGRIND +- VALGRIND_MAKE_READABLE(st, (st->stack-(char*)st)); ++ VALGRIND_MAKE_MEM_DEFINED(st, (st->stack-(char*)st)); + #endif + return st; + } +-- +GitLab diff --git a/media-libs/speex/speex-1.2.1-r1.ebuild b/media-libs/speex/speex-1.2.1-r1.ebuild index c966d61c2a6e..f84f46069fda 100644 --- a/media-libs/speex/speex-1.2.1-r1.ebuild +++ b/media-libs/speex/speex-1.2.1-r1.ebuild @@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-1.2.0-configure.patch "${FILESDIR}"/${P}-vla-detection.patch + "${FILESDIR}"/${PN}-1.2.1-valgrind.patch ) src_prepare() { diff --git a/media-libs/speex/speex-1.2.1.ebuild b/media-libs/speex/speex-1.2.1.ebuild index eecc7ebf0031..a79308db25b2 100644 --- a/media-libs/speex/speex-1.2.1.ebuild +++ b/media-libs/speex/speex-1.2.1.ebuild @@ -30,7 +30,10 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/${PN}-1.2.0-configure.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.2.0-configure.patch + "${FILESDIR}"/${PN}-1.2.1-valgrind.patch +) src_prepare() { default |