diff options
| author | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
|---|---|---|
| committer | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
| commit | 873c687c09e0a1a78a8f3601d31330ad1897e484 (patch) | |
| tree | ff2fa2e2d27b55c002a6d46d50aab2c66e0bf21a /debian/patches/0001-Unbundle-abseil.patch | |
| parent | 395b1f6877fbc2666383f3428f17400c35aa52a4 (diff) | |
| parent | b9ae809f200982119d16ec9613f3db95eca923b9 (diff) | |
| download | libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.gz libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.bz2 libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.zip | |
Merge branch 'master' into 'scrub-obsolete'
# Conflicts:
# debian/changelog
Diffstat (limited to 'debian/patches/0001-Unbundle-abseil.patch')
| -rw-r--r-- | debian/patches/0001-Unbundle-abseil.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/0001-Unbundle-abseil.patch b/debian/patches/0001-Unbundle-abseil.patch index 67a8357..1395830 100644 --- a/debian/patches/0001-Unbundle-abseil.patch +++ b/debian/patches/0001-Unbundle-abseil.patch @@ -7,7 +7,7 @@ Subject: Unbundle abseil 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52b1b32..d5e8f95 100644 +index 73f27a1..e9bb9b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,6 @@ if(LIBGAV1_VERBOSE) @@ -35,7 +35,7 @@ index 52b1b32..d5e8f95 100644 - " 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" +- " clone -b 20220623.0 --depth 1 \\\n" - " https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp") - endif() -endif() |