* [PR PATCH] [Nomerge - Help wanted] Webrtc
@ 2021-03-30 19:34 FollieHiyuki
2021-03-31 18:29 ` [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0 abenson
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: FollieHiyuki @ 2021-03-30 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]
There is a new pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages webrtc
https://github.com/void-linux/void-packages/pull/29892
[Nomerge - Help wanted] Webrtc
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Just put the propose so that someone else can pick this up.
A patch file from https://github.com/void-linux/void-packages/pull/29892.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webrtc-29892.patch --]
[-- Type: text/x-diff, Size: 10379 bytes --]
From d14081410bfb9e300158e852ac1b3c1eb14cb5af Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 10 Mar 2021 03:58:23 +0300
Subject: [PATCH 1/2] New package: abseil-cpp-20200923.3
---
srcpkgs/abseil-cpp/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/abseil-cpp/template
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
new file mode 100644
index 000000000000..9b595a45e0ed
--- /dev/null
+++ b/srcpkgs/abseil-cpp/template
@@ -0,0 +1,11 @@
+# Template file for 'abseil-cpp'
+pkgname=abseil-cpp
+version=20200923.3
+revision=1
+build_style=cmake
+short_desc="Common Abseil libraries for C++"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="Apache-2.0"
+homepage="https://abseil.io/"
+distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
+checksum=ebe2ad1480d27383e4bf4211e2ca2ef312d5e6a09eba869fd2e8a5c5d553ded2
From 212f43d7a0f4debfe8bda26c0e1fa987642fc320 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 10 Mar 2021 04:15:31 +0300
Subject: [PATCH 2/2] webrtc-audio-processing: update to 1.0
---
...yte-order-and-pointer-size-detection.patch | 33 -----
.../patches/mips.patch | 113 ------------------
.../patches/musl.patch | 20 ----
srcpkgs/webrtc-audio-processing/template | 22 +---
4 files changed, 5 insertions(+), 183 deletions(-)
delete mode 100644 srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch
delete mode 100644 srcpkgs/webrtc-audio-processing/patches/mips.patch
delete mode 100644 srcpkgs/webrtc-audio-processing/patches/musl.patch
diff --git a/srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch b/srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch
deleted file mode 100644
index 1338784e69ef..000000000000
--- a/srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Than <than@redhat.com>
-Date: Wed, 8 Jun 2016 19:10:08 -0400
-Subject: Add generic byte order and pointer size detection
-
----
- 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/srcpkgs/webrtc-audio-processing/patches/mips.patch b/srcpkgs/webrtc-audio-processing/patches/mips.patch
deleted file mode 100644
index c99aaf392208..000000000000
--- a/srcpkgs/webrtc-audio-processing/patches/mips.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- webrtc-audio-processing-0.3_3/configure.ac 2017-11-22 20:26:54.207009881 +0100
-+++ webrtc-audio-processing-0.3_3/configure.ac 2017-11-22 20:37:57.472996521 +0100
-@@ -90,10 +90,14 @@
- [HAVE_NEON=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64"])
- AC_CHECK_DECLS([__i386__], [HAVE_X86=1])
- AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1])
-+AC_CHECK_DECLS([__MIPSEB__], [HAVE_MIPSEB=1])
-+AC_CHECK_DECLS([__MIPSEL__], [HAVE_MIPSEL=1])
-
- AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"])
- AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"])
- AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"])
-+AM_CONDITIONAL(HAVE_MIPSEB, [test "x${HAVE_MIPSEB}" = "x1"])
-+AM_CONDITIONAL(HAVE_MIPSEL, [test "x${HAVE_MIPSEL}" = "x1"])
-
- # Borrowed from pulseaudio's configure.ac
- AC_ARG_ENABLE([neon],
---- webrtc-audio-processing-0.3_3/webrtc/typedefs.h 2015-10-15 12:48:25.000000000 +0200
-+++ webrtc-audio-processing-0.3_3/webrtc/typedefs.h 2017-11-22 20:39:20.800994843 +0100
-@@ -47,6 +47,10 @@
- #elif defined(__pnacl__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__MIPSEL__)
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__MIPSEB__)
-+#define WEBRTC_ARCH_BIG_ENDIAN
- #else
- #error Please add support for your architecture in typedefs.h
- #endif
---- webrtc-audio-processing-0.3/webrtc/common_audio/wav_file.cc 2015-11-19 13:41:44.000000000 +0100
-+++ webrtc-audio-processing-0.3/webrtc/common_audio/wav_file.cc 2017-11-22 21:01:46.554967737 +0100
-@@ -64,9 +64,6 @@
- }
-
- 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<uint32_t>(num_samples),
- num_samples_remaining_);
-@@ -76,6 +73,12 @@
- RTC_CHECK(read == num_samples || feof(file_handle_));
- RTC_CHECK_LE(read, num_samples_remaining_);
- num_samples_remaining_ -= rtc::checked_cast<uint32_t>(read);
-+#ifdef WEBRTC_ARCH_BIG_ENDIAN
-+ for (size_t i = 0; i < read; i++) {
-+ uint16_t s = static_cast<uint16_t>(samples[i]);
-+ samples[i] = static_cast<int16_t>((s >> 8) | (s << 8));
-+ }
-+#endif
- return read;
- }
-
-@@ -119,11 +122,20 @@
- }
-
- 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
-+#ifdef WEBRTC_ARCH_LITTLE_ENDIAN
- const size_t written =
- fwrite(samples, sizeof(*samples), num_samples, file_handle_);
-+#else
-+ size_t written = 0;
-+ for (size_t i = 0; i < num_samples; i++) {
-+ uint16_t s = static_cast<uint16_t>(samples[i]);
-+ s = static_cast<int16_t>((s<<8) | (s>>8));
-+ size_t size = fwrite(&s, sizeof(s), 1, file_handle_);
-+ if (size < 1)
-+ break;
-+ written += size;
-+ }
-+#endif
- RTC_CHECK_EQ(num_samples, written);
- num_samples_ += static_cast<uint32_t>(written);
- RTC_CHECK(written <= std::numeric_limits<uint32_t>::max() ||
---- webrtc-audio-processing-0.3/webrtc/common_audio/wav_header.cc 2015-10-15 12:48:44.000000000 +0200
-+++ webrtc-audio-processing-0.3/webrtc/common_audio/wav_header.cc 2017-11-22 21:11:36.291955859 +0100
-@@ -129,7 +129,30 @@
- return std::string(reinterpret_cast<char*>(&x), 4);
- }
- #else
--#error "Write be-to-le conversion functions"
-+static inline void WriteLE16(uint16_t* f, uint16_t x) { *f = (x >> 8) | (x << 8); }
-+static inline void WriteLE32(uint32_t* f, uint32_t x) {
-+ *f = ((x & 0xff000000) >> 24) |
-+ ((x & 0x00ff0000) >> 8) |
-+ ((x & 0x0000ff00) << 8) |
-+ ((x & 0x000000ff) << 24);
-+}
-+static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
-+ *f = (static_cast<uint32_t>(a) << 24)
-+ | (static_cast<uint32_t>(b) << 16)
-+ | (static_cast<uint32_t>(c) << 8)
-+ | static_cast<uint32_t>(d);
-+}
-+static inline uint16_t ReadLE16(uint16_t x) { return (x >> 8) | (x << 8); }
-+static inline uint32_t ReadLE32(uint32_t x) {
-+ return ((x << 24) & 0xff000000) |
-+ ((x << 8) & 0x00ff0000) |
-+ ((x >> 8) & 0x0000ff00) |
-+ ((x >> 24) & 0x000000ff);
-+}
-+static inline std::string ReadFourCC(uint32_t x) {
-+ uint32_t s = ReadLE32(x);
-+ return std::string(reinterpret_cast<char*>(&s), 4);
-+}
- #endif
-
- static inline uint32_t RiffChunkSize(uint32_t bytes_in_payload) {
diff --git a/srcpkgs/webrtc-audio-processing/patches/musl.patch b/srcpkgs/webrtc-audio-processing/patches/musl.patch
deleted file mode 100644
index adca79b6b748..000000000000
--- a/srcpkgs/webrtc-audio-processing/patches/musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/webrtc/base/checks.cc.orig 2016-06-25 07:47:34.099515548 +0200
-+++ b/webrtc/base/checks.cc 2016-06-25 07:48:28.554122463 +0200
-@@ -16,7 +16,7 @@
- #include <cstdio>
- #include <cstdlib>
-
--#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && defined(__GLIBCXX__)
- #include <cxxabi.h>
- #include <execinfo.h>
- #endif
-@@ -55,7 +55,7 @@ void PrintError(const char* format, ...)
- // to get usable symbols on Linux. This is copied from V8. Chromium has a more
- // advanced stace trace system; also more difficult to copy.
- void DumpBacktrace() {
--#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && defined(__GLIBCXX__)
- void* trace[100];
- int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
- char** symbols = backtrace_symbols(trace, size);
diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template
index e85bb18e1f68..599522dafbec 100644
--- a/srcpkgs/webrtc-audio-processing/template
+++ b/srcpkgs/webrtc-audio-processing/template
@@ -1,27 +1,15 @@
# Template file for 'webrtc-audio-processing'
pkgname=webrtc-audio-processing
-version=0.3.1
+version=1.0
revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool"
+build_style=meson
+makedepends="abseil-cpp"
short_desc="AudioProcessing library based on Google's implementation of WebRTC"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf
-patch_args="-p1"
-
-case "$XBPS_TARGET_MACHINE" in
- # Disable neon for the arm* architectures
- arm*) configure_args+=" --enable-neon=no" ;;
-esac
-
-pre_configure() {
- # Remove failing statement PKG_CHECK_MODULE(GNUSTL, gnustl)
- sed -i configure.ac -e'/if test "x$with_gnustl" != "xno"; then/,+2d'
- autoreconf -fi
-}
+distfiles="${homepage}/${pkgname}-${version}.tar.gz"
+checksum=441a30d2717b2eb4145c6eb96c2d5a270fe0b4bc71aebf76716750c47be1936f
post_install() {
vlicense COPYING
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
@ 2021-03-31 18:29 ` abenson
2021-03-31 18:30 ` abenson
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2021-03-31 18:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/29892#discussion_r605128485
Comment:
20210324.0 is out
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
2021-03-31 18:29 ` [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0 abenson
@ 2021-03-31 18:30 ` abenson
2021-03-31 18:58 ` abenson
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2021-03-31 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/29892#discussion_r605129159
Comment:
pre_configure() {
vsed -e 's/absl_flags_registry/absl_flags_reflection/' -i meson.build
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
2021-03-31 18:29 ` [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0 abenson
2021-03-31 18:30 ` abenson
@ 2021-03-31 18:58 ` abenson
2021-03-31 19:18 ` abenson
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2021-03-31 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/29892#discussion_r605146036
Comment:
`configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE=ON"`
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
` (2 preceding siblings ...)
2021-03-31 18:58 ` abenson
@ 2021-03-31 19:18 ` abenson
2021-03-31 19:39 ` [PR PATCH] [Updated] " FollieHiyuki
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: abenson @ 2021-03-31 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/29892#discussion_r605146036
Comment:
`configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_STANDARD=17"`
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
` (3 preceding siblings ...)
2021-03-31 19:18 ` abenson
@ 2021-03-31 19:39 ` FollieHiyuki
2021-03-31 19:40 ` FollieHiyuki
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: FollieHiyuki @ 2021-03-31 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages webrtc
https://github.com/void-linux/void-packages/pull/29892
[Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Just put the propose so that someone else can pick this up.
A patch file from https://github.com/void-linux/void-packages/pull/29892.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webrtc-29892.patch --]
[-- Type: text/x-diff, Size: 10512 bytes --]
From 6661985011300d19a65ba7cf92b93c06f9fc9177 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 10 Mar 2021 03:58:23 +0300
Subject: [PATCH 1/2] New package: abseil-cpp-20210324.0
---
srcpkgs/abseil-cpp/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/abseil-cpp/template
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
new file mode 100644
index 000000000000..da771cbd216e
--- /dev/null
+++ b/srcpkgs/abseil-cpp/template
@@ -0,0 +1,12 @@
+# Template file for 'abseil-cpp'
+pkgname=abseil-cpp
+version=20210324.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_STANDARD=17"
+short_desc="Common Abseil libraries for C++"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="Apache-2.0"
+homepage="https://abseil.io/"
+distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
+checksum=dd7db6815204c2a62a2160e32c55e97113b0a0178b2f090d6bab5ce36111db4b
From 8f4c1eebf1f4902b4d43bf0e5463bd7594252df7 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 10 Mar 2021 04:15:31 +0300
Subject: [PATCH 2/2] webrtc-audio-processing: update to 1.0
---
...yte-order-and-pointer-size-detection.patch | 33 -----
.../patches/mips.patch | 113 ------------------
.../patches/musl.patch | 20 ----
srcpkgs/webrtc-audio-processing/template | 20 +---
4 files changed, 6 insertions(+), 180 deletions(-)
delete mode 100644 srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch
delete mode 100644 srcpkgs/webrtc-audio-processing/patches/mips.patch
delete mode 100644 srcpkgs/webrtc-audio-processing/patches/musl.patch
diff --git a/srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch b/srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch
deleted file mode 100644
index 1338784e69ef..000000000000
--- a/srcpkgs/webrtc-audio-processing/patches/Add-generic-byte-order-and-pointer-size-detection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Than <than@redhat.com>
-Date: Wed, 8 Jun 2016 19:10:08 -0400
-Subject: Add generic byte order and pointer size detection
-
----
- 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/srcpkgs/webrtc-audio-processing/patches/mips.patch b/srcpkgs/webrtc-audio-processing/patches/mips.patch
deleted file mode 100644
index c99aaf392208..000000000000
--- a/srcpkgs/webrtc-audio-processing/patches/mips.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- webrtc-audio-processing-0.3_3/configure.ac 2017-11-22 20:26:54.207009881 +0100
-+++ webrtc-audio-processing-0.3_3/configure.ac 2017-11-22 20:37:57.472996521 +0100
-@@ -90,10 +90,14 @@
- [HAVE_NEON=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64"])
- AC_CHECK_DECLS([__i386__], [HAVE_X86=1])
- AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1])
-+AC_CHECK_DECLS([__MIPSEB__], [HAVE_MIPSEB=1])
-+AC_CHECK_DECLS([__MIPSEL__], [HAVE_MIPSEL=1])
-
- AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"])
- AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"])
- AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"])
-+AM_CONDITIONAL(HAVE_MIPSEB, [test "x${HAVE_MIPSEB}" = "x1"])
-+AM_CONDITIONAL(HAVE_MIPSEL, [test "x${HAVE_MIPSEL}" = "x1"])
-
- # Borrowed from pulseaudio's configure.ac
- AC_ARG_ENABLE([neon],
---- webrtc-audio-processing-0.3_3/webrtc/typedefs.h 2015-10-15 12:48:25.000000000 +0200
-+++ webrtc-audio-processing-0.3_3/webrtc/typedefs.h 2017-11-22 20:39:20.800994843 +0100
-@@ -47,6 +47,10 @@
- #elif defined(__pnacl__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__MIPSEL__)
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__MIPSEB__)
-+#define WEBRTC_ARCH_BIG_ENDIAN
- #else
- #error Please add support for your architecture in typedefs.h
- #endif
---- webrtc-audio-processing-0.3/webrtc/common_audio/wav_file.cc 2015-11-19 13:41:44.000000000 +0100
-+++ webrtc-audio-processing-0.3/webrtc/common_audio/wav_file.cc 2017-11-22 21:01:46.554967737 +0100
-@@ -64,9 +64,6 @@
- }
-
- 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<uint32_t>(num_samples),
- num_samples_remaining_);
-@@ -76,6 +73,12 @@
- RTC_CHECK(read == num_samples || feof(file_handle_));
- RTC_CHECK_LE(read, num_samples_remaining_);
- num_samples_remaining_ -= rtc::checked_cast<uint32_t>(read);
-+#ifdef WEBRTC_ARCH_BIG_ENDIAN
-+ for (size_t i = 0; i < read; i++) {
-+ uint16_t s = static_cast<uint16_t>(samples[i]);
-+ samples[i] = static_cast<int16_t>((s >> 8) | (s << 8));
-+ }
-+#endif
- return read;
- }
-
-@@ -119,11 +122,20 @@
- }
-
- 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
-+#ifdef WEBRTC_ARCH_LITTLE_ENDIAN
- const size_t written =
- fwrite(samples, sizeof(*samples), num_samples, file_handle_);
-+#else
-+ size_t written = 0;
-+ for (size_t i = 0; i < num_samples; i++) {
-+ uint16_t s = static_cast<uint16_t>(samples[i]);
-+ s = static_cast<int16_t>((s<<8) | (s>>8));
-+ size_t size = fwrite(&s, sizeof(s), 1, file_handle_);
-+ if (size < 1)
-+ break;
-+ written += size;
-+ }
-+#endif
- RTC_CHECK_EQ(num_samples, written);
- num_samples_ += static_cast<uint32_t>(written);
- RTC_CHECK(written <= std::numeric_limits<uint32_t>::max() ||
---- webrtc-audio-processing-0.3/webrtc/common_audio/wav_header.cc 2015-10-15 12:48:44.000000000 +0200
-+++ webrtc-audio-processing-0.3/webrtc/common_audio/wav_header.cc 2017-11-22 21:11:36.291955859 +0100
-@@ -129,7 +129,30 @@
- return std::string(reinterpret_cast<char*>(&x), 4);
- }
- #else
--#error "Write be-to-le conversion functions"
-+static inline void WriteLE16(uint16_t* f, uint16_t x) { *f = (x >> 8) | (x << 8); }
-+static inline void WriteLE32(uint32_t* f, uint32_t x) {
-+ *f = ((x & 0xff000000) >> 24) |
-+ ((x & 0x00ff0000) >> 8) |
-+ ((x & 0x0000ff00) << 8) |
-+ ((x & 0x000000ff) << 24);
-+}
-+static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
-+ *f = (static_cast<uint32_t>(a) << 24)
-+ | (static_cast<uint32_t>(b) << 16)
-+ | (static_cast<uint32_t>(c) << 8)
-+ | static_cast<uint32_t>(d);
-+}
-+static inline uint16_t ReadLE16(uint16_t x) { return (x >> 8) | (x << 8); }
-+static inline uint32_t ReadLE32(uint32_t x) {
-+ return ((x << 24) & 0xff000000) |
-+ ((x << 8) & 0x00ff0000) |
-+ ((x >> 8) & 0x0000ff00) |
-+ ((x >> 24) & 0x000000ff);
-+}
-+static inline std::string ReadFourCC(uint32_t x) {
-+ uint32_t s = ReadLE32(x);
-+ return std::string(reinterpret_cast<char*>(&s), 4);
-+}
- #endif
-
- static inline uint32_t RiffChunkSize(uint32_t bytes_in_payload) {
diff --git a/srcpkgs/webrtc-audio-processing/patches/musl.patch b/srcpkgs/webrtc-audio-processing/patches/musl.patch
deleted file mode 100644
index adca79b6b748..000000000000
--- a/srcpkgs/webrtc-audio-processing/patches/musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/webrtc/base/checks.cc.orig 2016-06-25 07:47:34.099515548 +0200
-+++ b/webrtc/base/checks.cc 2016-06-25 07:48:28.554122463 +0200
-@@ -16,7 +16,7 @@
- #include <cstdio>
- #include <cstdlib>
-
--#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && defined(__GLIBCXX__)
- #include <cxxabi.h>
- #include <execinfo.h>
- #endif
-@@ -55,7 +55,7 @@ void PrintError(const char* format, ...)
- // to get usable symbols on Linux. This is copied from V8. Chromium has a more
- // advanced stace trace system; also more difficult to copy.
- void DumpBacktrace() {
--#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && defined(__GLIBCXX__)
- void* trace[100];
- int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
- char** symbols = backtrace_symbols(trace, size);
diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template
index e85bb18e1f68..8c65baad00a1 100644
--- a/srcpkgs/webrtc-audio-processing/template
+++ b/srcpkgs/webrtc-audio-processing/template
@@ -1,26 +1,18 @@
# Template file for 'webrtc-audio-processing'
pkgname=webrtc-audio-processing
-version=0.3.1
+version=1.0
revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool"
+build_style=meson
+makedepends="abseil-cpp"
short_desc="AudioProcessing library based on Google's implementation of WebRTC"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf
-patch_args="-p1"
-
-case "$XBPS_TARGET_MACHINE" in
- # Disable neon for the arm* architectures
- arm*) configure_args+=" --enable-neon=no" ;;
-esac
+distfiles="${homepage}/${pkgname}-${version}.tar.gz"
+checksum=441a30d2717b2eb4145c6eb96c2d5a270fe0b4bc71aebf76716750c47be1936f
pre_configure() {
- # Remove failing statement PKG_CHECK_MODULE(GNUSTL, gnustl)
- sed -i configure.ac -e'/if test "x$with_gnustl" != "xno"; then/,+2d'
- autoreconf -fi
+ vsed -e 's/absl_flags_registry/absl_flags_reflection/' -i meson.build
}
post_install() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
` (4 preceding siblings ...)
2021-03-31 19:39 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-03-31 19:40 ` FollieHiyuki
2022-05-16 2:08 ` github-actions
2022-05-30 2:14 ` [PR PATCH] [Closed]: " github-actions
7 siblings, 0 replies; 9+ messages in thread
From: FollieHiyuki @ 2021-03-31 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/29892#issuecomment-811388414
Comment:
Thanks for pointing out. The build still fails though.
@abenson would you like to take over? I don't use this package so not keen on maintaining, and I know nothing about Cmake
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
` (5 preceding siblings ...)
2021-03-31 19:40 ` FollieHiyuki
@ 2022-05-16 2:08 ` github-actions
2022-05-30 2:14 ` [PR PATCH] [Closed]: " github-actions
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-05-16 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/29892#issuecomment-1127140493
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
` (6 preceding siblings ...)
2022-05-16 2:08 ` github-actions
@ 2022-05-30 2:14 ` github-actions
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-05-30 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
There's a closed pull request on the void-packages repository
[Nomerge - Help wanted] webrtc-audio-processing: update to 1.0
https://github.com/void-linux/void-packages/pull/29892
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Just put the propose so that someone else can pick this up.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-05-30 2:14 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30 19:34 [PR PATCH] [Nomerge - Help wanted] Webrtc FollieHiyuki
2021-03-31 18:29 ` [PR REVIEW] [Nomerge - Help wanted] webrtc-audio-processing: update to 1.0 abenson
2021-03-31 18:30 ` abenson
2021-03-31 18:58 ` abenson
2021-03-31 19:18 ` abenson
2021-03-31 19:39 ` [PR PATCH] [Updated] " FollieHiyuki
2021-03-31 19:40 ` FollieHiyuki
2022-05-16 2:08 ` github-actions
2022-05-30 2:14 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).