Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg baseline][simage] Update to 1.8.1 #18645

Merged
merged 19 commits into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions ports/simage/CONTROL

This file was deleted.

10 changes: 0 additions & 10 deletions ports/simage/disable-cpackd.patch

This file was deleted.

44 changes: 0 additions & 44 deletions ports/simage/disable-examples.patch

This file was deleted.

49 changes: 0 additions & 49 deletions ports/simage/disable-tests.patch

This file was deleted.

60 changes: 0 additions & 60 deletions ports/simage/link-flac-library.patch

This file was deleted.

14 changes: 0 additions & 14 deletions ports/simage/link-math-library.patch

This file was deleted.

16 changes: 0 additions & 16 deletions ports/simage/link-ogg-library.patch

This file was deleted.

97 changes: 56 additions & 41 deletions ports/simage/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,64 +1,79 @@
vcpkg_fail_port_install(ON_TARGET "uwp")

set(SIMAGE_VERSION 1.8.1)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Coin3D/simage
REF simage-1.8.0
SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c
REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1
SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1
HEAD_REF master
PATCHES
disable-cpackd.patch
disable-examples.patch
disable-tests.patch
link-flac-library.patch
link-math-library.patch
link-ogg-library.patch
potentially-uninitialized-local-pointer-variable.patch
PATCHES requies-all-dependencies.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(SIMAGE_BUILD_SHARED_LIBS OFF)
else()
set(SIMAGE_BUILD_SHARED_LIBS ON)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SIMAGE_BUILD_SHARED_LIBS)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMAGE_USE_STATIC_LIBS)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNTIME)

set(OSX_OR_WINDOWS OFF)
if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX)
set(OSX_OR_WINDOWS ON)
endif()

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
set(SIMAGE_USE_AVIENC ON)
set(SIMAGE_USE_GDIPLUS ON)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
oggvorbis SIMAGE_OGGVORBIS_SUPPORT
sndfile SIMAGE_LIBSNDFILE_SUPPORT
)

# Depends on the platform
if(VCPKG_TARGET_IS_WINDOWS)
set(SIMAGE_ON_WIN ON)
set(SIMAGE_ON_NON_WIN OFF)
else()
set(SIMAGE_USE_AVIENC OFF)
set(SIMAGE_USE_GDIPLUS OFF)
set(SIMAGE_ON_WIN OFF)
set(SIMAGE_ON_NON_WIN ON)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS}
-DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC}
-DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS}
-DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS}
-DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS}
-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS}
-DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS}
-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS}
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
OPTIONS ${FEATURE_OPTIONS}
-DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS}
-DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS}
-DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME}
-DSIMAGE_USE_AVIENC=${SIMAGE_ON_WIN}
-DSIMAGE_USE_GDIPLUS=${SIMAGE_ON_WIN}
# Available on Linux, OSX and Windows without gdiplus
-DSIMAGE_ZLIB_SUPPORT=${SIMAGE_ON_NON_WIN}
-DSIMAGE_GIF_SUPPORT=${SIMAGE_ON_NON_WIN}
-DSIMAGE_JPEG_SUPPORT=${SIMAGE_ON_NON_WIN}
-DSIMAGE_PNG_SUPPORT=${SIMAGE_ON_NON_WIN}
-DSIMAGE_TIFF_SUPPORT=${SIMAGE_ON_NON_WIN}
#
-DSIMAGE_USE_CGIMAGE=OFF
-DSIMAGE_USE_QIMAGE=OFF
-DSIMAGE_USE_QT6=OFF
-DSIMAGE_USE_QT5=OFF
-DSIMAGE_USE_CPACK=OFF
-DSIMAGE_LIBJASPER_SUPPORT=OFF
-DSIMAGE_EPS_SUPPORT=OFF
-DSIMAGE_MPEG2ENC_SUPPORT=OFF
-DSIMAGE_PIC_SUPPORT=OFF
-DSIMAGE_RGB_SUPPORT=OFF
-DSIMAGE_XWD_SUPPORT=OFF
-DSIMAGE_TGA_SUPPORT=OFF
-DSIMAGE_BUILD_MSVC_MP=OFF
-DSIMAGE_BUILD_EXAMPLES=OFF
-DSIMAGE_BUILD_TESTS=OFF
-DSIMAGE_BUILD_DOCUMENTATION=OFF
)

vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-1.8.0)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION})

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN)
endif()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

This file was deleted.

37 changes: 37 additions & 0 deletions ports/simage/requies-all-dependencies.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d869715..073a73f 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)
endif()
if(SIMAGE_USE_AVIENC)
- find_package(Vfw)
+ find_package(Vfw REQUIRED)
endif()

# On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA.
@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT)
find_package(Ogg REQUIRED)
find_package(Vorbis REQUIRED)
if(OGG_FOUND)
- find_package(Opus)
+ find_package(Opus REQUIRED)
endif()
endif()

@@ -287,8 +287,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)
- find_package(LibLZMA)
- find_package(Zstd)
+ find_package(LibLZMA REQUIRED)
+ find_package(Zstd REQUIRED)
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
endif()
endif()