Skip to content

Commit

Permalink
(#10625) sail: Bump version to 0.9.0-pre23 with a critical fix in C++…
Browse files Browse the repository at this point in the history
… variant

* Update SAIL to 0.9.0-pre23 with a critical fix in C++ variant

* Fixed avif patch

* Remove 0.9.0-pre22 because of the C++ variant critical bug
  • Loading branch information
HappySeaFox authored May 9, 2022
1 parent 7cac22f commit 78d4300
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
10 changes: 5 additions & 5 deletions recipes/sail/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sources:
"0.9.0-pre22":
url: "https://github.com/smoked-herring/sail/archive/v0.9.0-pre22.tar.gz"
sha256: "3328cf91a436ed2a856942577e5ab8bdc92845a5a5a31d3116bf660df873b5a7"
"0.9.0-pre23":
url: "https://github.com/smoked-herring/sail/archive/v0.9.0-pre23.tar.gz"
sha256: "6c5314561fda3d388b4653e7424cdf2ae2c65767e79203576804ca41fc930a6b"
patches:
"0.9.0-pre22":
- patch_file: "patches/0.9.0-pre22-avif-find-package.patch"
"0.9.0-pre23":
- patch_file: "patches/0.9.0-pre23-avif-find-package.patch"
base_path: "src"
22 changes: 0 additions & 22 deletions recipes/sail/all/patches/0.9.0-pre22-avif-find-package.patch

This file was deleted.

22 changes: 22 additions & 0 deletions recipes/sail/all/patches/0.9.0-pre23-avif-find-package.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/sail-codecs/avif/CMakeLists.txt b/src/sail-codecs/avif/CMakeLists.txt
index 870de541..1fe5a7e7 100644
--- a/src/sail-codecs/avif/CMakeLists.txt
+++ b/src/sail-codecs/avif/CMakeLists.txt
@@ -1,7 +1,6 @@
-find_library(AVIF_LIBRARY avif)
-find_path(AVIF_INCLUDE_DIRS avif/avif.h)
+find_package(libavif CONFIG)

-if (NOT AVIF_LIBRARY OR NOT AVIF_INCLUDE_DIRS)
+if (NOT libavif_FOUND)
return()
endif()

@@ -18,5 +17,5 @@ set(SAIL_CODECS_FIND_DEPENDENCIES ${SAIL_CODECS_FIND_DEPENDENCIES} "find_depende
sail_codec(NAME avif
SOURCES helpers.h helpers.c io.h io.c avif.c
ICON avif.png
- DEPENDENCY_INCLUDE_DIRS ${AVIF_INCLUDE_DIRS}
- DEPENDENCY_LIBS ${AVIF_LIBRARY})
+ DEPENDENCY_INCLUDE_DIRS ${avif_INCLUDE_DIRS}
+ DEPENDENCY_LIBS avif)
2 changes: 1 addition & 1 deletion recipes/sail/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
versions:
"0.9.0-pre22":
"0.9.0-pre23":
folder: all

0 comments on commit 78d4300

Please sign in to comment.