aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
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
parent37b23114dc26708a04a3354519e9e8e348d9f868 (diff)
downloadlibgav1-a08da9600832caf817125edee2c3206fe24cd5cb.tar.gz
libgav1-a08da9600832caf817125edee2c3206fe24cd5cb.tar.bz2
libgav1-a08da9600832caf817125edee2c3206fe24cd5cb.zip
debian/: Refresh patches
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-Unbundling-abseil.patch (renamed from debian/patches/Unbundling-abseil.patch)18
-rw-r--r--debian/patches/series2
2 files changed, 15 insertions, 5 deletions
diff --git a/debian/patches/Unbundling-abseil.patch b/debian/patches/0001-Unbundling-abseil.patch
index 83672d4..929654f 100644
--- a/debian/patches/Unbundling-abseil.patch
+++ b/debian/patches/0001-Unbundling-abseil.patch
@@ -1,7 +1,16 @@
-Unbundling abseil
+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
-@@ -100,7 +100,6 @@
+@@ -108,7 +108,6 @@ if(LIBGAV1_VERBOSE)
libgav1_dump_options()
endif()
@@ -9,7 +18,7 @@ Unbundling 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 @@
+@@ -123,19 +122,9 @@ endif()
# Set test-only flags based on LIBGAV1_CXX_FLAGS.
libgav1_set_test_flags()
@@ -24,9 +33,10 @@ Unbundling abseil
- " 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)
+ 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/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