Skip to content

Commit

Permalink
[libjpeg-turbo] update to 2.1.5 (#29352)
Browse files Browse the repository at this point in the history
* [libjpeg-turbo] update to 2.1.5

* update version

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
  • Loading branch information
JonLiu1993 and BillyONeal committed Feb 3, 2023
1 parent 1d3ba87 commit a7c0f2b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 24 deletions.
38 changes: 19 additions & 19 deletions ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10a198f..68ac5a3 100644
index 3730326..f5958eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
@@ -194,6 +194,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
boolean_number(ENABLE_SHARED)
option(ENABLE_STATIC "Build static libraries" TRUE)
boolean_number(ENABLE_STATIC)
Expand All @@ -15,39 +15,39 @@ index 10a198f..68ac5a3 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)
@@ -634,6 +640,7 @@ if(WITH_TURBOJPEG)
@@ -664,6 +670,7 @@ if(WITH_TURBOJPEG)
LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
endif()

+ if(ENABLE_EXECUTABLES)
add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
target_link_libraries(tjunittest turbojpeg)

@@ -646,6 +653,7 @@ if(WITH_TURBOJPEG)
@@ -676,6 +683,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>
@@ -657,6 +665,7 @@ if(WITH_TURBOJPEG)
@@ -687,6 +695,7 @@ if(WITH_TURBOJPEG)
set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
endif()

+ if(ENABLE_EXECUTABLES)
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)
@@ -696,6 +705,7 @@ if(WITH_TURBOJPEG)
if(UNIX)
target_link_libraries(tjbench-static m)
endif()
+ endif()
endif()
endif()

@@ -680,7 +690,7 @@ else()
@@ -710,7 +720,7 @@ else()
set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
endif()

Expand All @@ -56,7 +56,7 @@ index 10a198f..68ac5a3 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})
@@ -696,10 +706,11 @@ if(ENABLE_STATIC)
@@ -726,10 +736,11 @@ if(ENABLE_STATIC)
set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
endif()

Expand All @@ -69,7 +69,7 @@ index 10a198f..68ac5a3 100644

###############################################################################
# TESTS
@@ -1434,8 +1445,10 @@ if(WITH_TURBOJPEG)
@@ -1466,8 +1477,10 @@ if(WITH_TURBOJPEG)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
Expand All @@ -80,16 +80,16 @@ index 10a198f..68ac5a3 100644
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
CMAKE_C_LINKER_SUPPORTS_PDB)
install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
@@ -1446,7 +1459,7 @@ if(WITH_TURBOJPEG)
@@ -1478,7 +1491,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)
if(GENERATOR_IS_MULTI_CONFIG)
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
else()
@@ -1456,15 +1469,17 @@ if(WITH_TURBOJPEG)
@@ -1488,15 +1501,17 @@ if(WITH_TURBOJPEG)
DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
endif()
endif()
Expand All @@ -105,10 +105,10 @@ index 10a198f..68ac5a3 100644
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- if(NOT ENABLE_SHARED)
+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
if(MSVC_IDE OR XCODE)
if(GENERATOR_IS_MULTI_CONFIG)
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
else()
@@ -1479,8 +1494,11 @@ if(ENABLE_STATIC)
@@ -1511,8 +1526,11 @@ if(ENABLE_STATIC)
endif()
endif()

Expand All @@ -120,7 +120,7 @@ index 10a198f..68ac5a3 100644
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)
@@ -1524,8 +1542,9 @@ if(WITH_JAVA)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
DESTINATION ${CMAKE_INSTALL_DOCDIR})
endif()
Expand All @@ -131,7 +131,7 @@ index 10a198f..68ac5a3 100644
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
@@ -1511,10 +1530,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
@@ -1546,10 +1565,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
NAMESPACE ${CMAKE_PROJECT_NAME}::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})

Expand All @@ -145,18 +145,18 @@ index 10a198f..68ac5a3 100644
include(cmakescripts/BuildPackages.cmake)

diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
index 78a2f28..e653b2d 100644
index aea0b9d..069dbe2 100644
--- a/sharedlib/CMakeLists.txt
+++ b/sharedlib/CMakeLists.txt
@@ -71,6 +71,7 @@ else()
@@ -76,6 +76,7 @@ else()
set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
endif()

+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})
@@ -87,14 +88,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
@@ -92,14 +93,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")

add_executable(jcstest ../jcstest.c)
target_link_libraries(jcstest jpeg)
Expand Down
6 changes: 3 additions & 3 deletions ports/libjpeg-turbo/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libjpeg-turbo/libjpeg-turbo
REF 2.1.4
SHA512 d3e92d614168355827e0ed884ff847cc7df8f6f1fb7b673c6c99afdf61fdfc0372afe5d30fdbf5e743335e2a7a27ca9f510c67d213e5cb2315a8d946e9414575
REF "${VERSION}"
SHA512 20036303fbe5703a5742dc3778cc5deb2eb98d00a9852e7e80ba73c195bba011ec206c090589c482f1153f74505c3fe06d96af00f6beaa65a7fcf7ffaf626fc2
HEAD_REF master
PATCHES
add-options-for-exes-docs-headers.patch
Expand Down Expand Up @@ -94,4 +94,4 @@ file(REMOVE_RECURSE
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)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
2 changes: 1 addition & 1 deletion ports/libjpeg-turbo/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libjpeg-turbo",
"version": "2.1.4",
"version": "2.1.5",
"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",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3985,7 +3985,7 @@
"port-version": 6
},
"libjpeg-turbo": {
"baseline": "2.1.4",
"baseline": "2.1.5",
"port-version": 0
},
"libjuice": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libjpeg-turbo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8ddeeba46c059986db83de51ec72b4ff587f0dcc",
"version": "2.1.5",
"port-version": 0
},
{
"git-tree": "07c9848d16ee346b314e87e6c0d856bfb0745af9",
"version": "2.1.4",
Expand Down

0 comments on commit a7c0f2b

Please sign in to comment.