Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libwebp] Update to 1.3.0, misc changes #29165

Merged
merged 14 commits into from
Jan 27, 2023
Merged

[libwebp] Update to 1.3.0, misc changes #29165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c4d24cb
[libwebp] Update to 1.3.0
dg0yt Jan 25, 2023
a4600a3
Fix [core] on x64-osx
dg0yt Jan 25, 2023
c14ddac
Fix features and dependencies
dg0yt Jan 25, 2023
885bf8f
Cleanup tool installation
dg0yt Jan 25, 2023
5f7311a
Usage
dg0yt Jan 25, 2023
42e0273
Lift restriction for vwebp tool
dg0yt Jan 25, 2023
df70120
[mapnik] Fix libwebp
dg0yt Jan 25, 2023
e12a028
[qt5-imageformats] Use libwebp pc files
dg0yt Jan 26, 2023
b8012b5
Revert "Lift restriction for vwebp tool"
dg0yt Jan 26, 2023
78bbfee
[gdal] Use upstream WebP config
dg0yt Jan 26, 2023
1f143ef
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jan 27, 2023
4e66512
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jan 27, 2023
f890638
Revert no longer necessary changes to mapnik.
BillyONeal Jan 27, 2023
109aa1d
Remove unnecessary patch that git checkout didn't remove.
BillyONeal Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions ports/qt5-imageformats/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,13 @@ if(FREEGLUT_NEEDED)
find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
endif()

find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(WEBP_DEBUG NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(WEBPDEMUX_DEBUG NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(WEBPMUX_RELEASE NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(WEBPMUX_DEBUG NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(WEBPDECODER_RELEASE NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(WEBPDECODER_DEBUG NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
# Depends on opengl in default build but might depend on giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows)
# which would require extra libraries to be linked e.g. giflib freeglut sdl1 other ones are already linked

if(NOT VCPKG_TARGET_IS_WINDOWS)
string(APPEND WEBP_RELEASE " -pthread")
string(APPEND WEBP_DEBUG " -pthread")
endif()
x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS)
dg0yt marked this conversation as resolved.
Show resolved Hide resolved

set(OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}"
"WEBP_LIBS=${WEBPDECODER_RELEASE} ${WEBPDEMUX_RELEASE} ${WEBPMUX_RELEASE} ${WEBP_RELEASE}"
"WEBP_LIBS=${webp_LIBS_RELEASE}"
"JASPER_LIBS=${JASPER_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies
dg0yt marked this conversation as resolved.
Show resolved Hide resolved
set(OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}"
"WEBP_LIBS=${WEBPDECODER_DEBUG} ${WEBPDEMUX_DEBUG} ${WEBPMUX_DEBUG} ${WEBP_DEBUG}"
"WEBP_LIBS=${webp_LIBS_DEBUG}"
"JASPER_LIBS=${JASPER_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}")

if(FREEGLUT_NEEDED)
Expand Down
1 change: 1 addition & 0 deletions ports/qt5-imageformats/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qt5-imageformats",
"version": "5.15.8",
"port-version": 1,
"description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP",
"license": null,
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6234,7 +6234,7 @@
},
"qt5-imageformats": {
"baseline": "5.15.8",
"port-version": 0
"port-version": 1
},
"qt5-location": {
"baseline": "5.15.8",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-imageformats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "51299732d963e9fa181b759715ecf78b4ee01698",
"version": "5.15.8",
"port-version": 1
},
{
"git-tree": "33bc274f73bfd44b51a44b04fd9298b4f22fa2bc",
"version": "5.15.8",
Expand Down