early-access version 2853
This commit is contained in:
pineappleEA
13
externals/vcpkg/ports/tiff/FindCMath.patch
vendored
Executable file
13
externals/vcpkg/ports/tiff/FindCMath.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/cmake/FindCMath.cmake b/cmake/FindCMath.cmake
|
||||
index 2da3b7f..e6d5145 100644
|
||||
--- a/cmake/FindCMath.cmake
|
||||
+++ b/cmake/FindCMath.cmake
|
||||
@@ -32,7 +32,7 @@ include(CheckLibraryExists)
|
||||
|
||||
check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW)
|
||||
if(NOT CMath_HAVE_LIBC_POW)
|
||||
- find_library(CMath_LIBRARY NAMES m)
|
||||
+ find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
|
||||
set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY})
|
||||
14
externals/vcpkg/ports/tiff/android-libm.patch
vendored
Executable file
14
externals/vcpkg/ports/tiff/android-libm.patch
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
diff --color -Naur v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake
|
||||
--- v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake 2022-06-09 13:28:09.894347027 +0200
|
||||
+++ v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake 2022-06-09 13:29:36.220230025 +0200
|
||||
@@ -31,8 +31,9 @@
|
||||
include(CheckLibraryExists)
|
||||
|
||||
check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW)
|
||||
+find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+
|
||||
if(NOT CMath_HAVE_LIBC_POW)
|
||||
- find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
|
||||
set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY})
|
||||
59
externals/vcpkg/ports/tiff/cmakelists.patch
vendored
Executable file
59
externals/vcpkg/ports/tiff/cmakelists.patch
vendored
Executable file
@@ -0,0 +1,59 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 770b0fac..df44e99e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -131,16 +131,28 @@ find_package(CMath REQUIRED)
|
||||
# Release support
|
||||
include(Release)
|
||||
|
||||
+if(MSVC)
|
||||
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
|
||||
+ add_compile_options(/wd4996)
|
||||
+endif()
|
||||
|
||||
# Process subdirectories
|
||||
add_subdirectory(port)
|
||||
add_subdirectory(libtiff)
|
||||
+if(BUILD_TOOLS)
|
||||
add_subdirectory(tools)
|
||||
+endif()
|
||||
+if(BUILD_TESTS)
|
||||
add_subdirectory(test)
|
||||
+endif()
|
||||
+if(BUILD_CONTRIB)
|
||||
add_subdirectory(contrib)
|
||||
add_subdirectory(build)
|
||||
+endif()
|
||||
+if(BUILD_DOCS)
|
||||
add_subdirectory(man)
|
||||
add_subdirectory(html)
|
||||
+endif()
|
||||
|
||||
# pkg-config support
|
||||
include(PkgConfig)
|
||||
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
|
||||
index b6b31677..5c21e29f 100755
|
||||
--- a/libtiff/CMakeLists.txt
|
||||
+++ b/libtiff/CMakeLists.txt
|
||||
@@ -189,7 +189,7 @@ if(CXX_SUPPORT)
|
||||
set(tiffxx_HEADERS
|
||||
tiffio.hxx)
|
||||
|
||||
- add_library(tiffxx ../placeholder.h)
|
||||
+ add_library(tiffxx STATIC ../placeholder.h)
|
||||
target_sources(tiffxx PRIVATE
|
||||
${tiffxx_HEADERS}
|
||||
tif_stream.cxx)
|
||||
@@ -217,6 +217,7 @@ if(CXX_SUPPORT)
|
||||
|
||||
endif()
|
||||
|
||||
+if(NOT CMAKE_CROSSCOMPILING)
|
||||
add_executable(mkg3states ../placeholder.h)
|
||||
target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h)
|
||||
target_link_libraries(mkg3states tiff port)
|
||||
@@ -226,3 +227,4 @@ add_custom_target(faxtable
|
||||
COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c"
|
||||
COMMAND mkg3states -b -c const "tif_fax3sm.c"
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
+endif()
|
||||
95
externals/vcpkg/ports/tiff/portfile.cmake
vendored
Executable file
95
externals/vcpkg/ports/tiff/portfile.cmake
vendored
Executable file
@@ -0,0 +1,95 @@
|
||||
set(LIBTIFF_VERSION 4.4.0)
|
||||
|
||||
vcpkg_from_gitlab(
|
||||
GITLAB_URL https://gitlab.com
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libtiff/libtiff
|
||||
REF v${LIBTIFF_VERSION}
|
||||
SHA512 93955a2b802cf243e41d49048499da73862b5d3ffc005e3eddf0bf948a8bd1537f7c9e7f112e72d082549b4c49e256b9da9a3b6d8039ad8fc5c09a941b7e75d7
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
cmakelists.patch
|
||||
FindCMath.patch
|
||||
android-libm.patch
|
||||
)
|
||||
|
||||
set(EXTRA_OPTIONS "")
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
list(APPEND EXTRA_OPTIONS "-DUSE_WIN32_FILEIO=OFF") # On UWP we use the unix I/O api.
|
||||
endif()
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
cxx cxx
|
||||
jpeg jpeg
|
||||
lzma lzma
|
||||
tools BUILD_TOOLS
|
||||
webp webp
|
||||
zip zlib
|
||||
zstd zstd
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
${EXTRA_OPTIONS}
|
||||
-DBUILD_DOCS=OFF
|
||||
-DBUILD_CONTRIB=OFF
|
||||
-DBUILD_TESTS=OFF
|
||||
-Dlibdeflate=OFF
|
||||
-Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
|
||||
-Djpeg12=OFF
|
||||
-Dlerc=OFF
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
|
||||
OPTIONS_DEBUG
|
||||
-DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only.
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
|
||||
|
||||
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc")
|
||||
if(EXISTS "${_file}")
|
||||
vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd")
|
||||
endif()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
"${CURRENT_PACKAGES_DIR}/share"
|
||||
)
|
||||
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
||||
file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
if ("tools" IN_LIST FEATURES)
|
||||
set(_tools
|
||||
fax2ps
|
||||
fax2tiff
|
||||
pal2rgb
|
||||
ppm2tiff
|
||||
raw2tiff
|
||||
tiff2bw
|
||||
tiff2pdf
|
||||
tiff2ps
|
||||
tiff2rgba
|
||||
tiffcmp
|
||||
tiffcp
|
||||
tiffcrop
|
||||
tiffdither
|
||||
tiffdump
|
||||
tiffinfo
|
||||
tiffmedian
|
||||
tiffset
|
||||
tiffsplit
|
||||
)
|
||||
vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN)
|
||||
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
60
externals/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in
vendored
Executable file
60
externals/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in
vendored
Executable file
@@ -0,0 +1,60 @@
|
||||
cmake_policy(PUSH)
|
||||
cmake_policy(SET CMP0012 NEW)
|
||||
cmake_policy(SET CMP0057 NEW)
|
||||
set(z_vcpkg_tiff_find_options "")
|
||||
if("REQUIRED" IN_LIST ARGS)
|
||||
list(APPEND z_vcpkg_tiff_find_options "REQUIRED")
|
||||
endif()
|
||||
if("QUIET" IN_LIST ARGS)
|
||||
list(APPEND z_vcpkg_tiff_find_options "QUIET")
|
||||
endif()
|
||||
|
||||
_find_package(${ARGS})
|
||||
|
||||
if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
||||
set(z_vcpkg_tiff_link_libraries "")
|
||||
set(z_vcpkg_tiff_libraries "")
|
||||
if(@webp@)
|
||||
find_package(WebP CONFIG ${z_vcpkg_tiff_find_options})
|
||||
list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP)
|
||||
list(APPEND z_vcpkg_tiff_libraries ${WebP_LIBRARIES})
|
||||
endif()
|
||||
if(@lzma@)
|
||||
find_package(LibLZMA ${z_vcpkg_tiff_find_options})
|
||||
list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA)
|
||||
list(APPEND z_vcpkg_tiff_libraries ${LIBLZMA_LIBRARIES})
|
||||
endif()
|
||||
if(@jpeg@)
|
||||
find_package(JPEG ${z_vcpkg_tiff_find_options})
|
||||
list(APPEND z_vcpkg_tiff_link_libraries JPEG::JPEG)
|
||||
list(APPEND z_vcpkg_tiff_libraries ${JPEG_LIBRARIES})
|
||||
endif()
|
||||
if(@zstd@)
|
||||
find_package(ZSTD CONFIG ${z_vcpkg_tiff_find_options})
|
||||
if(TARGET zstd::libzstd_shared)
|
||||
set(z_vcpkg_tiff_zstd zstd::libzstd_shared)
|
||||
else()
|
||||
set(z_vcpkg_tiff_zstd zstd::libzstd_static)
|
||||
endif()
|
||||
list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd})
|
||||
list(APPEND z_vcpkg_tiff_libraries ${z_vcpkg_tiff_zstd})
|
||||
endif()
|
||||
if(@zlib@)
|
||||
find_package(ZLIB ${z_vcpkg_tiff_find_options})
|
||||
list(APPEND z_vcpkg_tiff_link_libraries ZLIB::ZLIB)
|
||||
list(APPEND z_vcpkg_tiff_libraries ${ZLIB_LIBRARIES})
|
||||
endif()
|
||||
if(UNIX)
|
||||
list(APPEND z_vcpkg_tiff_link_libraries m)
|
||||
list(APPEND z_vcpkg_tiff_libraries m)
|
||||
endif()
|
||||
|
||||
if(TARGET TIFF::TIFF)
|
||||
set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries})
|
||||
endif()
|
||||
list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries})
|
||||
unset(z_vcpkg_tiff_link_libraries)
|
||||
unset(z_vcpkg_tiff_libraries)
|
||||
endif()
|
||||
unset(z_vcpkg_tiff_find_options)
|
||||
cmake_policy(POP)
|
||||
62
externals/vcpkg/ports/tiff/vcpkg.json
vendored
Executable file
62
externals/vcpkg/ports/tiff/vcpkg.json
vendored
Executable file
@@ -0,0 +1,62 @@
|
||||
{
|
||||
"name": "tiff",
|
||||
"version": "4.4.0",
|
||||
"port-version": 1,
|
||||
"description": "A library that supports the manipulation of TIFF image files",
|
||||
"homepage": "https://libtiff.gitlab.io/libtiff/",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"jpeg",
|
||||
"lzma",
|
||||
"zip"
|
||||
],
|
||||
"features": {
|
||||
"cxx": {
|
||||
"description": "Build C++ libtiffxx library",
|
||||
"supports": "!arm"
|
||||
},
|
||||
"jpeg": {
|
||||
"description": "Support JPEG compression in TIFF image files",
|
||||
"dependencies": [
|
||||
"libjpeg-turbo"
|
||||
]
|
||||
},
|
||||
"lzma": {
|
||||
"description": "Support LZMA compression in TIFF image files",
|
||||
"dependencies": [
|
||||
"liblzma"
|
||||
]
|
||||
},
|
||||
"tools": {
|
||||
"description": "Build tools"
|
||||
},
|
||||
"webp": {
|
||||
"description": "Support WEBP compression in TIFF image files",
|
||||
"dependencies": [
|
||||
"libwebp"
|
||||
]
|
||||
},
|
||||
"zip": {
|
||||
"description": "Support ZIP/deflate compression in TIFF image files",
|
||||
"dependencies": [
|
||||
"zlib"
|
||||
]
|
||||
},
|
||||
"zstd": {
|
||||
"description": "Support ZSTD compression in TIFF image files",
|
||||
"dependencies": [
|
||||
"zstd"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user