aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0001-Unbundling-abseil.patch
diff options
context:
space:
mode:
authorBoyuan Yang <byang@debian.org>2021-11-07 08:55:08 -0500
committerBoyuan Yang <byang@debian.org>2021-11-07 08:58:11 -0500
commita08da9600832caf817125edee2c3206fe24cd5cb (patch)
tree46d228df0f9f726e3b3fb3b5dcdb2aa5ee6375fb /debian/patches/0001-Unbundling-abseil.patch
parent37b23114dc26708a04a3354519e9e8e348d9f868 (diff)
downloadlibgav1-a08da9600832caf817125edee2c3206fe24cd5cb.tar.gz
libgav1-a08da9600832caf817125edee2c3206fe24cd5cb.tar.bz2
libgav1-a08da9600832caf817125edee2c3206fe24cd5cb.zip
debian/: Refresh patches
Diffstat (limited to 'debian/patches/0001-Unbundling-abseil.patch')
-rw-r--r--debian/patches/0001-Unbundling-abseil.patch42
1 files changed, 42 insertions, 0 deletions
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()