From e6e334b9c76c2e0e648abbf1abf618b4df0a742a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 12 Jul 2024 18:02:37 +0200
Subject: [PATCH] Build abseil-cpp from tarbal

Resolves: RHEL-28928
---
 .gitignore                               |  2 ++
 build-abseil-cpp-from-local-tarbal.patch | 17 +++++++++++++++++
 sources                                  |  2 ++
 webrtc-audio-processing.spec             | 19 ++++++++++++++++---
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 build-abseil-cpp-from-local-tarbal.patch

diff --git a/.gitignore b/.gitignore
index ba653b0..21b1402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /webrtc-audio-processing-0.3.1.tar.xz
 /webrtc-audio-processing-1.3.tar.xz
+/abseil-cpp-20230125.1.tar.gz
+/abseil-cpp_20230125.1-4_patch.zip
diff --git a/build-abseil-cpp-from-local-tarbal.patch b/build-abseil-cpp-from-local-tarbal.patch
new file mode 100644
index 0000000..f8c1ddd
--- /dev/null
+++ b/build-abseil-cpp-from-local-tarbal.patch
@@ -0,0 +1,17 @@
+diff -ru webrtc-audio-processing-1.3.old/subprojects/abseil-cpp.wrap webrtc-audio-processing-1.3/subprojects/abseil-cpp.wrap
+--- webrtc-audio-processing-1.3.old/subprojects/abseil-cpp.wrap	2023-09-05 17:19:47.000000000 +0200
++++ webrtc-audio-processing-1.3/subprojects/abseil-cpp.wrap	2024-07-12 17:45:02.377170755 +0200
+@@ -1,13 +1,7 @@
+ [wrap-file]
+ 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-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
diff --git a/sources b/sources
index b25567a..34af675 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
+SHA512 (abseil-cpp-20230125.1.tar.gz) = 160764e2d10f1a5970b6ea7323868d231070c57b48fcc92e3614bca9d0e9ee0a571b66dfdc560934883de542f32dfbb1ba7b03c11bda8f03e63a5f31e273be6a
+SHA512 (abseil-cpp_20230125.1-4_patch.zip) = 3e013f9a76dd6f3bc0ec039fdf4d52f228ca135da23d856f3dda17769c5d63ad424175ee78f284735056705d29ac86c76cf751d3ccd66c7882d5d617a1e5fe8c
 SHA512 (webrtc-audio-processing-1.3.tar.xz) = daabaed06ff9d1d4076b2abba14efbbebeb8930b14a99fb47974399d2812f3f851e3d6a691b09fbcfb1a3535c6ade967bac4c17a3728f3138b302e3b844c5c67
diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec
index 4d7673c..d4634b2 100644
--- a/webrtc-audio-processing.spec
+++ b/webrtc-audio-processing.spec
@@ -1,18 +1,22 @@
 Name:           webrtc-audio-processing
 Version:        1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for echo cancellation
 
 License:        BSD-3-Clause
 URL:            http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/
 Source0:        http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/%{name}-%{version}.tar.xz
+Source1:        abseil-cpp-20230125.1.tar.gz
+Source2:        abseil-cpp_20230125.1-4_patch.zip
+
 
 Patch0:         arches.patch
 Patch1:         65f002e.patch
+Patch2:         build-abseil-cpp-from-local-tarbal.patch
 
 BuildRequires: meson
 BuildRequires: gcc gcc-c++
-BuildRequires: abseil-cpp-devel
+#BuildRequires: abseil-cpp-devel
 #BuildRequires: neon-devel
 
 %description
@@ -31,6 +35,10 @@ files for developing applications that use %{name}.
 %prep
 %autosetup -p1
 
+mkdir subprojects/packagefiles
+cp %{SOURCE1} subprojects/packagefiles/
+cp %{SOURCE2} subprojects/packagefiles/
+
 %build
 %meson
 %meson_build \
@@ -38,10 +46,11 @@ files for developing applications that use %{name}.
 #  -Dneon=no \
 #%endif
 
-
 %install
 %meson_install
 
+rm -rf %{buildroot}%{_includedir}/absl/
+
 
 %ldconfig_scriptlets
 
@@ -60,6 +69,10 @@ files for developing applications that use %{name}.
 
 
 %changelog
+* Fri Jul 12 2024 Wim Taymans <wtaymans@redhat.com> - 1.3-3
+- Build abseil-cpp from tarbal
+- Resolves: RHEL-28928
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3-2
 - Bump release for June 2024 mass rebuild