diff options
| -rw-r--r-- | debian/patches/0001-Unbundle-abseil.patch | 46 | ||||
| -rw-r--r-- | debian/patches/0001-Unbundling-abseil.patch | 42 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 47 insertions, 43 deletions
diff --git a/debian/patches/0001-Unbundle-abseil.patch b/debian/patches/0001-Unbundle-abseil.patch new file mode 100644 index 0000000..5304994 --- /dev/null +++ b/debian/patches/0001-Unbundle-abseil.patch @@ -0,0 +1,46 @@ +From: Boyuan Yang <byang@debian.org> +Date: Sat, 16 Jul 2022 13:49:23 -0400 +Subject: Unbundle abseil + +--- + CMakeLists.txt | 20 ++------------------ + 1 file changed, 2 insertions(+), 18 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52b1b32..4b30659 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,7 +116,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 +@@ -131,23 +130,8 @@ endif() + # Set test-only flags based on LIBGAV1_CXX_FLAGS. + libgav1_set_test_flags() + +-set(libgav1_abseil "${libgav1_root}/third_party/abseil-cpp") +-if(EXISTS "${libgav1_abseil}") +- set(ABSL_PROPAGATE_CXX_STD ON) +- add_subdirectory("${libgav1_abseil}" "${libgav1_abseil_build}" +- EXCLUDE_FROM_ALL) +-else() +- if(use_absl_threading OR LIBGAV1_ENABLE_EXAMPLES OR LIBGAV1_ENABLE_TESTS) +- 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() +-endif() ++set(absl "/usr/lib/*/cmake/absl") ++set(ABSL_PROPAGATE_CXX_STD ON) + + libgav1_reset_target_lists() + libgav1_add_dsp_targets() diff --git a/debian/patches/0001-Unbundling-abseil.patch b/debian/patches/0001-Unbundling-abseil.patch deleted file mode 100644 index 929654f..0000000 --- a/debian/patches/0001-Unbundling-abseil.patch +++ /dev/null @@ -1,42 +0,0 @@ -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/series b/debian/patches/series index 4d3442e..b92502a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -0001-Unbundling-abseil.patch +0001-Unbundle-abseil.patch |