mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 13:13:34 +08:00
[libjpeg-turbo] Upgrade to 2.1.2 (#22156)
* Upgrade libjpeg-turbo to 2.1.2 * Update version files * Update to latest vcpkg functions * Format/version * Fix * Update ports/libjpeg-turbo/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * CR * Fix version * Update patch * Fix * Version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
This commit is contained in:
Johannes Schönberger
GitHub
parent
92f4679cbd
commit
d843856f29
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d80af40..361ecae 100644
|
||||
index 10a198f..68ac5a3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
|
||||
@@ -168,6 +168,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
|
||||
boolean_number(ENABLE_SHARED)
|
||||
option(ENABLE_STATIC "Build static libraries" TRUE)
|
||||
boolean_number(ENABLE_STATIC)
|
||||
@ -15,62 +15,39 @@ index d80af40..361ecae 100644
|
||||
option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE)
|
||||
boolean_number(REQUIRE_SIMD)
|
||||
option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
|
||||
@@ -593,18 +599,20 @@ if(WITH_TURBOJPEG)
|
||||
@@ -634,6 +640,7 @@ if(WITH_TURBOJPEG)
|
||||
LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
|
||||
endif()
|
||||
|
||||
- add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
|
||||
- target_link_libraries(tjunittest turbojpeg)
|
||||
+ if(ENABLE_EXECUTABLES)
|
||||
+ add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
|
||||
+ target_link_libraries(tjunittest turbojpeg)
|
||||
add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
|
||||
target_link_libraries(tjunittest turbojpeg)
|
||||
|
||||
- add_executable(tjbench tjbench.c tjutil.c)
|
||||
- target_link_libraries(tjbench turbojpeg)
|
||||
- if(UNIX)
|
||||
- target_link_libraries(tjbench m)
|
||||
- endif()
|
||||
+ add_executable(tjbench tjbench.c tjutil.c)
|
||||
+ target_link_libraries(tjbench turbojpeg)
|
||||
+ if(UNIX)
|
||||
+ target_link_libraries(tjbench m)
|
||||
+ endif()
|
||||
|
||||
- add_executable(tjexample tjexample.c)
|
||||
- target_link_libraries(tjexample turbojpeg)
|
||||
- endif()
|
||||
+ add_executable(tjexample tjexample.c)
|
||||
+ target_link_libraries(tjexample turbojpeg)
|
||||
+ endif()
|
||||
+ endif()
|
||||
@@ -646,6 +653,7 @@ if(WITH_TURBOJPEG)
|
||||
add_executable(tjexample tjexample.c)
|
||||
target_link_libraries(tjexample turbojpeg)
|
||||
endif()
|
||||
+ endif()
|
||||
|
||||
if(ENABLE_STATIC)
|
||||
add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
|
||||
@@ -616,14 +624,16 @@ if(WITH_TURBOJPEG)
|
||||
@@ -657,6 +665,7 @@ if(WITH_TURBOJPEG)
|
||||
set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
|
||||
endif()
|
||||
|
||||
- add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
|
||||
- md5/md5hl.c)
|
||||
- target_link_libraries(tjunittest-static turbojpeg-static)
|
||||
+ if(ENABLE_EXECUTABLES)
|
||||
+ add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
|
||||
+ md5/md5hl.c)
|
||||
+ target_link_libraries(tjunittest-static turbojpeg-static)
|
||||
|
||||
- add_executable(tjbench-static tjbench.c tjutil.c)
|
||||
- target_link_libraries(tjbench-static turbojpeg-static)
|
||||
- if(UNIX)
|
||||
- target_link_libraries(tjbench-static m)
|
||||
+ add_executable(tjbench-static tjbench.c tjutil.c)
|
||||
+ target_link_libraries(tjbench-static turbojpeg-static)
|
||||
+ if(UNIX)
|
||||
+ target_link_libraries(tjbench-static m)
|
||||
+ endif()
|
||||
add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
|
||||
md5/md5hl.c)
|
||||
target_link_libraries(tjunittest-static turbojpeg-static)
|
||||
@@ -666,6 +675,7 @@ if(WITH_TURBOJPEG)
|
||||
if(UNIX)
|
||||
target_link_libraries(tjbench-static m)
|
||||
endif()
|
||||
+ endif()
|
||||
endif()
|
||||
endif()
|
||||
@@ -639,7 +649,7 @@ else()
|
||||
|
||||
@@ -680,7 +690,7 @@ else()
|
||||
set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
|
||||
endif()
|
||||
|
||||
@ -79,169 +56,120 @@ index d80af40..361ecae 100644
|
||||
add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
|
||||
${CJPEG_BMP_SOURCES})
|
||||
set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
|
||||
@@ -655,9 +665,10 @@ if(ENABLE_STATIC)
|
||||
@@ -696,10 +706,11 @@ if(ENABLE_STATIC)
|
||||
set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
|
||||
endif()
|
||||
|
||||
-add_executable(rdjpgcom rdjpgcom.c)
|
||||
-
|
||||
-add_executable(wrjpgcom wrjpgcom.c)
|
||||
+if(ENABLE_EXECUTABLES)
|
||||
+ add_executable(rdjpgcom rdjpgcom.c)
|
||||
+ add_executable(wrjpgcom wrjpgcom.c)
|
||||
add_executable(rdjpgcom rdjpgcom.c)
|
||||
|
||||
add_executable(wrjpgcom wrjpgcom.c)
|
||||
-
|
||||
+endif()
|
||||
|
||||
|
||||
###############################################################################
|
||||
@@ -1337,10 +1348,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
|
||||
|
||||
if(WITH_TURBOJPEG)
|
||||
if(ENABLE_SHARED)
|
||||
- install(TARGETS turbojpeg tjbench
|
||||
+ install(TARGETS turbojpeg
|
||||
# TESTS
|
||||
@@ -1434,8 +1445,10 @@ if(WITH_TURBOJPEG)
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+ if(ENABLE_EXECUTABLES)
|
||||
+ install(TARGETS tjbench
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS tjbench
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+ endif()
|
||||
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
|
||||
CMAKE_C_LINKER_SUPPORTS_PDB)
|
||||
install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
|
||||
@@ -1350,7 +1365,7 @@ if(WITH_TURBOJPEG)
|
||||
if(ENABLE_STATIC)
|
||||
install(TARGETS turbojpeg-static ARCHIVE
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
@@ -1446,7 +1459,7 @@ if(WITH_TURBOJPEG)
|
||||
install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
|
||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
- if(NOT ENABLE_SHARED)
|
||||
+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
|
||||
if(MSVC_IDE OR XCODE)
|
||||
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
|
||||
else()
|
||||
@@ -1360,13 +1375,15 @@ if(WITH_TURBOJPEG)
|
||||
@@ -1456,15 +1469,17 @@ if(WITH_TURBOJPEG)
|
||||
DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
|
||||
endif()
|
||||
endif()
|
||||
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
|
||||
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
+ if(INSTALL_HEADERS)
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
if(ENABLE_STATIC)
|
||||
install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
|
||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
- if(NOT ENABLE_SHARED)
|
||||
+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
|
||||
if(MSVC_IDE OR XCODE)
|
||||
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
|
||||
else()
|
||||
@@ -1381,21 +1398,25 @@ if(ENABLE_STATIC)
|
||||
@@ -1479,8 +1494,11 @@ if(ENABLE_STATIC)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+if(ENABLE_EXECUTABLES)
|
||||
+ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+endif()
|
||||
|
||||
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
-if(WITH_JAVA)
|
||||
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
|
||||
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
+if(INSTALL_DOCS)
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
+ if(WITH_JAVA)
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
|
||||
+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
+ endif()
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
|
||||
@@ -1492,8 +1510,9 @@ if(WITH_JAVA)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
|
||||
DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
-if(UNIX OR MINGW)
|
||||
+if((UNIX OR MINGW) AND INSTALL_DOCS)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
|
||||
@@ -1406,10 +1427,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
@@ -1511,10 +1530,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
|
||||
NAMESPACE ${CMAKE_PROJECT_NAME}::
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
|
||||
|
||||
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
|
||||
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
+if(INSTALL_HEADERS)
|
||||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
+endif()
|
||||
|
||||
include(cmakescripts/BuildPackages.cmake)
|
||||
|
||||
diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
|
||||
index a5c4e39..794c2af 100644
|
||||
index 78a2f28..e653b2d 100644
|
||||
--- a/sharedlib/CMakeLists.txt
|
||||
+++ b/sharedlib/CMakeLists.txt
|
||||
@@ -71,27 +71,35 @@ else()
|
||||
@@ -71,6 +71,7 @@ else()
|
||||
set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
|
||||
endif()
|
||||
|
||||
-add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
|
||||
- ../rdswitch.c ${CJPEG_BMP_SOURCES})
|
||||
-set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
|
||||
-target_link_libraries(cjpeg jpeg)
|
||||
+if(ENABLE_EXECUTABLES)
|
||||
+ add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
|
||||
+ ../rdswitch.c ${CJPEG_BMP_SOURCES})
|
||||
+ set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
|
||||
+ target_link_libraries(cjpeg jpeg)
|
||||
add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
|
||||
../rdswitch.c ${CJPEG_BMP_SOURCES})
|
||||
set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
|
||||
@@ -87,14 +88,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
|
||||
|
||||
-add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
|
||||
- ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
|
||||
-set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
|
||||
-target_link_libraries(djpeg jpeg)
|
||||
+ add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
|
||||
+ ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
|
||||
+ set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
|
||||
+ target_link_libraries(djpeg jpeg)
|
||||
|
||||
-add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
|
||||
-target_link_libraries(jpegtran jpeg)
|
||||
-set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
|
||||
+ add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
|
||||
+ target_link_libraries(jpegtran jpeg)
|
||||
+ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
|
||||
|
||||
-add_executable(jcstest ../jcstest.c)
|
||||
-target_link_libraries(jcstest jpeg)
|
||||
+ add_executable(jcstest ../jcstest.c)
|
||||
+ target_link_libraries(jcstest jpeg)
|
||||
add_executable(jcstest ../jcstest.c)
|
||||
target_link_libraries(jcstest jpeg)
|
||||
+endif()
|
||||
|
||||
-install(TARGETS jpeg cjpeg djpeg jpegtran
|
||||
+install(TARGETS jpeg
|
||||
install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets
|
||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+if(ENABLE_EXECUTABLES)
|
||||
+ install(TARGETS cjpeg djpeg jpegtran
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install(TARGETS cjpeg djpeg jpegtran
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+endif()
|
||||
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
|
||||
CMAKE_C_LINKER_SUPPORTS_PDB)
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/tjutil.h b/tjutil.h
|
||||
index f72840c..a3ae19f 100644
|
||||
--- a/tjutil.h
|
||||
+++ b/tjutil.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#ifndef __MINGW32__
|
||||
#include <stdio.h>
|
||||
#define snprintf(str, n, format, ...) \
|
||||
- _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
|
||||
+ _snprintf_s(str, n, _TRUNCATE, format, ## __VA_ARGS__)
|
||||
#endif
|
||||
#define strcasecmp stricmp
|
||||
#define strncasecmp strnicmp
|
||||
@ -5,14 +5,13 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libjpeg-turbo/libjpeg-turbo
|
||||
REF 10ba6ed3365615ed5c2995fe2d240cb2d5000173 # 2.0.6
|
||||
SHA512 219d01907e66dd0fc20ea13cfa51a8efee305810f1245d0648b6ad8ee3cf11bf0bbd43b1ceeeb142a6ebbbfa281ec6a3b4e283b2fc343c360cd3ad29e9d42528
|
||||
REF ecf021bc0d6f435daacff7c35ccaeef0145df1b9 # 2.1.2
|
||||
SHA512 74ca399599f785e8c8c271f57f73c17acf6eadbd27c0c62aa1f95bbcb51542fd92aa19b4beee811c73902085fbcd365236dcc579726372c09fa9b12c2599d0f5
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
add-options-for-exes-docs-headers.patch
|
||||
#workaround for vcpkg bug see #5697 on github for more information
|
||||
# workaround for vcpkg bug see #5697 on github for more information
|
||||
workaround_cmake_system_processor.patch
|
||||
fix-incompatibility-for-c11-c17.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
|
||||
@ -38,9 +37,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
jpeg8 WITH_JPEG8
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DENABLE_STATIC=${ENABLE_STATIC}
|
||||
-DENABLE_SHARED=${ENABLE_SHARED}
|
||||
@ -55,7 +53,7 @@ vcpkg_configure_cmake(
|
||||
WITH_CRT_DLL
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
|
||||
# Rename libraries for static builds
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
@ -72,14 +70,16 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
endif()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/share/man")
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg)
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jpeg")
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@ -1,9 +1,18 @@
|
||||
{
|
||||
"name": "libjpeg-turbo",
|
||||
"version": "2.0.6",
|
||||
"port-version": 3,
|
||||
"version": "2.1.2",
|
||||
"description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.",
|
||||
"homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"jpeg7": {
|
||||
"description": "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b2f137a..3754095 100644
|
||||
index 6dd83d3a..5cd717f5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
|
||||
@@ -54,7 +54,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
|
||||
|
||||
# Detect CPU type and whether we're building 64-bit or 32-bit code
|
||||
math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8")
|
||||
-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC)
|
||||
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC)
|
||||
if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR
|
||||
CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR
|
||||
CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR
|
||||
set(COUNT 1)
|
||||
foreach(ARCH ${CMAKE_OSX_ARCHITECTURES})
|
||||
if(COUNT GREATER 1)
|
||||
|
||||
@ -3593,8 +3593,8 @@
|
||||
"port-version": 3
|
||||
},
|
||||
"libjpeg-turbo": {
|
||||
"baseline": "2.0.6",
|
||||
"port-version": 3
|
||||
"baseline": "2.1.2",
|
||||
"port-version": 0
|
||||
},
|
||||
"libjuice": {
|
||||
"baseline": "0.9.1",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b37f789a1bb562a1469e0c30cf195c641ab824a6",
|
||||
"version": "2.1.2",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "1f10cf90b5807f4b4b98cc82786236002e85b9ac",
|
||||
"version": "2.0.6",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user