From a08da9600832caf817125edee2c3206fe24cd5cb Mon Sep 17 00:00:00 2001
From: Boyuan Yang <byang@debian.org>
Date: Sun, 7 Nov 2021 08:55:08 -0500
Subject: debian/: Refresh patches

---
 debian/patches/0001-Unbundling-abseil.patch | 42 +++++++++++++++++++++++++++++
 debian/patches/Unbundling-abseil.patch      | 32 ----------------------
 debian/patches/series                       |  2 +-
 3 files changed, 43 insertions(+), 33 deletions(-)
 create mode 100644 debian/patches/0001-Unbundling-abseil.patch
 delete mode 100644 debian/patches/Unbundling-abseil.patch

diff --git a/debian/patches/0001-Unbundling-abseil.patch b/debian/patches/0001-Unbundling-abseil.patch
new file mode 100644
index 0000000..929654f
--- /dev/null
+++ b/debian/patches/0001-Unbundling-abseil.patch
@@ -0,0 +1,42 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Sun, 7 Nov 2021 08:57:45 -0500
+Subject: Unbundling abseil
+
+---
+ CMakeLists.txt | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4029de1..5d431dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,6 @@ if(LIBGAV1_VERBOSE)
+   libgav1_dump_options()
+ endif()
+ 
+-set(libgav1_abseil_build "${libgav1_build}/abseil")
+ set(libgav1_gtest_build "${libgav1_build}/gtest")
+ 
+ # Compiler/linker flags must be lists, but come in from the environment as
+@@ -123,19 +122,9 @@ endif()
+ # Set test-only flags based on LIBGAV1_CXX_FLAGS.
+ libgav1_set_test_flags()
+ 
+-set(libgav1_abseil "${libgav1_root}/third_party/abseil-cpp")
+-if(NOT EXISTS "${libgav1_abseil}")
+-  message(
+-    FATAL_ERROR
+-      "Abseil not found. This dependency is required by the"
+-      " examples & tests and libgav1 when LIBGAV1_THREADPOOL_USE_STD_MUTEX is"
+-      " not defined. To continue, download the Abseil repository to"
+-      " third_party/abseil-cpp:\n  git \\\n    -C ${libgav1_root} \\\n"
+-      "    clone \\\n"
+-      "    https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp")
+-endif()
++set(absl "/usr/lib/*/cmake/absl")
++find_package(absl REQUIRED)
+ set(ABSL_PROPAGATE_CXX_STD ON)
+-add_subdirectory("${libgav1_abseil}" "${libgav1_abseil_build}" EXCLUDE_FROM_ALL)
+ 
+ libgav1_reset_target_lists()
+ libgav1_add_dsp_targets()
diff --git a/debian/patches/Unbundling-abseil.patch b/debian/patches/Unbundling-abseil.patch
deleted file mode 100644
index 83672d4..0000000
--- a/debian/patches/Unbundling-abseil.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Unbundling abseil
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,6 @@
-   libgav1_dump_options()
- endif()
- 
--set(libgav1_abseil_build "${libgav1_build}/abseil")
- set(libgav1_gtest_build "${libgav1_build}/gtest")
- 
- # Compiler/linker flags must be lists, but come in from the environment as
-@@ -115,18 +114,8 @@
- # Set test-only flags based on LIBGAV1_CXX_FLAGS.
- libgav1_set_test_flags()
- 
--set(libgav1_abseil "${libgav1_root}/third_party/abseil-cpp")
--if(NOT EXISTS "${libgav1_abseil}")
--  message(
--    FATAL_ERROR
--      "Abseil not found. This dependency is required by the"
--      " examples & tests and libgav1 when LIBGAV1_THREADPOOL_USE_STD_MUTEX is"
--      " not defined. To continue, download the Abseil repository to"
--      " third_party/abseil-cpp:\n  git \\\n    -C ${libgav1_root} \\\n"
--      "    clone \\\n"
--      "    https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp")
--endif()
--add_subdirectory("${libgav1_abseil}" "${libgav1_abseil_build}" EXCLUDE_FROM_ALL)
-+set(absl "/usr/lib/*/cmake/absl")
-+find_package(absl REQUIRED)
- 
- libgav1_reset_target_lists()
- libgav1_add_dsp_targets()
diff --git a/debian/patches/series b/debian/patches/series
index f1aaaf0..4d3442e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-Unbundling-abseil.patch
+0001-Unbundling-abseil.patch
-- 
cgit v1.2.3