summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorArun Raghavan <arun@asymptotic.io>2023-09-01 17:38:55 -0400
committerArun Raghavan <arun@asymptotic.io>2023-09-05 11:29:14 -0400
commitfb25ddb4dd514be69f52bddb5e1352967397e41d (patch)
treeb6d3505a638cbc9a7d8d67ed4186f3b03d939d7b /recipes
parent5d1da02afc57af6e1d44c7e3543fd5181cdb7fcd (diff)
webrtc-audio-processing: Bump to version 1.3
Includes a patch we were shipping plus marks abseil-cpp as an explicit dep. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1261>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/webrtc-audio-processing.recipe6
-rw-r--r--recipes/webrtc-audio-processing/0001-meson-Update-to-latest-wrap-install-required-absl-he.patch134
2 files changed, 2 insertions, 138 deletions
diff --git a/recipes/webrtc-audio-processing.recipe b/recipes/webrtc-audio-processing.recipe
index 6d5767f0..d144286b 100644
--- a/recipes/webrtc-audio-processing.recipe
+++ b/recipes/webrtc-audio-processing.recipe
@@ -5,12 +5,12 @@ from cerbero.tools.libtool import LibtoolLibrary
class Recipe(recipe.Recipe):
name = 'webrtc-audio-processing'
- version = '1.1'
+ version = '1.3'
licenses = [{License.BSD_like: ['COPYING']}]
btype = BuildType.MESON
stype = SourceType.TARBALL
url = 'https://freedesktop.org/software/pulseaudio/%(name)s/%(name)s-%(version)s.tar.gz'
- tarball_checksum = '59b3d47aedd32dd6fe4836478499ebb7c5bcad815f14dccddbbd70e752a99e5f'
+ tarball_checksum = '95552fc17faa0202133707bbb3727e8c2cf64d4266fe31bfdb2298d769c1db75'
# webrtc-audio-processing links to abseil statically
meson_subprojects = ['abseil-cpp']
@@ -25,8 +25,6 @@ class Recipe(recipe.Recipe):
'%(libdir)s/pkgconfig/webrtc-audio-processing-1.pc',
]
- patches = [name + '/0001-meson-Update-to-latest-wrap-install-required-absl-he.patch']
-
def prepare(self):
if self.config.target_platform == Platform.ANDROID:
# TODO add --enable-neon=runtime, there is a conflict with cerbero
diff --git a/recipes/webrtc-audio-processing/0001-meson-Update-to-latest-wrap-install-required-absl-he.patch b/recipes/webrtc-audio-processing/0001-meson-Update-to-latest-wrap-install-required-absl-he.patch
deleted file mode 100644
index bdf7e422..00000000
--- a/recipes/webrtc-audio-processing/0001-meson-Update-to-latest-wrap-install-required-absl-he.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From a3c06c8e61bc8e5f36ad92c9090cb639c1aaa049 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@centricular.com>
-Date: Wed, 31 May 2023 01:36:37 +0530
-Subject: [PATCH] meson: Update to latest wrap, install required absl headers
-
----
- meson.build | 15 ++++++--
- subprojects/abseil-cpp.wrap | 68 ++++++++++++++++++++++++++++++++++---
- 2 files changed, 76 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 9529a1b..dfaf80f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -59,14 +59,25 @@ absl_dep = [
- dependency('absl_flags'),
- dependency('absl_strings'),
- dependency('absl_synchronization'),
-+ dependency('absl_bad_optional_access'),
- ]
-
-+if absl_dep[0].type_name() == 'internal'
-+ absl_subproj = subproject('abseil-cpp')
-+ headers = [
-+ absl_subproj.get_variable('absl_base_headers'),
-+ absl_subproj.get_variable('absl_flags_headers'),
-+ absl_subproj.get_variable('absl_strings_headers'),
-+ absl_subproj.get_variable('absl_synchronization_headers'),
-+ absl_subproj.get_variable('absl_types_headers'),
-+ ]
-+ install_headers(headers, preserve_path: true)
-+endif
-+
- if ['darwin', 'ios'].contains(host_system)
- os_cflags = ['-DWEBRTC_MAC']
- if host_system == 'ios'
- os_cflags += ['-DWEBRTC_IOS']
-- # For absl_bad_optional_access
-- absl_dep += [dependency('absl_types')]
- endif
- have_posix = true
- elif host_system == 'android'
-diff --git a/subprojects/abseil-cpp.wrap b/subprojects/abseil-cpp.wrap
-index 717b1e8..b2d6222 100644
---- a/subprojects/abseil-cpp.wrap
-+++ b/subprojects/abseil-cpp.wrap
-@@ -3,11 +3,11 @@ directory = abseil-cpp-20230125.1
- source_url = https://github.com/abseil/abseil-cpp/archive/20230125.1.tar.gz
- source_filename = abseil-cpp-20230125.1.tar.gz
- source_hash = 81311c17599b3712069ded20cca09a62ab0bf2a89dfa16993786c8782b7ed145
--patch_filename = abseil-cpp_20230125.1-1_patch.zip
--patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20230125.1-1/get_patch
--patch_hash = a920ab28067e433d7ead2d564a4f511628f498f0723f7f94d19317877787ef39
--source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_20230125.1-1/abseil-cpp-20230125.1.tar.gz
--wrapdb_version = 20230125.1-1
-+patch_filename = abseil-cpp_20230125.1-4_patch.zip
-+patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20230125.1-4/get_patch
-+patch_hash = 112ee72052049d930396c2778fc1c6e184137905dd75d60a97dcfc386426610d
-+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_20230125.1-4/abseil-cpp-20230125.1.tar.gz
-+wrapdb_version = 20230125.1-4
-
- [provide]
- absl_base = absl_base_dep
-@@ -18,9 +18,67 @@ absl_flags = absl_flags_dep
- absl_hash = absl_hash_dep
- absl_crc = absl_crc_dep
- absl_numeric = absl_numeric_dep
-+absl_profiling = absl_profiling_dep
- absl_random = absl_random_dep
- absl_status = absl_status_dep
- absl_strings = absl_strings_dep
- absl_synchronization = absl_synchronization_dep
- absl_time = absl_time_dep
- absl_types = absl_types_dep
-+absl_bad_any_cast_impl = absl_types_dep
-+absl_bad_optional_access = absl_types_dep
-+absl_bad_variant_access = absl_types_dep
-+absl_city = absl_hash_dep
-+absl_civil_time = absl_time_dep
-+absl_cord = absl_strings_dep
-+absl_cord_internal = absl_strings_dep
-+absl_cordz_functions = absl_strings_dep
-+absl_cordz_handle = absl_strings_dep
-+absl_cordz_info = absl_strings_dep
-+absl_cordz_sample_token = absl_strings_dep
-+absl_debugging_internal = absl_debugging_dep
-+absl_demangle_internal = absl_debugging_dep
-+absl_examine_stack = absl_debugging_dep
-+absl_exponential_biased = absl_profiling_dep
-+absl_failure_signal_handler = absl_debugging_dep
-+absl_flags_commandlineflag = absl_flags_dep
-+absl_flags_commandlineflag_internal = absl_flags_dep
-+absl_flags_config = absl_flags_dep
-+absl_flags_internal = absl_flags_dep
-+absl_flags_marshalling = absl_flags_dep
-+absl_flags_parse = absl_flags_dep
-+absl_flags_private_handle_accessor = absl_flags_dep
-+absl_flags_program_name = absl_flags_dep
-+absl_flags_reflection = absl_flags_dep
-+absl_flags_usage = absl_flags_dep
-+absl_flags_usage_internal = absl_flags_dep
-+absl_graphcycles_internal = absl_synchronization_dep
-+absl_hashtablez_sampler = absl_container_dep
-+absl_int128 = absl_numeric_dep
-+absl_leak_check = absl_debugging_dep
-+absl_log_severity = absl_base_dep
-+absl_low_level_hash = absl_hash_dep
-+absl_periodic_sampler = absl_profiling_dep
-+absl_random_distributions = absl_random_dep
-+absl_random_internal_distribution_test_util = absl_random_dep
-+absl_random_internal_platform = absl_random_dep
-+absl_random_internal_pool_urbg = absl_random_dep
-+absl_random_internal_randen = absl_random_dep
-+absl_random_internal_randen_hwaes = absl_random_dep
-+absl_random_internal_randen_hwaes_impl = absl_random_dep
-+absl_random_internal_randen_slow = absl_random_dep
-+absl_random_internal_seed_material = absl_random_dep
-+absl_random_seed_gen_exception = absl_random_dep
-+absl_random_seed_sequences = absl_random_dep
-+absl_raw_hash_set = absl_container_dep
-+absl_raw_logging_internal = absl_base_dep
-+absl_scoped_set_env = absl_base_dep
-+absl_spinlock_wait = absl_base_dep
-+absl_stacktrace = absl_debugging_dep
-+absl_statusor = absl_status_dep
-+absl_strerror = absl_base_dep
-+absl_str_format_internal = absl_strings_dep
-+absl_strings_internal = absl_strings_dep
-+absl_symbolize = absl_debugging_dep
-+absl_throw_delegate = absl_base_dep
-+absl_time_zone = absl_time_dep
---
-2.39.2
-