diff options
| author | Boyuan Yang <byang@debian.org> | 2023-11-27 23:03:50 -0500 |
|---|---|---|
| committer | Boyuan Yang <byang@debian.org> | 2023-11-27 23:03:50 -0500 |
| commit | d21c70a64cbdf6b71593d95336761f873d2812fb (patch) | |
| tree | 156de5c52dcb5c352a5b960fc4f59bcab7d8c698 | |
| parent | 55820da50387eed487bf57f6a2309fca309dd33e (diff) | |
| download | libgav1-d21c70a64cbdf6b71593d95336761f873d2812fb.tar.gz libgav1-d21c70a64cbdf6b71593d95336761f873d2812fb.tar.bz2 libgav1-d21c70a64cbdf6b71593d95336761f873d2812fb.zip | |
Try to enable googletest
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/0002-Use-system-googletest.patch | 39 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 43 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 277f2d4..0c39d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ libgav1 (0.19.0-1) unstable; urgency=medium * Team upload. * New upstream release. * debian/patches/0001-Unbundle-abseil.patch: Refresh the patch. + * debian/patches/0002-Use-system-googletest.patch: Try to enable + googletest. - -- Boyuan Yang <byang@debian.org> Mon, 27 Nov 2023 22:51:15 -0500 + -- Boyuan Yang <byang@debian.org> Mon, 27 Nov 2023 23:03:34 -0500 libgav1 (0.18.0-1) unstable; urgency=medium diff --git a/debian/patches/0002-Use-system-googletest.patch b/debian/patches/0002-Use-system-googletest.patch new file mode 100644 index 0000000..bef8377 --- /dev/null +++ b/debian/patches/0002-Use-system-googletest.patch @@ -0,0 +1,39 @@ +From: Boyuan Yang <byang@debian.org> +Date: Mon, 27 Nov 2023 23:03:28 -0500 +Subject: Use system googletest + +--- + cmake/libgav1_build_definitions.cmake | 6 +++--- + tests/libgav1_tests.cmake | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake/libgav1_build_definitions.cmake b/cmake/libgav1_build_definitions.cmake +index 1465679..16ddd4a 100644 +--- a/cmake/libgav1_build_definitions.cmake ++++ b/cmake/libgav1_build_definitions.cmake +@@ -43,9 +43,9 @@ macro(libgav1_set_build_definitions) + list(APPEND libgav1_include_paths "${libgav1_root}" "${libgav1_root}/src" + "${libgav1_build}" "${libgav1_root}/third_party/abseil-cpp") + list(APPEND libgav1_gtest_include_paths +- "third_party/googletest/googlemock/include" +- "third_party/googletest/googletest/include" +- "third_party/googletest/googletest") ++ "/usr/src/googletest/googlemock/include" ++ "/usr/src/googletest/googletest/include" ++ "/usr/src/googletest/googletest") + list(APPEND libgav1_test_include_paths ${libgav1_include_paths} + ${libgav1_gtest_include_paths}) + list(APPEND libgav1_defines "LIBGAV1_CMAKE=1" +diff --git a/tests/libgav1_tests.cmake b/tests/libgav1_tests.cmake +index 95f6361..209054b 100644 +--- a/tests/libgav1_tests.cmake ++++ b/tests/libgav1_tests.cmake +@@ -17,7 +17,7 @@ if(LIBGAV1_LIBGAV1_TESTS_CMAKE_) + endif() # LIBGAV1_LIBGAV1_TESTS_CMAKE_ + set(LIBGAV1_LIBGAV1_TESTS_CMAKE_ 1) + +-set(libgav1_googletest "${libgav1_root}/third_party/googletest") ++set(libgav1_googletest "/usr/src/googletest/") + if(NOT LIBGAV1_ENABLE_TESTS OR NOT EXISTS "${libgav1_googletest}") + macro(libgav1_add_tests_targets) + diff --git a/debian/patches/series b/debian/patches/series index b92502a..32467a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Unbundle-abseil.patch +0002-Use-system-googletest.patch |