From 3be8faef74cb863e207124a6fccbf01ce90c0799 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Sep 2023 16:50:39 +0100 Subject: gentoo auto-resync : 15:09:2023 - 16:50:39 --- media-libs/Manifest.gz | Bin 69170 -> 69171 bytes media-libs/webrtc-audio-processing/Manifest | 3 + ...ric-byte-order-and-pointer-size-detection.patch | 35 +++++++ ...c-audio-processing-0.3-big-endian-support.patch | 103 +++++++++++++++++++++ .../webrtc-audio-processing-0.3.1-r1.ebuild | 36 +++++++ 5 files changed, 177 insertions(+) create mode 100644 media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-Add-generic-byte-order-and-pointer-size-detection.patch create mode 100644 media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-big-endian-support.patch create mode 100644 media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 3d2984dcb193..ddbdb299f4a5 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest index 3e6a02ab99aa..3c20544887bf 100644 --- a/media-libs/webrtc-audio-processing/Manifest +++ b/media-libs/webrtc-audio-processing/Manifest @@ -1,7 +1,10 @@ AUX 1.0-abseil-cmake.patch 2049 BLAKE2B 56f46f78c48efd04203b7c931a1022eacc4ecea6490473e0d5c4198c454ca04da9010f75894da615e38ad65a64ed1c807f97746a3d0293739008920c42b4059f SHA512 2b4718fda6b515637187ea1b247ed016a8177565ab30c1d6472784d52de041af423962a0f16008eca811e1b8762f551929a9ca757a7e54055921b74b5c46c5b3 +AUX webrtc-audio-processing-0.3-Add-generic-byte-order-and-pointer-size-detection.patch 1125 BLAKE2B 5f9935ad20888444ab07cd4758d7ff0705a1fd14ea95c12e95a716cb3aa916ff21f3c6917acb24f8122051876838df9971cbd6936bdae757d55db9da57beed69 SHA512 a6f8ac5d178f2c27c0450c10948352eef5f0f9bb953f27f13904d16f7b6d5047c6ce6f2676f8727ea53aef0d834161da524929e872f18bb30c19dbc67dc35e6e +AUX webrtc-audio-processing-0.3-big-endian-support.patch 3773 BLAKE2B 24170b27885261d397b07e603ed12aaaf5afd28d86150d62d452a78976cd791b7e40606effb4c125a7170784de6ebe7d6487fd1f8de72a6038c8c4a440d2d3c7 SHA512 65e68a26ef8953d901b96f4d48e6f976f8f18d4a48dafe5d065502910c611596b364519761db15187f3eb3c34256e6b237fcb2ae8e9c249e56f744fcf642f600 AUX webrtc-audio-processing-0.3-proper_detection_cxxabi_execinfo.patch 2251 BLAKE2B f534e6f58d86693d257fa653d92ca07db2c1d34b88fda3b112237cff99eed81252f4111d64070f96a4265dc2655896843dbbfa01785ed18c6ea10b0eec74aeb9 SHA512 592345960101a9538c6e1197bc8cb296ca0fb0f8c6b9b64f1f4fd906ae4a9c7e9e92de740bf6e1e38cc4efca7cab8265b59542ffcad5d04bb6f1abb399851f0f DIST webrtc-audio-processing-0.3.1.tar.xz 695920 BLAKE2B 833c6d12b358918d95dee5b165308c8cc382f98264349fd38649bfe478557765b85d9112a35194676ee52a8ef297fb7cb7e3a570d9c2295785b6fb97d35be948 SHA512 1c7a2d16f7f6c03cf6d60405d0dcd224caae6e80c9c4d43f8373bad2446affcdf49a02efb0085387328289aa79c8981dcaedff876cde55be9602dbde9c3f440b DIST webrtc-audio-processing-1.0.tar.gz 856721 BLAKE2B bbf5bee4887ca9929cdc62ded5a9b12563371e75cf1d3e3a3d7c8ccc766cb00bd718bc1ddf96d713a47342694394cc853067fba531c61c7e28e493a4dcdc895f SHA512 fced98beeb58155e86aed9649413e2f28ee6814e711bd57e946ec0db30ddabcc65bbf425b85892f4ad8803e87f0ece9fdde5595948145b90f436c2592da55961 +EBUILD webrtc-audio-processing-0.3.1-r1.ebuild 920 BLAKE2B b3e67c3488d2f9f90d3bee1c001f5aeaaa523e4ffb9b12abb451d86dc331e172f6e9c70f7b0832a237b05040a097d553d670633080d7e467ad008193cd7a596d SHA512 607beee8f25696c4e74af1bed53c6d30da692f395e1cd3fe88d864ae5d3cf16260f5636882a6206632e08e971fc9e9f284981262fa998f17b06e850f96479628 EBUILD webrtc-audio-processing-0.3.1.ebuild 780 BLAKE2B 9f39495c7189d7d35d7d246cd7a635d355b0fc65438c8a187b2529a2f54e1775fdad3fff0d2a61ceab3abdb4550342b007dc5e48758d20feaa8c7877cbb69f35 SHA512 b209145b656265c5b016b8ef2c22cbe3bf031230e6a3a84cdeb785c963c62e7cb4e144440c88c5c7b18d91b1ead8133752da5d40e86e3a015e4147e56f4aa0de EBUILD webrtc-audio-processing-1.0.ebuild 754 BLAKE2B a8aba51d9fe717bed7df8c785fb387414439a5266ef597318c09ede3e1921c654fb36e06f77a0ae7b3f24de6a3b49aff99c9498f9d2367c84b3cb9039e11df72 SHA512 fc790450279e4f2674f97c5bfa6a7721c8bc0491ab09d5e88fa22448364b7e57a00fdb9a5207a9731a9aab6fa300ef912e9d647a44e1d76f799221e6c34ec302 MISC metadata.xml 245 BLAKE2B ab350a90c1ad1c92a5501fc0cc1ebc4e74b4e4cd7ae62d799d0c6252aa2b7870d097491c1652d8802ff3f09d2c32168dc8352925e2e7e634c0765c8e058767ee SHA512 7c8642b6ad51f52af088bfa8d4794519ef6cf59752bf428ba1c6be407b47336a30a7a9a4c6a5a52957efb3f8b695adeaf87ebafa49e61d0b8131b65a2a527afc diff --git a/media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-Add-generic-byte-order-and-pointer-size-detection.patch b/media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-Add-generic-byte-order-and-pointer-size-detection.patch new file mode 100644 index 000000000000..0c4508986e4b --- /dev/null +++ b/media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-Add-generic-byte-order-and-pointer-size-detection.patch @@ -0,0 +1,35 @@ +From: Than +Date: Wed, 8 Jun 2016 19:10:08 -0400 +Subject: Add generic byte order and pointer size detection + +https://sources.debian.org/patches/webrtc-audio-processing/0.3-1/Add-generic-byte-order-and-pointer-size-detection.patch/ +https://bugs.freedesktop.org/show_bug.cgi?id=95738 +--- + webrtc/typedefs.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h +index d875490..dc074f1 100644 +--- a/webrtc/typedefs.h ++++ b/webrtc/typedefs.h +@@ -48,7 +48,19 @@ + #define WEBRTC_ARCH_32_BITS + #define WEBRTC_ARCH_LITTLE_ENDIAN + #else +-#error Please add support for your architecture in typedefs.h ++/* instead of failing, use typical unix defines... */ ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++#define WEBRTC_ARCH_LITTLE_ENDIAN ++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++#define WEBRTC_ARCH_BIG_ENDIAN ++#else ++#error __BYTE_ORDER__ is not defined ++#endif ++#if defined(__LP64__) ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif + #endif + + #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN)) diff --git a/media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-big-endian-support.patch b/media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-big-endian-support.patch new file mode 100644 index 000000000000..34f27dd70484 --- /dev/null +++ b/media-libs/webrtc-audio-processing/files/webrtc-audio-processing-0.3-big-endian-support.patch @@ -0,0 +1,103 @@ +From: Than +Date: Mon, 6 Jun 2016 12:08:58 -0400 +Subject: big endian support + +https://sources.debian.org/patches/webrtc-audio-processing/0.3-1/big-endian-support.patch/ +https://bugs.freedesktop.org/show_bug.cgi?id=95738 +--- + webrtc/common_audio/wav_file.cc | 20 +++++++++++++++----- + webrtc/common_audio/wav_header.cc | 34 +++++++++++++++++++++++++++++++++- + 2 files changed, 48 insertions(+), 6 deletions(-) + +diff --git a/webrtc/common_audio/wav_file.cc b/webrtc/common_audio/wav_file.cc +index b14b620..05fa052 100644 +--- a/webrtc/common_audio/wav_file.cc ++++ b/webrtc/common_audio/wav_file.cc +@@ -64,9 +64,6 @@ WavReader::~WavReader() { + } + + size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) { +-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Need to convert samples to big-endian when reading from WAV file" +-#endif + // There could be metadata after the audio; ensure we don't read it. + num_samples = std::min(rtc::checked_cast(num_samples), + num_samples_remaining_); +@@ -76,6 +73,12 @@ size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) { + RTC_CHECK(read == num_samples || feof(file_handle_)); + RTC_CHECK_LE(read, num_samples_remaining_); + num_samples_remaining_ -= rtc::checked_cast(read); ++#ifndef WEBRTC_ARCH_LITTLE_ENDIAN ++ //convert to big-endian ++ for(size_t idx = 0; idx < num_samples; idx++) { ++ samples[idx] = (samples[idx]<<8) | (samples[idx]>>8); ++ } ++#endif + return read; + } + +@@ -120,10 +123,17 @@ WavWriter::~WavWriter() { + + void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) { + #ifndef WEBRTC_ARCH_LITTLE_ENDIAN +-#error "Need to convert samples to little-endian when writing to WAV file" +-#endif ++ int16_t * le_samples = new int16_t[num_samples]; ++ for(size_t idx = 0; idx < num_samples; idx++) { ++ le_samples[idx] = (samples[idx]<<8) | (samples[idx]>>8); ++ } ++ const size_t written = ++ fwrite(le_samples, sizeof(*le_samples), num_samples, file_handle_); ++ delete []le_samples; ++#else + const size_t written = + fwrite(samples, sizeof(*samples), num_samples, file_handle_); ++#endif + RTC_CHECK_EQ(num_samples, written); + num_samples_ += static_cast(written); + RTC_CHECK(written <= std::numeric_limits::max() || +diff --git a/webrtc/common_audio/wav_header.cc b/webrtc/common_audio/wav_header.cc +index 61cfffe..53882ff 100644 +--- a/webrtc/common_audio/wav_header.cc ++++ b/webrtc/common_audio/wav_header.cc +@@ -129,7 +129,39 @@ static inline std::string ReadFourCC(uint32_t x) { + return std::string(reinterpret_cast(&x), 4); + } + #else +-#error "Write be-to-le conversion functions" ++static inline void WriteLE16(uint16_t* f, uint16_t x) { ++ *f = ((x << 8) & 0xff00) | ( ( x >> 8) & 0x00ff); ++} ++ ++static inline void WriteLE32(uint32_t* f, uint32_t x) { ++ *f = ( (x & 0x000000ff) << 24 ) ++ | ((x & 0x0000ff00) << 8) ++ | ((x & 0x00ff0000) >> 8) ++ | ((x & 0xff000000) >> 24 ); ++} ++ ++static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) { ++ *f = (static_cast(a) << 24 ) ++ | (static_cast(b) << 16) ++ | (static_cast(c) << 8) ++ | (static_cast(d) ); ++} ++ ++static inline uint16_t ReadLE16(uint16_t x) { ++ return (( x & 0x00ff) << 8 )| ((x & 0xff00)>>8); ++} ++ ++static inline uint32_t ReadLE32(uint32_t x) { ++ return ( (x & 0x000000ff) << 24 ) ++ | ( (x & 0x0000ff00) << 8 ) ++ | ( (x & 0x00ff0000) >> 8) ++ | ( (x & 0xff000000) >> 24 ); ++} ++ ++static inline std::string ReadFourCC(uint32_t x) { ++ x = ReadLE32(x); ++ return std::string(reinterpret_cast(&x), 4); ++} + #endif + + static inline uint32_t RiffChunkSize(uint32_t bytes_in_payload) { diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild new file mode 100644 index 000000000000..946115a3b322 --- /dev/null +++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="AudioProcessing library from the webrtc.org code base" +HOMEPAGE="https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/" +SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux" +IUSE="static-libs" + +DOCS=( AUTHORS NEWS README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.3-proper_detection_cxxabi_execinfo.patch + "${FILESDIR}"/${PN}-0.3-Add-generic-byte-order-and-pointer-size-detection.patch + "${FILESDIR}"/${PN}-0.3-big-endian-support.patch +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die +} -- cgit v1.2.3