[rpms/webrtc-audio-processing] rawhide: Undo abseil-cpp bundling

[rpms/webrtc-audio-processing] rawhide: Undo abseil-cpp bundling

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/webrtc-audio-processing
            Branch : rawhide
            Commit : 1912e969f4b203d341416be0ddb43b65c4f41523
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-06-19T10:00:15-04:00
            Stats  : +0/-40 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/webrtc-audio-processing/c/1912e969f4b203d341416be0ddb43b65c4f41523?branch=rawhide

            Log:
            Undo abseil-cpp bundling

The latest protobuf now requires abseil-cpp, so it will need to be part of
RHEL 11, and therefore there is no further need to bundle it here.

https://github.com/fedora-eln/eln/issues/543

---
diff --git a/abseil-cpp-wrap.patch b/abseil-cpp-wrap.patch
deleted file mode 100644
index 217e83a..0000000
--- a/abseil-cpp-wrap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up ./subprojects/abseil-cpp.wrap.orig ./subprojects/abseil-cpp.wrap
---- ./subprojects/abseil-cpp.wrap.orig	2023-09-05 11:19:47.000000000 -0400
-+++ ./subprojects/abseil-cpp.wrap	2025-11-16 23:59:54.347546213 -0500
-@@ -1,13 +1,7 @@
- [wrap-file]
--directory = abseil-cpp-20240722.0
--source_url = https://github.com/abseil/abseil-cpp/releases/download/20240722.0/abseil-cpp-20240722.0.tar.gz
--source_filename = abseil-cpp-20240722.0.tar.gz
--source_hash = f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
--patch_filename = abseil-cpp_20240722.0-3_patch.zip
--patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20240722.0-3/get_patch
--patch_hash = 12dd8df1488a314c53e3751abd2750cf233b830651d168b6a9f15e7d0cf71f7b
--source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_20240722.0-3/abseil-cpp-20240722.0.tar.gz
--wrapdb_version = 20240722.0-3
-+directory = abseil-cpp-20250814.1
-+source_filename = abseil-cpp-20250814.1.tar.gz
-+patch_filename = abseil-cpp_20250814.1-1_patch.zip
- 
- [provide]
- absl_base = absl_base_dep

diff --git a/sources b/sources
index 8b98bb5..f87bcbc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 SHA512 (webrtc-audio-processing-2.1.tar.xz) = 534af17db1082e900ebd964042679685f26e8452c2e08c6f29660d0484bd5b079c804104600e972281d1ddcbca7762c63cc58b561b175b73447d069dd00f1a61
-SHA512 (abseil-cpp-20250814.1.tar.gz) = 7083b73c3cf763f6f7a7edb70a5171f44d27045a0f5e52ca043e0a86379af2c50cf85dbfea30ebaa22a7bb2929452581d26b1ba18945023b057267d4c3bad2f7
-SHA512 (abseil-cpp_20250814.1-1_patch.zip) = c7a839c9dfdf4964cd433b9a5d9d7911500a97a16094d877118f133980cabb83e598aae95657406e717fc1d963929a3009d9d08905c391bba83d2f2a0a21af95

diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec
index 0081f91..28bb7c7 100644
--- a/webrtc-audio-processing.spec
+++ b/webrtc-audio-processing.spec
@@ -1,6 +1,3 @@
-%bcond bundled_absl %{defined rhel}
-%global absl_ver 20250814.1
-
 Name:           webrtc-audio-processing
 Version:        2.1
 Release:        %autorelease
@@ -9,22 +6,15 @@ Summary:        Library for echo cancellation
 License:        BSD-3-Clause
 URL:            https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/
 Source:         https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/%{name}-%{version}.tar.xz
-Source:         https://github.com/abseil/abseil-cpp/releases/download/%{absl_ver}/abseil-cpp-%{absl_ver}.tar.gz
-Source:         https://github.com/mesonbuild/wrapdb/releases/download/abseil-cpp_%{absl_ver}-1/abseil-cpp_%{absl_ver}-1_patch.zip
 
 # Backports from upstream
 Patch:         0001-Fix-compilation-with-gcc-15.patch
 Patch:         0001-arch.h-Add-s390x-support.patch
 Patch:         0001-Fix-build-with-abseil-cpp-202508.patch
 
-# Downstream patches
-Patch:         abseil-cpp-wrap.patch
-
 BuildRequires: meson
 BuildRequires: gcc gcc-c++
-%if %{without bundled_absl}
 BuildRequires: abseil-cpp-devel
-%endif
 
 %description
 %{name} is a library derived from Google WebRTC project that
@@ -41,11 +31,6 @@ files for developing applications that use %{name}.
 
 %prep
 %autosetup -p1
-%if %{with bundled_absl}
-mkdir -p subprojects/packagefiles
-cp %{S:1} subprojects/packagefiles
-cp %{S:2} subprojects/packagefiles
-%endif
 
 
 %conf
@@ -62,9 +47,6 @@ cp %{S:2} subprojects/packagefiles
 
 %install
 %meson_install
-%if %{with bundled_absl}
-mv %{buildroot}%{_includedir}/absl %{buildroot}%{_includedir}/webrtc-audio-processing-2/
-%endif
 
 
 %files