]>
Commit | Line | Data |
---|---|---|
e2f5e4d6 JB |
1 | --- libgav1-0.16.3/CMakeLists.txt.orig 2021-06-30 16:32:33.000000000 +0200 |
2 | +++ libgav1-0.16.3/CMakeLists.txt 2021-06-30 16:35:57.392250015 +0200 | |
3 | @@ -100,9 +100,6 @@ if(LIBGAV1_VERBOSE) | |
4 | libgav1_dump_options() | |
5 | endif() | |
6 | ||
7 | -set(libgav1_abseil_build "${libgav1_build}/abseil") | |
8 | -set(libgav1_gtest_build "${libgav1_build}/gtest") | |
9 | - | |
10 | # Compiler/linker flags must be lists, but come in from the environment as | |
11 | # strings. Break them up: | |
12 | if(NOT "${LIBGAV1_CXX_FLAGS}" STREQUAL "") | |
13 | @@ -115,19 +112,6 @@ endif() | |
14 | # Set test-only flags based on LIBGAV1_CXX_FLAGS. | |
15 | libgav1_set_test_flags() | |
16 | ||
17 | -set(libgav1_abseil "${libgav1_root}/third_party/abseil-cpp") | |
18 | -if(NOT EXISTS "${libgav1_abseil}") | |
19 | - message( | |
20 | - FATAL_ERROR | |
21 | - "Abseil not found. This dependency is required by the" | |
22 | - " examples & tests and libgav1 when LIBGAV1_THREADPOOL_USE_STD_MUTEX is" | |
23 | - " not defined. To continue, download the Abseil repository to" | |
24 | - " third_party/abseil-cpp:\n git \\\n -C ${libgav1_root} \\\n" | |
25 | - " clone \\\n" | |
26 | - " https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp") | |
27 | -endif() | |
28 | -add_subdirectory("${libgav1_abseil}" "${libgav1_abseil_build}" EXCLUDE_FROM_ALL) | |
29 | - | |
30 | libgav1_reset_target_lists() | |
31 | libgav1_add_dsp_targets() | |
32 | libgav1_add_decoder_targets() | |
33 | --- libgav1-0.16.3/examples/libgav1_examples.cmake.orig 2021-06-30 16:32:33.000000000 +0200 | |
34 | +++ libgav1-0.16.3/examples/libgav1_examples.cmake 2021-06-30 16:35:57.392250015 +0200 | |
35 | @@ -56,8 +56,8 @@ macro(libgav1_add_examples_targets) | |
36 | libgav1_file_reader | |
37 | libgav1_file_writer | |
38 | LIB_DEPS | |
39 | - absl::strings | |
40 | - absl::str_format_internal | |
41 | - absl::time | |
42 | + absl_strings | |
43 | + absl_str_format_internal | |
44 | + absl_time | |
45 | ${libgav1_dependency}) | |
46 | endmacro() | |
47 | --- libgav1-0.16.3/src/libgav1_decoder.cmake.orig 2021-06-30 16:32:33.000000000 +0200 | |
48 | +++ libgav1-0.16.3/src/libgav1_decoder.cmake 2021-06-30 16:38:48.877987664 +0200 | |
49 | @@ -108,7 +108,7 @@ macro(libgav1_add_decoder_targets) | |
50 | endif() | |
51 | ||
52 | if(NOT ANDROID) | |
53 | - list(APPEND libgav1_absl_deps absl::base absl::synchronization) | |
54 | + list(APPEND libgav1_absl_deps absl_base absl_synchronization) | |
55 | endif() | |
56 | ||
57 | libgav1_add_library(NAME libgav1_decoder TYPE OBJECT SOURCES | |
58 | @@ -151,6 +151,7 @@ macro(libgav1_add_decoder_targets) | |
59 | ${libgav1_include_paths} | |
60 | LIB_DEPS | |
61 | libgav1_static | |
62 | + pthread | |
63 | PUBLIC_INCLUDES | |
64 | ${libgav1_source}) | |
65 | endif() | |
66 | --- libgav1-0.16.3/tests/libgav1_tests.cmake.orig 2021-06-30 16:32:33.000000000 +0200 | |
67 | +++ libgav1-0.16.3/tests/libgav1_tests.cmake 2021-06-30 16:41:54.316983055 +0200 | |
68 | @@ -17,24 +17,6 @@ if(LIBGAV1_LIBGAV1_TESTS_CMAKE_) | |
69 | endif() # LIBGAV1_LIBGAV1_TESTS_CMAKE_ | |
70 | set(LIBGAV1_LIBGAV1_TESTS_CMAKE_ 1) | |
71 | ||
72 | -set(libgav1_googletest "${libgav1_root}/third_party/googletest") | |
73 | -if(NOT LIBGAV1_ENABLE_TESTS OR NOT EXISTS "${libgav1_googletest}") | |
74 | - macro(libgav1_add_tests_targets) | |
75 | - | |
76 | - endmacro() | |
77 | - | |
78 | - if(LIBGAV1_ENABLE_TESTS AND NOT EXISTS "${libgav1_googletest}") | |
79 | - message( | |
80 | - "GoogleTest not found, setting LIBGAV1_ENABLE_TESTS to false.\n" | |
81 | - "To enable tests download the GoogleTest repository to" | |
82 | - " third_party/googletest:\n\n git \\\n -C ${libgav1_root} \\\n" | |
83 | - " clone \\\n" | |
84 | - " https://github.com/google/googletest.git third_party/googletest\n") | |
85 | - set(LIBGAV1_ENABLE_TESTS FALSE CACHE BOOL "Enables tests." FORCE) | |
86 | - endif() | |
87 | - return() | |
88 | -endif() | |
89 | - | |
90 | # Check GoogleTest compiler requirements. | |
91 | if((CMAKE_CXX_COMPILER_ID | |
92 | MATCHES | |
93 | @@ -113,32 +95,6 @@ macro(libgav1_add_tests_targets) | |
94 | "This version of libgav1_add_tests_targets() should only be used with" | |
95 | " LIBGAV1_ENABLE_TESTS set to true.") | |
96 | endif() | |
97 | - libgav1_add_library(TEST | |
98 | - NAME | |
99 | - libgav1_gtest | |
100 | - TYPE | |
101 | - STATIC | |
102 | - SOURCES | |
103 | - "${libgav1_googletest}/googletest/src/gtest-all.cc" | |
104 | - DEFINES | |
105 | - ${libgav1_defines} | |
106 | - INCLUDES | |
107 | - ${libgav1_gtest_include_paths} | |
108 | - ${libgav1_include_paths}) | |
109 | - | |
110 | - libgav1_add_library(TEST | |
111 | - NAME | |
112 | - libgav1_gtest_main | |
113 | - TYPE | |
114 | - STATIC | |
115 | - SOURCES | |
116 | - "${libgav1_googletest}/googletest/src/gtest_main.cc" | |
117 | - DEFINES | |
118 | - ${libgav1_defines} | |
119 | - INCLUDES | |
120 | - ${libgav1_gtest_include_paths} | |
121 | - ${libgav1_include_paths}) | |
122 | - | |
123 | if(ANDROID OR IOS) | |
124 | if(DEFINED LIBGAV1_THREADPOOL_USE_STD_MUTEX | |
125 | AND NOT LIBGAV1_THREADPOOL_USE_STD_MUTEX) | |
126 | @@ -152,7 +108,7 @@ macro(libgav1_add_tests_targets) | |
127 | endif() | |
128 | ||
129 | if(use_absl_threading) | |
130 | - list(APPEND libgav1_common_test_absl_deps absl::synchronization) | |
131 | + list(APPEND libgav1_common_test_absl_deps absl_synchronization) | |
132 | endif() | |
133 | ||
134 | libgav1_add_executable(TEST | |
135 | @@ -169,10 +125,10 @@ macro(libgav1_add_tests_targets) | |
136 | libgav1_tests_utils | |
137 | libgav1_utils | |
138 | LIB_DEPS | |
139 | - absl::time | |
140 | + absl_time | |
141 | ${libgav1_common_test_absl_deps} | |
142 | - libgav1_gtest | |
143 | - libgav1_gtest_main) | |
144 | + gtest | |
145 | + gtest_main) | |
146 | ||
147 | libgav1_add_library(TEST | |
148 | NAME | |
149 | @@ -214,12 +170,12 @@ macro(libgav1_add_tests_targets) | |
150 | libgav1_tests_utils | |
151 | libgav1_utils | |
152 | LIB_DEPS | |
153 | - absl::str_format_internal | |
154 | - absl::strings | |
155 | - absl::time | |
156 | + absl_str_format_internal | |
157 | + absl_strings | |
158 | + absl_time | |
159 | ${libgav1_common_test_absl_deps} | |
160 | - libgav1_gtest | |
161 | - libgav1_gtest_main) | |
162 | + gtest | |
163 | + gtest_main) | |
164 | ||
165 | libgav1_add_executable(TEST | |
166 | NAME | |
167 | @@ -236,11 +192,11 @@ macro(libgav1_add_tests_targets) | |
168 | libgav1_tests_utils | |
169 | libgav1_utils | |
170 | LIB_DEPS | |
171 | - absl::strings | |
172 | - absl::time | |
173 | + absl_strings | |
174 | + absl_time | |
175 | ${libgav1_common_test_absl_deps} | |
176 | - libgav1_gtest | |
177 | - libgav1_gtest_main) | |
178 | + gtest | |
179 | + gtest_main) | |
180 | ||
181 | libgav1_add_executable(TEST | |
182 | NAME | |
183 | @@ -258,11 +214,12 @@ macro(libgav1_add_tests_targets) | |
184 | libgav1_tests_utils | |
185 | libgav1_utils | |
186 | LIB_DEPS | |
187 | - absl::str_format_internal | |
188 | - absl::time | |
189 | + absl_str_format_internal | |
190 | + absl_strings | |
191 | + absl_time | |
192 | ${libgav1_common_test_absl_deps} | |
193 | - libgav1_gtest | |
194 | - libgav1_gtest_main) | |
195 | + gtest | |
196 | + gtest_main) | |
197 | ||
198 | libgav1_add_executable(TEST | |
199 | NAME | |
200 | @@ -279,11 +236,12 @@ macro(libgav1_add_tests_targets) | |
201 | libgav1_tests_utils | |
202 | libgav1_utils | |
203 | LIB_DEPS | |
204 | - absl::str_format_internal | |
205 | - absl::time | |
206 | + absl_str_format_internal | |
207 | + absl_strings | |
208 | + absl_time | |
209 | ${libgav1_common_test_absl_deps} | |
210 | - libgav1_gtest | |
211 | - libgav1_gtest_main) | |
212 | + gtest | |
213 | + gtest_main) | |
214 | ||
215 | libgav1_add_executable(TEST | |
216 | NAME | |
217 | @@ -300,11 +258,11 @@ macro(libgav1_add_tests_targets) | |
218 | libgav1_tests_utils | |
219 | libgav1_utils | |
220 | LIB_DEPS | |
221 | - absl::strings | |
222 | - absl::time | |
223 | + absl_strings | |
224 | + absl_time | |
225 | ${libgav1_common_test_absl_deps} | |
226 | - libgav1_gtest | |
227 | - libgav1_gtest_main) | |
228 | + gtest | |
229 | + gtest_main) | |
230 | ||
231 | libgav1_add_executable(TEST | |
232 | NAME | |
233 | @@ -322,10 +280,11 @@ macro(libgav1_add_tests_targets) | |
234 | libgav1_tests_utils | |
235 | libgav1_utils | |
236 | LIB_DEPS | |
237 | - absl::time | |
238 | + absl_throw_delegate | |
239 | + absl_time | |
240 | ${libgav1_common_test_absl_deps} | |
241 | - libgav1_gtest | |
242 | - libgav1_gtest_main) | |
243 | + gtest | |
244 | + gtest_main) | |
245 | ||
246 | libgav1_add_executable(TEST | |
247 | NAME | |
248 | @@ -343,10 +302,10 @@ macro(libgav1_add_tests_targets) | |
249 | libgav1_tests_utils | |
250 | libgav1_utils | |
251 | LIB_DEPS | |
252 | - absl::time | |
253 | + absl_time | |
254 | ${libgav1_common_test_absl_deps} | |
255 | - libgav1_gtest | |
256 | - libgav1_gtest_main) | |
257 | + gtest | |
258 | + gtest_main) | |
259 | ||
260 | libgav1_add_executable(TEST | |
261 | NAME | |
262 | @@ -364,10 +323,10 @@ macro(libgav1_add_tests_targets) | |
263 | libgav1_tests_utils | |
264 | libgav1_utils | |
265 | LIB_DEPS | |
266 | - absl::time | |
267 | + absl_time | |
268 | ${libgav1_common_test_absl_deps} | |
269 | - libgav1_gtest | |
270 | - libgav1_gtest_main) | |
271 | + gtest | |
272 | + gtest_main) | |
273 | ||
274 | libgav1_add_executable(TEST | |
275 | NAME | |
276 | @@ -385,10 +344,10 @@ macro(libgav1_add_tests_targets) | |
277 | libgav1_tests_utils | |
278 | libgav1_utils | |
279 | LIB_DEPS | |
280 | - absl::time | |
281 | + absl_time | |
282 | ${libgav1_common_test_absl_deps} | |
283 | - libgav1_gtest | |
284 | - libgav1_gtest_main) | |
285 | + gtest | |
286 | + gtest_main) | |
287 | ||
288 | libgav1_add_executable(TEST | |
289 | NAME | |
290 | @@ -405,11 +364,11 @@ macro(libgav1_add_tests_targets) | |
291 | libgav1_dsp | |
292 | libgav1_utils | |
293 | LIB_DEPS | |
294 | - absl::strings | |
295 | - absl::time | |
296 | + absl_strings | |
297 | + absl_time | |
298 | ${libgav1_common_test_absl_deps} | |
299 | - libgav1_gtest | |
300 | - libgav1_gtest_main) | |
301 | + gtest | |
302 | + gtest_main) | |
303 | ||
304 | libgav1_add_executable(TEST | |
305 | NAME | |
306 | @@ -427,11 +386,11 @@ macro(libgav1_add_tests_targets) | |
307 | libgav1_dsp | |
308 | libgav1_utils | |
309 | LIB_DEPS | |
310 | - absl::strings | |
311 | - absl::time | |
312 | + absl_strings | |
313 | + absl_time | |
314 | ${libgav1_common_test_absl_deps} | |
315 | - libgav1_gtest | |
316 | - libgav1_gtest_main) | |
317 | + gtest | |
318 | + gtest_main) | |
319 | ||
320 | libgav1_add_executable(TEST | |
321 | NAME | |
322 | @@ -449,10 +408,10 @@ macro(libgav1_add_tests_targets) | |
323 | libgav1_tests_utils | |
324 | libgav1_utils | |
325 | LIB_DEPS | |
326 | - absl::time | |
327 | + absl_time | |
328 | ${libgav1_common_test_absl_deps} | |
329 | - libgav1_gtest | |
330 | - libgav1_gtest_main) | |
331 | + gtest | |
332 | + gtest_main) | |
333 | ||
334 | libgav1_add_executable(TEST | |
335 | NAME | |
336 | @@ -470,10 +429,10 @@ macro(libgav1_add_tests_targets) | |
337 | libgav1_tests_utils | |
338 | libgav1_utils | |
339 | LIB_DEPS | |
340 | - absl::time | |
341 | + absl_time | |
342 | ${libgav1_common_test_absl_deps} | |
343 | - libgav1_gtest | |
344 | - libgav1_gtest_main) | |
345 | + gtest | |
346 | + gtest_main) | |
347 | ||
348 | libgav1_add_executable(TEST | |
349 | NAME | |
350 | @@ -490,11 +449,12 @@ macro(libgav1_add_tests_targets) | |
351 | libgav1_tests_utils | |
352 | libgav1_utils | |
353 | LIB_DEPS | |
354 | - absl::str_format_internal | |
355 | - absl::time | |
356 | + absl_str_format_internal | |
357 | + absl_strings | |
358 | + absl_time | |
359 | ${libgav1_common_test_absl_deps} | |
360 | - libgav1_gtest | |
361 | - libgav1_gtest_main) | |
362 | + gtest | |
363 | + gtest_main) | |
364 | ||
365 | libgav1_add_executable(TEST | |
366 | NAME | |
367 | @@ -511,11 +471,11 @@ macro(libgav1_add_tests_targets) | |
368 | libgav1_tests_utils | |
369 | libgav1_utils | |
370 | LIB_DEPS | |
371 | - absl::str_format_internal | |
372 | - absl::time | |
373 | + absl_str_format_internal | |
374 | + absl_time | |
375 | ${libgav1_common_test_absl_deps} | |
376 | - libgav1_gtest | |
377 | - libgav1_gtest_main) | |
378 | + gtest | |
379 | + gtest_main) | |
380 | ||
381 | libgav1_add_executable(TEST | |
382 | NAME | |
383 | @@ -532,11 +492,11 @@ macro(libgav1_add_tests_targets) | |
384 | libgav1_tests_utils | |
385 | libgav1_utils | |
386 | LIB_DEPS | |
387 | - absl::str_format_internal | |
388 | - absl::time | |
389 | + absl_str_format_internal | |
390 | + absl_time | |
391 | ${libgav1_common_test_absl_deps} | |
392 | - libgav1_gtest | |
393 | - libgav1_gtest_main) | |
394 | + gtest | |
395 | + gtest_main) | |
396 | ||
397 | libgav1_add_executable(TEST | |
398 | NAME | |
399 | @@ -554,11 +514,12 @@ macro(libgav1_add_tests_targets) | |
400 | libgav1_tests_utils | |
401 | libgav1_utils | |
402 | LIB_DEPS | |
403 | - absl::str_format_internal | |
404 | - absl::time | |
405 | + absl_str_format_internal | |
406 | + absl_strings | |
407 | + absl_time | |
408 | ${libgav1_common_test_absl_deps} | |
409 | - libgav1_gtest | |
410 | - libgav1_gtest_main) | |
411 | + gtest | |
412 | + gtest_main) | |
413 | ||
414 | libgav1_add_executable(TEST | |
415 | NAME | |
416 | @@ -575,11 +536,13 @@ macro(libgav1_add_tests_targets) | |
417 | libgav1_tests_utils | |
418 | libgav1_utils | |
419 | LIB_DEPS | |
420 | - absl::str_format_internal | |
421 | - absl::time | |
422 | + absl_str_format_internal | |
423 | + absl_strings | |
424 | + absl_throw_delegate | |
425 | + absl_time | |
426 | ${libgav1_common_test_absl_deps} | |
427 | - libgav1_gtest | |
428 | - libgav1_gtest_main) | |
429 | + gtest | |
430 | + gtest_main) | |
431 | ||
432 | libgav1_add_executable(TEST | |
433 | NAME | |
434 | @@ -597,11 +560,12 @@ macro(libgav1_add_tests_targets) | |
435 | libgav1_tests_utils | |
436 | libgav1_utils | |
437 | LIB_DEPS | |
438 | - absl::str_format_internal | |
439 | - absl::time | |
440 | + absl_str_format_internal | |
441 | + absl_strings | |
442 | + absl_time | |
443 | ${libgav1_common_test_absl_deps} | |
444 | - libgav1_gtest | |
445 | - libgav1_gtest_main) | |
446 | + gtest | |
447 | + gtest_main) | |
448 | ||
449 | libgav1_add_executable(TEST | |
450 | NAME | |
451 | @@ -618,9 +582,9 @@ macro(libgav1_add_tests_targets) | |
452 | libgav1_tests_utils | |
453 | libgav1_utils | |
454 | LIB_DEPS | |
455 | - absl::str_format_internal | |
456 | - absl::time | |
457 | + absl_str_format_internal | |
458 | + absl_time | |
459 | ${libgav1_common_test_absl_deps} | |
460 | - libgav1_gtest | |
461 | - libgav1_gtest_main) | |
462 | + gtest | |
463 | + gtest_main) | |
464 | endmacro() |