mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:39:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8412 from Deledrius/libjpeg-turbo-2.0.3

Browse Source 
[libjpeg-turbo] Update to 2.0.3.
This commit is contained in:
Victor Romero 2019-10-09 21:33:08 -07:00 committed by GitHub
commit 2b049c47b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libjpeg-turbo/CONTROL
View File

@ -1,4 +1,4 @@
Source: libjpeg-turbo Source: libjpeg-turbo
Version: 2.0.2 Version: 2.0.3
Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo
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. 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.

16
ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9d2d40..c868862 100644 index d80af40..361ecae 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) @@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
@ -93,7 +93,7 @@ index b9d2d40..c868862 100644
############################################################################### ###############################################################################
@@ -1328,10 +1339,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX}) @@ -1337,10 +1348,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
if(WITH_TURBOJPEG) if(WITH_TURBOJPEG)
if(ENABLE_SHARED) if(ENABLE_SHARED)
@ -109,16 +109,16 @@ index b9d2d40..c868862 100644
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
CMAKE_C_LINKER_SUPPORTS_PDB) CMAKE_C_LINKER_SUPPORTS_PDB)
install(FILES "$<TARGET_PDB_FILE:turbojpeg>" install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
@@ -1341,7 +1356,7 @@ if(WITH_TURBOJPEG) @@ -1350,7 +1365,7 @@ if(WITH_TURBOJPEG)
if(ENABLE_STATIC) if(ENABLE_STATIC)
install(TARGETS turbojpeg-static ARCHIVE install(TARGETS turbojpeg-static ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR}) DESTINATION ${CMAKE_INSTALL_LIBDIR})
- if(NOT ENABLE_SHARED) - if(NOT ENABLE_SHARED)
+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) + if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
if(MSVC_IDE) if(MSVC_IDE OR XCODE)
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
else() else()
@@ -1351,13 +1366,15 @@ if(WITH_TURBOJPEG) @@ -1360,13 +1375,15 @@ if(WITH_TURBOJPEG)
DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE}) DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
endif() endif()
endif() endif()
@ -134,10 +134,10 @@ index b9d2d40..c868862 100644
install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- if(NOT ENABLE_SHARED) - if(NOT ENABLE_SHARED)
+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) + if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
if(MSVC_IDE) if(MSVC_IDE OR XCODE)
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
else() else()
@@ -1372,21 +1389,25 @@ if(ENABLE_STATIC) @@ -1381,21 +1398,25 @@ if(ENABLE_STATIC)
endif() endif()
endif() endif()
@ -175,7 +175,7 @@ index b9d2d40..c868862 100644
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1 ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
@@ -1397,10 +1418,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc @@ -1406,10 +1427,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

4
ports/libjpeg-turbo/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO libjpeg-turbo/libjpeg-turbo REPO libjpeg-turbo/libjpeg-turbo
REF 2.0.2 REF 2.0.3
SHA512 4dcde37ba014500cee69f7d49b359112655c177cf2c0003b4693bfe25f8a55147e9a87f58d31b4fc952a7faed6fecd5087220fd879110ade326922991f11c423 SHA512 745cc3d50b43dd84721bc3c341d561ffd7f54eda5bbe2d56cad62f4b51ea76da3b18aba9ca694a9db79379aba7a9971cb146387979e96ca6ece950871276cf2f
HEAD_REF master HEAD_REF master
PATCHES PATCHES
add-options-for-exes-docs-headers.patch add-options-for-exes-docs-headers.patch