update to 1.1.0

8 files changed, 42 insertions, 199 deletions

diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch
deleted file mode 100644
index df483ed34..000000000
--- a/ports/libwebp/0001-build-fixes.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 499ddce..895fda9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,6 +159,12 @@ add_definitions(-DHAVE_CONFIG_H)
- if(MSVC)
-   # avoid security warnings for e.g., fopen() used in the examples.
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+  add_definitions(-DWEBP_HAVE_JUST_SDL_H)
-+  if(BUILD_SHARED_LIBS)
-+    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\) -DWEBP_DLL)
-+  else()
-+    add_definitions(-DFREEGLUT_STATIC)
-+  endif()
- else()
-   add_definitions(-Wall)
- endif()
-@@ -342,19 +346,23 @@ if(WEBP_BUILD_ANIM_UTILS
-                     "example_util_[^ ]*")
-   list(APPEND EXAMPLEUTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/stopwatch.h)
-   add_library(exampleutil ${EXAMPLEUTIL_SRCS})
-+  set_target_properties(exampleutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-   target_include_directories(
-     exampleutil
-     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
-+  target_link_libraries(exampleutil imageioutil)
- 
-   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS"
-                     "imageio_util_[^ ]*")
-   add_library(imageioutil ${IMAGEIOUTILS_SRCS})
-+  set_target_properties(imageioutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-   target_link_libraries(imageioutil webp)
- 
-   # Image-decoding utility library.
-   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS"
-                     "imagedec_[^ ]*")
-   add_library(imagedec ${IMAGEDEC_SRCS})
-+  set_target_properties(imagedec PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-   target_link_libraries(imagedec
-                         imageioutil
-                         webpdemux
-@@ -365,7 +373,8 @@ if(WEBP_BUILD_ANIM_UTILS
-   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEENC_SRCS"
-                     "imageenc_[^ ]*")
-   add_library(imageenc ${IMAGEENC_SRCS})
--  target_link_libraries(imageenc webp)
-+  set_target_properties(imageenc PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-+  target_link_libraries(imageenc imageioutil webp)
- 
-   set_property(TARGET exampleutil
-                       imageioutil
-@@ -380,7 +389,7 @@ if(WEBP_BUILD_DWEBP)
-   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "DWEBP_SRCS" "dwebp")
-   add_executable(dwebp ${DWEBP_SRCS})
-   target_link_libraries(dwebp exampleutil imagedec imageenc)
--  target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
-   install(TARGETS dwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
-@@ -389,13 +398,14 @@ if(WEBP_BUILD_CWEBP)
-   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "CWEBP_SRCS" "cwebp")
-   add_executable(cwebp ${CWEBP_SRCS})
-   target_link_libraries(cwebp exampleutil imagedec webp)
--  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
-   install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
- if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
-   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
-   add_library(libwebpmux ${WEBP_MUX_SRCS})
-+  set_target_properties(libwebpmux PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
-   target_link_libraries(libwebpmux webp)
-   target_include_directories(libwebpmux
-                              PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-@@ -411,7 +421,7 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
-                                    "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
- ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
- ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
--  set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
-+  #set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
-   list(APPEND INSTALLED_LIBRARIES libwebpmux)
-   configure_pkg_config("src/mux/libwebpmux.pc")
- endif()
-@@ -428,7 +438,7 @@ if(WEBP_BUILD_GIF2WEBP)
-                         webp
-                         libwebpmux
-                         ${WEBP_DEP_GIF_LIBRARIES})
--  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
-   install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
-@@ -444,7 +454,7 @@ if(WEBP_BUILD_IMG2WEBP)
-                         imageioutil
-                         webp
-                         libwebpmux)
--  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
-   install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
-@@ -464,6 +474,7 @@ if(WEBP_BUILD_VWEBP)
-                           webpdemux)
-     target_include_directories(vwebp
-                                PRIVATE GLUT::GLUT
-+                                       ${CMAKE_CURRENT_SOURCE_DIR}/src
-                                        ${CMAKE_CURRENT_BINARY_DIR}/src
-                                        ${OPENGL_INCLUDE_DIR})
-     install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-@@ -483,7 +494,7 @@ if(WEBP_BUILD_WEBPINFO)
-                     "webpinfo")
-   add_executable(webpinfo ${WEBPINFO_SRCS})
-   target_link_libraries(webpinfo exampleutil imageioutil)
--  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
-   install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
-@@ -493,7 +504,7 @@ if(WEBP_BUILD_WEBPMUX)
-                     "webpmux")
-   add_executable(webpmux ${WEBPMUX_SRCS})
-   target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp)
--  target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
-   install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
-@@ -540,7 +551,7 @@ if(WEBP_BUILD_WEBP_JS)
-   # JavaScript version
-   add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
-   target_link_libraries(webp_js webpdecoder SDL)
--  target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-+  target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-   set(WEBP_HAVE_SDL 1)
-   set_target_properties(
-     webp_js
-@@ -553,7 +564,7 @@ if(WEBP_BUILD_WEBP_JS)
-   # WASM version
-   add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
-   target_link_libraries(webp_wasm webpdecoder SDL)
--  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-+  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-   set_target_properties(
-     webp_wasm
-     PROPERTIES LINK_FLAGS "-s WASM=1 \
-@@ -579,7 +590,7 @@ if(WEBP_BUILD_ANIM_UTILS)
-                         libwebpmux
-                         webpdemux
-                         ${WEBP_DEP_GIF_LIBRARIES})
--  target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
- 
-   # anim_dump
-   include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS} ${WEBP_DEP_GIF_INCLUDE_DIRS})
-@@ -595,7 +606,7 @@ if(WEBP_BUILD_ANIM_UTILS)
-                         libwebpmux
-                         webpdemux
-                         ${WEBP_DEP_GIF_LIBRARIES})
--  target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
-+  target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
- endif()
- 
- # Install the different headers and libraries.
diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch
new file mode 100644
index 000000000..19c28bcca
--- /dev/null
+++ b/ports/libwebp/0001-build.patch
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9503daacb..2fb9ef137 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -167,6 +167,9 @@ add_definitions(-DHAVE_CONFIG_H)
+ if(MSVC)
+   # avoid security warnings for e.g., fopen() used in the examples.
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++  if(BUILD_SHARED_LIBS)
++    add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL")
++  endif()
+ else()
+   add_definitions(-Wall)
+ endif()
+@@ -420,9 +423,9 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
+                                    "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
+-  set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
++  #set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
+   list(APPEND INSTALLED_LIBRARIES libwebpmux)
+   configure_pkg_config("src/mux/libwebpmux.pc")
+ endif()
+ 
+ if(WEBP_BUILD_GIF2WEBP)
+@@ -524,7 +528,10 @@ if(WEBP_BUILD_EXTRAS)
+ 
+   # webp_quality
+   add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS})
+   target_link_libraries(webp_quality exampleutil imagedec)
++  if(BUILD_SHARED_LIBS)
++      target_link_libraries(webp_quality webpdspdecode)
++  endif()
+   target_include_directories(webp_quality
+                              PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+                                      ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/ports/libwebp/0003-remove-missing-symbol.patch b/ports/libwebp/0003-remove-missing-symbol.patch
deleted file mode 100644
index 218481bbc..000000000
--- a/ports/libwebp/0003-remove-missing-symbol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/examples/gifdec.c b/examples/gifdec.c
-index 4219352..ab0592a 100644
---- a/examples/gifdec.c
-+++ b/examples/gifdec.c
-@@ -310,7 +310,7 @@ void GIFDisplayError(const GifFileType* const gif, int gif_error) {
- #else
-   (void)gif;
-   fprintf(stderr, "GIFLib Error %d: ", gif_error);
--  PrintGifError();
-+  //PrintGifError();
-   fprintf(stderr, "\n");
- #endif
- }
diff --git a/ports/libwebp/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch
index 49a34ef4d..6cbb394d5 100644
--- a/ports/libwebp/0004-add-missing-linked-library.patch
+++ b/ports/libwebp/0004-add-missing-linked-library.patch
@@ -3,7 +3,7 @@ index a98540c..a3697cb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -479,6 +479,10 @@ if(WEBP_BUILD_VWEBP)
-                                        ${CMAKE_CURRENT_SOURCE_DIR}/src
+                                PRIVATE ${GLUT_INCLUDE_DIR}
                                         ${CMAKE_CURRENT_BINARY_DIR}/src
                                         ${OPENGL_INCLUDE_DIR})
 +    if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE))
diff --git a/ports/libwebp/0005-fix-static-build.patch b/ports/libwebp/0005-fix-static-build.patch
deleted file mode 100644
index f17713efd..000000000
--- a/ports/libwebp/0005-fix-static-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7585fac..83edb3a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -540,7 +540,7 @@ if(WEBP_BUILD_EXTRAS)
-   find_package(SDL)
-   if(SDL_FOUND)
-     add_executable(vwebp_sdl ${VWEBP_SDL_SRCS})
--    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp)
-+    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp dxguid winmm)
-     target_include_directories(vwebp_sdl
-                                PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-                                        ${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/ports/libwebp/0006-fix-dependecies-platform.patch b/ports/libwebp/0006-fix-dependecies-platform.patch
index fdb5ec0b3..fc7a7c98a 100644
--- a/ports/libwebp/0006-fix-dependecies-platform.patch
+++ b/ports/libwebp/0006-fix-dependecies-platform.patch
@@ -6,7 +6,7 @@ index 83edb3a..f634094 100644
    find_package(SDL)
    if(SDL_FOUND)
      add_executable(vwebp_sdl ${VWEBP_SDL_SRCS})
--    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp dxguid winmm)
+-    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp)
 +    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp)
 +    if (MSVC)
 +        target_link_libraries(vwebp_sdl dxguid winmm)
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index 41debf19d..4c76291ee 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,5 +1,5 @@
 Source: libwebp
-Version: 1.0.3-1
+Version: 1.1.0
 Homepage: https://github.com/webmproject/libwebp
 Description: WebP codec: library to encode and decode images in WebP format
 Default-Features: simd, nearlossless
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index 2cdbd9e03..b6509ed79 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -1,15 +1,13 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO webmproject/libwebp
-  REF 0fe1a89dbf1930fc2554dbe76adad5d962054ead # v1.0.3
-  SHA512 824844a247d3d0d89f1721b08304624b3d3ba0060e218f5c172ffd19d19b96a71d41055fdcda7e6f01a846a95c2519f52e0f39e9f49878e74ca9bb8a1df5fb13
+  REF d7844e9762b61c9638c263657bd49e1690184832 # v1.1.0
+  SHA512 13692970e7dd909cd6aaa03c9a0c863243baac1885644794362dec0c0b0721d6807f281f746215bfd856c6e0cb742b01a731a33fe075a32ff24496e10c1a94b4
   HEAD_REF master
   PATCHES
-    0001-build-fixes.patch
+    0001-build.patch
     0002-cmake-config-add-backwards-compatibility.patch
-    0003-remove-missing-symbol.patch
     0004-add-missing-linked-library.patch
-    0005-fix-static-build.patch
     0006-fix-dependecies-platform.patch
     0007-fix-arm-build.patch
 )