Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changes: https://aomedia.googlesource.com/aom/+log/v3.7.0-rc1..v3.7.0 Reported by: Repology, portscout
- Loading branch information
Showing
4 changed files
with
10 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1692048167 | ||
SHA256 (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 99fad4d57a763f105b080c6ea483be2287a62929777319e293610618c3369063 | ||
SIZE (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 5355997 | ||
TIMESTAMP = 1692990361 | ||
SHA256 (jbeich-aom-v3.7.0_GH0.tar.gz) = f308f0df938233bc37b7d3f463bc877319e60811f1ff82f2a81acfb882b54368 | ||
SIZE (jbeich-aom-v3.7.0_GH0.tar.gz) = 5355031 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,18 @@ | ||
- Add missing dependency for aom_static used by ENABLE_EXAMPLES | ||
- Drop unused static libhwy dependency when using shared libjxl | ||
|
||
--- CMakeLists.txt.orig 2023-08-14 21:22:47 UTC | ||
--- CMakeLists.txt.orig 2022-06-16 19:13:50 UTC | ||
+++ CMakeLists.txt | ||
@@ -568,17 +568,14 @@ if(CONFIG_AV1_ENCODER) | ||
target_include_directories(aom_dsp_encoder PRIVATE ${LIBJXL_INCLUDE_DIRS}) | ||
else() | ||
pkg_check_modules(LIBJXL REQUIRED libjxl) | ||
+ if(BUILD_SHARED_LIBS) | ||
+ target_link_libraries(aom_static | ||
+ PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIES}) | ||
+ endif() | ||
target_link_libraries(aom PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIES}) | ||
target_include_directories(aom_dsp_encoder PRIVATE ${LIBJXL_INCLUDE_DIRS}) | ||
@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER) | ||
if(LIBJXL_CFLAGS) | ||
append_compiler_flag("${LIBJXL_CFLAGS}") | ||
- endif() | ||
endif() | ||
- pkg_check_modules(LIBHWY REQUIRED libhwy) | ||
- target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS} ${LIBHWY_LIBRARIES}) | ||
- target_include_directories(aom_dsp_encoder | ||
- PRIVATE ${LIBLIBHWY_INCLUDE_DIRS}) | ||
- if(LIBHWY_CFLAGS) | ||
- append_compiler_flag("${LIBHWY_CFLAGS}") | ||
endif() | ||
- endif() | ||
endif() | ||
|
||
set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters