commit: 2c09d9fef937da91a4bc945e9d834997364acedd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 22 03:34:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 22 03:35:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c09d9fe
media-libs/rnnoise: EAPI 8, fix configure w/ clang 16 Closes: https://bugs.gentoo.org/879709 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/rnnoise/Manifest | 2 +- ...rnnoise-0.4.1_p20210122-configure-clang16.patch | 127 +++++++++++++++++++++ ...22.ebuild => rnnoise-0.4.1_p20210122-r1.ebuild} | 6 +- 3 files changed, 133 insertions(+), 2 deletions(-) diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest index f20a2761d4c4..a166e616a429 100644 --- a/media-libs/rnnoise/Manifest +++ b/media-libs/rnnoise/Manifest @@ -1 +1 @@ -DIST rnnoise-0.4.1_p20210122.tar.gz 173787 BLAKE2B 33ecee81eb54a00e89c6fc0a2c9a3c66250c853cbef420f6b1fc9f7141b3b9862fe34fb31951de407c8912e940ac7e9917f68cb649261117d729b7b380d3476c SHA512 7d16f7d68a0a28ecdaaea098df5482d55adf7948292cab8ed78ae5cc6652ebdfc48e623f193ee356fcf527e54883e9d3938195f2fd52c20dff895fd2515617f3 +DIST rnnoise-1cbdbcf1283499bbb2230a6b0f126eb9b236defd.tar.bz2 137650 BLAKE2B a129c57116903770c8af2b8e34efc1e718370b9d7c2d211cdebd59b6dcc22bfe736a6a75564cab89a2bc0bb7fdf9e0b08ec02f686e5d42cbcd826b68e46686e4 SHA512 81e47dfe39502d3b5374b19374b2decd124a77dbfaa3dc7391f518a56f6a564100c8cd67d54f25aad10654f8aafab87b14d1950ba6479163af9eea08a69d9948 diff --git a/media-libs/rnnoise/files/rnnoise-0.4.1_p20210122-configure-clang16.patch b/media-libs/rnnoise/files/rnnoise-0.4.1_p20210122-configure-clang16.patch new file mode 100644 index 000000000000..7eb6aef278c9 --- /dev/null +++ b/media-libs/rnnoise/files/rnnoise-0.4.1_p20210122-configure-clang16.patch @@ -0,0 +1,127 @@ +https://gitlab.xiph.org/xiph/rnnoise/-/merge_requests/3 + +From 027d4dae07f6968e63db179b2e4bbe69b0a0da40 Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Tue, 22 Nov 2022 02:59:20 +0000 +Subject: [PATCH 1/2] m4: fix -Wstrict-protoypes + +In preparation for C23. Fixes the following error if Clang 16 is +cranked up to be stricter: +``` +-warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes] ++error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] +``` + +Bug: https://bugs.gentoo.org/879709 +Signed-off-by: Sam James <s...@gentoo.org> +--- a/m4/attributes.m4 ++++ b/m4/attributes.m4 +@@ -39,7 +39,7 @@ AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ + AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])], ++ AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return 0; }])], + [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" +@@ -89,7 +89,7 @@ AC_DEFUN([CC_CHECK_LDFLAGS], [ + AS_TR_SH([cc_cv_ldflags_$1]), + [ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $1" +- AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 1; }])], ++ AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return 1; }])], + [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) + LDFLAGS="$ac_save_LDFLAGS" +@@ -165,16 +165,16 @@ AC_DEFUN([CC_CHECK_ATTRIBUTE], [ + AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ + CC_CHECK_ATTRIBUTE( + [constructor],, +- [extern void foo(); +- void __attribute__((constructor)) ctor() { foo(); }], ++ [extern void foo(void); ++ void __attribute__((constructor)) ctor(void) { foo(); }], + [$1], [$2]) + ]) + + AC_DEFUN([CC_ATTRIBUTE_DESTRUCTOR], [ + CC_CHECK_ATTRIBUTE( + [destructor],, +- [extern void foo(); +- void __attribute__((destructor)) dtor() { foo(); }], ++ [extern void foo(void); ++ void __attribute__((destructor)) dtor(void) { foo(); }], + [$1], [$2]) + ]) + +@@ -195,7 +195,7 @@ AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ + AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ + CC_CHECK_ATTRIBUTE( + [visibility_$1], [visibility("$1")], +- [void __attribute__((visibility("$1"))) $1_function() { }], ++ [void __attribute__((visibility("$1"))) $1_function(void) { }], + [$2], [$3]) + ]) + +@@ -306,7 +306,7 @@ AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ + CFLAGS="$CFLAGS $cc_cv_werror" + for cc_attribute_align_try in 64 32 16 8 4 2; do + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +- int main() { ++ int main(void) { + static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; + return c; + }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) +GitLab +From a1a2194784443e55ad7b194a8d82860a8a25e1a2 Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Tue, 22 Nov 2022 03:30:17 +0000 +Subject: [PATCH 2/2] Fix -Wstrict-prototypes + +In preparation for C23. + +Signed-off-by: Sam James <s...@gentoo.org> +--- a/include/rnnoise.h ++++ b/include/rnnoise.h +@@ -54,12 +54,12 @@ typedef struct RNNModel RNNModel; + /** + * Return the size of DenoiseState + */ +-RNNOISE_EXPORT int rnnoise_get_size(); ++RNNOISE_EXPORT int rnnoise_get_size(void); + + /** + * Return the number of samples processed by rnnoise_process_frame at a time + */ +-RNNOISE_EXPORT int rnnoise_get_frame_size(); ++RNNOISE_EXPORT int rnnoise_get_frame_size(void); + + /** + * Initializes a pre-allocated DenoiseState +--- a/src/denoise.c ++++ b/src/denoise.c +@@ -165,7 +165,7 @@ void interp_band_gain(float *g, const float *bandE) { + + CommonState common; + +-static void check_init() { ++static void check_init(void) { + int i; + if (common.init) return; + common.kfft = opus_fft_alloc_twiddles(2*FRAME_SIZE, NULL, NULL, NULL, 0); +@@ -253,11 +253,11 @@ static void apply_window(float *x) { + } + } + +-int rnnoise_get_size() { ++int rnnoise_get_size(void) { + return sizeof(DenoiseState); + } + +-int rnnoise_get_frame_size() { ++int rnnoise_get_frame_size(void) { + return FRAME_SIZE; + } + +GitLab diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild similarity index 89% rename from media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild rename to media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild index 139b8d63c122..067e715158b7 100644 --- a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild +++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Recurrent neural network for audio noise reduction" HOMEPAGE="https://jmvalin.ca/demo/rnnoise/ https://gitlab.xiph.org/xiph/rnnoise"; COMMIT="1cbdbcf1283499bbb2230a6b0f126eb9b236defd" -SRC_URI="https://gitlab.xiph.org/xiph/rnnoise/-/archive/${COMMIT}/rnnoise-${COMMIT}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://gitlab.xiph.org/xiph/rnnoise/-/archive/${COMMIT}/rnnoise-${COMMIT}.tar.bz2"; S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="BSD" @@ -25,6 +25,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.4.1_p20210122-configure-clang16.patch +) + src_prepare() { default eautoreconf
