[mygui] Update to 3.4.2 (#34006)

* .

* .

* fixwasm32

* v

* fix gl

* version

* fix-static

* versions

ports/mygui/Use-vcpkg-sdl2.patch

@@ -1,14 +0,0 @@
-diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
-index 2b160ff..559e6a8 100644
---- a/Common/CMakeLists.txt
-+++ b/Common/CMakeLists.txt
-@@ -99,6 +99,8 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
- 
- mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
- add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
--target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
-+
-+find_package(SDL2 CONFIG REQUIRED)
-+target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::SDL2 SDL2::SDL2main)
- 
- add_dependencies(${PROJECTNAME} MyGUIEngine)

ports/mygui/fix-osx-build.patch

@@ -1,25 +0,0 @@
-From 0c1e0079653223fafb346f67c7e3bb001a39de73 Mon Sep 17 00:00:00 2001
-From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
-Date: Sun, 23 Oct 2022 15:53:08 +0200
-Subject: [PATCH] do not simply include everything
-
----
- MyGUIEngine/CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
-index 33f74563b..40ec35101 100644
---- a/MyGUIEngine/CMakeLists.txt
-+++ b/MyGUIEngine/CMakeLists.txt
-@@ -48,11 +48,6 @@ if (MYGUI_USE_FREETYPE)
- 	endif()
- endif()
- 
--# platform specific dependencies
--if (APPLE)
--	include_directories(/usr/local/include /usr/include)
--endif ()
--
- if (${CMAKE_VERSION} VERSION_EQUAL "3.16" OR ${CMAKE_VERSION} VERSION_GREATER "3.16")
- 	target_precompile_headers(${PROJECTNAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/MyGUI_Precompiled.h")
- endif ()

ports/mygui/opengl.patch

@@ -0,0 +1,26 @@
+diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
+index db7d6610c..eb9190e07 100644
+--- a/Common/CMakeLists.txt
++++ b/Common/CMakeLists.txt
+@@ -41,12 +41,9 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 3)
+ elseif(MYGUI_RENDERSYSTEM EQUAL 4)
+ 	add_definitions("-DMYGUI_OPENGL_PLATFORM")
+ 	include_directories(SYSTEM
+-		${OPENGL_INCLUDE_DIR}
+ 		${SDL2_IMAGE_INCLUDE_DIRS}
+ 		${MYGUI_SOURCE_DIR}/Platforms/${MYGUI_PLATFORM_NAME}/${MYGUI_PLATFORM_NAME}Platform/include
+ 	)
+-	include_directories(SYSTEM include/GL)
+-	link_directories(${OPENGL_LIB_DIR})
+ 	link_directories(${SDL2_IMAGE_LIB_DIR})
+ elseif(MYGUI_RENDERSYSTEM EQUAL 5)
+ 	add_definitions("-DMYGUI_DIRECTX_PLATFORM")
+@@ -106,3 +103,8 @@ if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
+ endif()
+ 
+ add_dependencies(${PROJECTNAME} MyGUIEngine)
++
++if(MYGUI_RENDERSYSTEM EQUAL 4)
++	find_package(OpenGL REQUIRED)
++	target_link_libraries(${PROJECTNAME} OpenGL::GL)
++endif()

ports/mygui/portfile.cmake

@@ -5,17 +5,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MyGUI/mygui
-    REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1
-    SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 
+    REF MyGUI${VERSION}
+    SHA512 202f3df35f0767778b5a91b71dbd1ad3409d0a1977d5fbe3f0d48db430276c71b84edc5a28dd1fdb8e60245b56f2bda99872a4d860b83585f08406b28fb850fe
     HEAD_REF master
     PATCHES
         fix-generation.patch
-        Use-vcpkg-sdl2.patch
         Install-tools.patch
-        fix-osx-build.patch # from https://github.com/MyGUI/mygui/pull/244
+        opengl.patch
+        sdl2-static.patch
 )
 
-if("opengl" IN_LIST FEATURES)
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
+    message(STATUS "Setting MYGUI_RENDERSYSTEM to 8 (GLES) - officially supported MyGUI render system for wasm32")
+    set(MYGUI_RENDERSYSTEM 8)
+elseif("opengl" IN_LIST FEATURES)
     set(MYGUI_RENDERSYSTEM 4)
 else()
     set(MYGUI_RENDERSYSTEM 1)

ports/mygui/sdl2-static.patch

@@ -0,0 +1,35 @@
+diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
+index 4dd33abe4..3911acef3 100644
+--- a/CMake/Packages/FindSDL2.cmake
++++ b/CMake/Packages/FindSDL2.cmake
+@@ -49,7 +49,7 @@ IF(NOT SDL2_FOUND)
+     )
+ 
+     find_library(SDL2_LIBRARY
+-      NAMES SDL2
++      NAMES SDL2 SDL2-static
+       HINTS
+         ${PC_SDL2_LIBDIR}
+         ${PC_SDL2_LIBRARY_DIRS}
+@@ -87,7 +87,7 @@ IF(NOT SDL2_FOUND)
+     set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+     set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
+     if (WIN32)
+-        set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version)
++        set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version setupapi)
+     endif()
+     include(FindPackageHandleStandardArgs)
+ 
+diff --git a/CMake/Packages/FindSDL2_image.cmake b/CMake/Packages/FindSDL2_image.cmake
+index 4f0bc5f17..857806b1f 100644
+--- a/CMake/Packages/FindSDL2_image.cmake
++++ b/CMake/Packages/FindSDL2_image.cmake
+@@ -41,7 +41,7 @@ IF(NOT SDL2_IMAGE_FOUND)
+     )
+ 
+     find_library(SDL2_IMAGE_LIBRARY
+-      NAMES SDL2_image
++      NAMES SDL2_image SDL2_image-static
+       HINTS
+         ${PC_SDL2_IMAGE_LIBDIR}
+         ${PC_SDL2_IMAGE_LIBRARY_DIRS}

ports/mygui/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "mygui",
-  "version": "3.4.1",
-  "port-version": 5,
+  "version": "3.4.2",
   "description": "Fast, flexible and simple GUI",
   "homepage": "http://mygui.info",
   "license": "MIT",

versions/baseline.json

@@ -5649,8 +5649,8 @@
       "port-version": 0
     },
     "mygui": {
-      "baseline": "3.4.1",
-      "port-version": 5
+      "baseline": "3.4.2",
+      "port-version": 0
     },
     "mysql-connector-cpp": {
       "baseline": "8.0.32",

versions/m-/mygui.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc0449cfc21fca4e1ee5afda7c0919fffb9cd864",
+      "version": "3.4.2",
+      "port-version": 0
+    },
     {
       "git-tree": "4b68ea2f9e7d24c34d86ea4d45050adc7ac29663",
       "version": "3.4.1",