From 13ec12ad28bc2ce6e2902be1d571befcca2b3f60 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Nov 2022 07:05:54 +0000 Subject: gentoo auto-resync : 22:11:2022 - 07:05:54 --- media-libs/rnnoise/Manifest | 5 +- ...rnnoise-0.4.1_p20210122-configure-clang16.patch | 127 +++++++++++++++++++++ .../rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild | 49 ++++++++ media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild | 45 -------- 4 files changed, 179 insertions(+), 47 deletions(-) create mode 100644 media-libs/rnnoise/files/rnnoise-0.4.1_p20210122-configure-clang16.patch create mode 100644 media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild delete mode 100644 media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild (limited to 'media-libs/rnnoise') diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest index e8978891e58d..dd26d326294b 100644 --- a/media-libs/rnnoise/Manifest +++ b/media-libs/rnnoise/Manifest @@ -1,3 +1,4 @@ -DIST rnnoise-0.4.1_p20210122.tar.gz 173787 BLAKE2B 33ecee81eb54a00e89c6fc0a2c9a3c66250c853cbef420f6b1fc9f7141b3b9862fe34fb31951de407c8912e940ac7e9917f68cb649261117d729b7b380d3476c SHA512 7d16f7d68a0a28ecdaaea098df5482d55adf7948292cab8ed78ae5cc6652ebdfc48e623f193ee356fcf527e54883e9d3938195f2fd52c20dff895fd2515617f3 -EBUILD rnnoise-0.4.1_p20210122.ebuild 948 BLAKE2B db946beb0c2979294a74f3938880a11042baaf3c492be1f3c9267c82e2356ebf3d9d98a1fc8b55422665c7c202edad5242e56af4b588a223a6218fedc6d7e599 SHA512 facc64aea073e1b7cd72e86c9731eaa7c842a45f30ecc0485ec04c913f411308c2dce665c84ff60e48d46da004da26ea6e95ec764fd8be8347d91e25394e8417 +AUX rnnoise-0.4.1_p20210122-configure-clang16.patch 4220 BLAKE2B b1ca6538b4210a82e5aa5193e4f91b17e3319d503fec45b7d8d1b4d2082133779ebfb1a045efc39702bfcd7d2c1f41375642cd938d8a401d757f57a2b6e87e79 SHA512 64f798f98113caf78b45d96264f3b072f8275e174c67f93a9994916c7066b6644a8f89d41a33aa679b28412cf394499963b66ea90895afc38c37487695fc5166 +DIST rnnoise-1cbdbcf1283499bbb2230a6b0f126eb9b236defd.tar.bz2 137650 BLAKE2B a129c57116903770c8af2b8e34efc1e718370b9d7c2d211cdebd59b6dcc22bfe736a6a75564cab89a2bc0bb7fdf9e0b08ec02f686e5d42cbcd826b68e46686e4 SHA512 81e47dfe39502d3b5374b19374b2decd124a77dbfaa3dc7391f518a56f6a564100c8cd67d54f25aad10654f8aafab87b14d1950ba6479163af9eea08a69d9948 +EBUILD rnnoise-0.4.1_p20210122-r1.ebuild 1008 BLAKE2B 319b8de8dfa2f213c5b4989278824355f7a30c2a4c92d0bcfcef13eec373681dcae6fb6e076cbae8ff7793393976081d3e3f2cbf817a7d187522268feaa1d6b0 SHA512 86185035800097024d4898cffb078f6e2551117ecd56ac6bdc9579f5a4bb3c0db3be179ba4859cb82362f2662550422117f09492508b8266fa5e169d7de2d7ff MISC metadata.xml 410 BLAKE2B 4bb73f9210c791887bf87b9d6476c339ed077d8a9e2cca19a7c96fdd6634dd7217cd96e196dd52f112f79ae88b320651fa91ed7f3b13a7db1a5ae6fb4fa2f1ad SHA512 ee72d3f004691ec17c5c5b95e5c602757a4679d7eb92d31afb1394adf34b758829ea2d1fb049d25a7db24247331e58c22ccb322421fe956ec843c65f7ddc612e 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 +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 +--- 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 +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 +--- 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-r1.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild new file mode 100644 index 000000000000..067e715158b7 --- /dev/null +++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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.bz2" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc" +# NOTE: Documentation currently empty (version 0.4.1_p20210122) + +BDEPEND=" + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.1_p20210122-configure-clang16.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-examples + $(use_enable doc) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + rm "${ED}/usr/share/doc/${PF}/COPYING" || die + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild deleted file mode 100644 index 139b8d63c122..000000000000 --- a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -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" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="doc" -# NOTE: Documentation currently empty (version 0.4.1_p20210122) - -BDEPEND=" - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-examples - $(use_enable doc) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - rm "${ED}/usr/share/doc/${PF}/COPYING" || die - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3