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

update ijg-libjpeg to 9e (#24395)

Browse Source
This commit is contained in:
Mengna Li 2022-04-26 08:28:30 +08:00 committed by GitHub
parent b360be7666
commit 94c728df6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/ijg-libjpeg/CMakeLists.txt
View File

@ -12,9 +12,9 @@ option(BUILD_EXECUTABLES OFF)
include(CheckIncludeFile) include(CheckIncludeFile)
check_include_file(stddef.h HAVE_STDDEF_H) check_include_file(stddef.h HAVE_STDDEF_H)
check_include_file(stdlib.h HAVE_STDLIB_H) check_include_file(stdlib.h HAVE_STDLIB_H)
configure_file(jconfig.txt ${CMAKE_CURRENT_SOURCE_DIR}/jconfig.h) configure_file(jconfig.txt ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h)
list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h jconfig.h) list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h)
add_library(jpeg add_library(jpeg
${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h ${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h
@ -35,6 +35,8 @@ if(WIN32)
) )
endif() endif()
target_include_directories(jpeg PRIVATE include ${CMAKE_CURRENT_BINARY_DIR})
install(FILES ${PUBLIC_HEADERS} install(FILES ${PUBLIC_HEADERS}
DESTINATION ${CMAKE_INSTALL_PREFIX}/include DESTINATION ${CMAKE_INSTALL_PREFIX}/include
) )

27
ports/ijg-libjpeg/portfile.cmake
View File

@ -10,9 +10,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif() endif()
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "http://www.ijg.org/files/jpegsr9d.zip" URLS "http://www.ijg.org/files/jpegsr9e.zip"
FILENAME "jpegsr9d.zip" FILENAME "jpegsr9e.zip"
SHA512 441a783c945fd549693dbe3932d8d35e1ea00d8464870646760ed84a636facb4d7afe0ca3ab988e7281a71e41c2e96be618b8c6a898f116517e639720bba82a3 SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64
) )
vcpkg_extract_source_archive_ex( vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
@ -21,31 +21,30 @@ vcpkg_extract_source_archive_ex(
# Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command. # Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command.
# See https://github.com/LuaDist/libjpeg # See https://github.com/LuaDist/libjpeg
vcpkg_replace_string(${SOURCE_PATH}/jconfig.txt vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt"
"#define HAVE_STDDEF_H" "#define HAVE_STDDEF_H"
"#cmakedefine HAVE_STDDEF_H" "#cmakedefine HAVE_STDDEF_H"
) )
vcpkg_replace_string(${SOURCE_PATH}/jconfig.txt vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt"
"#define HAVE_STDLIB_H" "#define HAVE_STDLIB_H"
"#cmakedefine HAVE_STDLIB_H" "#cmakedefine HAVE_STDLIB_H"
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS OPTIONS
-DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option? -DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option?
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# There is no LICENSE file, but README containes some legal text. # There is no LICENSE file, but README containes some legal text.
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static) if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

15
ports/ijg-libjpeg/vcpkg.json
View File

@ -1,7 +1,18 @@
{ {
"name": "ijg-libjpeg", "name": "ijg-libjpeg",
"version-string": "9d", "version-string": "9e",
"description": "Independent JPEG Group's JPEG software", "description": "Independent JPEG Group's JPEG software",
"homepage": "http://www.ijg.org/", "homepage": "http://www.ijg.org/",
"supports": "!emscripten & !wasm32" "license": null,
"supports": "!emscripten & !wasm32",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
} }

2
versions/baseline.json
View File

@ -2905,7 +2905,7 @@
"port-version": 0 "port-version": 0
}, },
"ijg-libjpeg": { "ijg-libjpeg": {
"baseline": "9d", "baseline": "9e",
"port-version": 0 "port-version": 0
}, },
"ilmbase": { "ilmbase": {

5
versions/i-/ijg-libjpeg.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "fb37d14790c59df2657d83e21009faa54643f19d",
"version-string": "9e",
"port-version": 0
},
{ {
"git-tree": "320dc4cbe69f8dea86bce50c1445f51f780de1a3", "git-tree": "320dc4cbe69f8dea86bce50c1445f51f780de1a3",
"version-string": "9d", "version-string": "9d",