[simage] update version to 1.8.2 (#24125)

* Update simage port for version 1.8.2

* Correction of Fatal message in patch file.

* Update version database

* Added license entry.

* Update version database

* Corrected port version number

* Corrected vcpkg port versioning.

* Corrected hash.
This commit is contained in:
ChrisSchulte 2022-04-28 03:55:39 +02:00 committed by GitHub
parent 05c93c5c5a
commit c203e35d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 18 deletions

View File

@ -1,10 +1,10 @@
set(SIMAGE_VERSION 1.8.1)
set(SIMAGE_VERSION 1.8.2)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Coin3D/simage
REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1
SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1
REF 3940692136e02b9e62b3061cf72f053827b5494e #v1.8.2
SHA512 9a39738e32004bdd3e2882fe96778c773758b6d74398a62ba1c5ab09836c0637f89b8a46e8485b9d4196f33864f31f75511f441cfc24d7536659fa610ddf1875
HEAD_REF master
PATCHES requies-all-dependencies.patch
)

View File

@ -1,21 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d869715..073a73f 100644
index ef92706..fee22e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,10 +117,10 @@ endif()
# On Windows GDI+ supports GIF, JPEG, EXIF, PNG, and TIFF.
# see https://docs.microsoft.com/en-us/windows/desktop/gdiplus/-gdiplus-types-of-bitmaps-about
if(SIMAGE_USE_GDIPLUS)
- find_package(GdiPlus)
+ find_package(GdiPlus REQUIRED)
@@ -129,6 +129,9 @@ if(SIMAGE_USE_GDIPLUS)
}
" GDIPLUS_FOUND)
unset(CMAKE_REQUIRED_LIBRARIES)
+ if(NOT GDIPLUS_FOUND)
+ message(FATAL_ERROR "GDI+ is required on Windows.")
+ endif()
endif()
if(SIMAGE_USE_AVIENC)
- find_package(Vfw)
+ find_package(Vfw REQUIRED)
set(CMAKE_REQUIRED_LIBRARIES vfw32)
@@ -142,6 +145,9 @@ if(SIMAGE_USE_AVIENC)
}
" VFW_FOUND)
unset(CMAKE_REQUIRED_LIBRARIES)
+ if(NOT VFW_FOUND)
+ message(FATAL_ERROR "Video for Windows is required on Windows.")
+ endif()
endif()
# On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA.
@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT)
@@ -286,7 +292,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT)
find_package(Ogg REQUIRED)
find_package(Vorbis REQUIRED)
if(OGG_FOUND)
@ -24,7 +31,7 @@ index d869715..073a73f 100644
endif()
endif()
@@ -287,8 +287,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD
@@ -306,8 +312,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD
if(SIMAGE_TIFF_SUPPORT)
find_package(TIFF REQUIRED)
if(TIFF_FOUND)

View File

@ -1,9 +1,9 @@
{
"name": "simage",
"version-semver": "1.8.1",
"port-version": 4,
"version-semver": "1.8.2",
"description": "Image file format library abstraction layer",
"homepage": "https://github.com/coin3d/simage",
"license": null,
"supports": "!uwp",
"dependencies": [
{

View File

@ -6489,8 +6489,8 @@
"port-version": 4
},
"simage": {
"baseline": "1.8.1",
"port-version": 4
"baseline": "1.8.2",
"port-version": 0
},
"simbody": {
"baseline": "2022-01-04",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9a3815e60349ce152d08a7f02abab301e3b6bceb",
"version-semver": "1.8.2",
"port-version": 0
},
{
"git-tree": "6c2ccc36f5c1ebb27f820fe4f6e89df014e4bafa",
"version-semver": "1.8.1",