Skip to content

[sdl2-image] Support x64-uwp #22437

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

Merged
strega-nil-ms merged 8 commits into from
Jan 10, 2022
Merged

[sdl2-image] Support x64-uwp #22437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
022c13d
fixed 22434
fwannmacher Jan 9, 2022
7dbbb47
Clean baseline
Jan 10, 2022
29e3a1e
update version
Jan 10, 2022
7a63d0d
version
Jan 10, 2022
816dccb
add supports field since the upstream doesn't support uwp
Jan 10, 2022
bfd2977
improve code
Jan 10, 2022
4f624a8
version
Jan 10, 2022
d7f5786
version
Jan 10, 2022
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
3 changes: 2 additions & 1 deletion ports/mygui/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "mygui",
"version": "3.4.1",
"port-version": 1,
"port-version": 2,
"description": "Fast, flexible and simple GUI",
"homepage": "http://mygui.info",
"supports": "!uwp",
Copy link
Contributor

@JackBoosY JackBoosY Jan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(25,3): error C3861: 'GetWindowThreadProcessId': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_DynLib.cpp(59,36): error C3861: 'LoadLibrary': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(30,7): error C3861: 'GetParent': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(43,3): error C3861: 'GetWindowThreadProcessId': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(48,7): error C3861: 'GetWindowLongPtr': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(66,44): error C2664: 'DWORD GetModuleFileNameW(HMODULE,LPWSTR,DWORD)': cannot convert argument 2 from 'LPCH' to 'LPWSTR' [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
       D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(66,30): message : Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
       C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um\libloaderapi.h(237,1): message : see declaration of 'GetModuleFileNameW' (compiling source file D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp) [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(68,24): error C3861: 'GetModuleHandle': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(70,20): error C3861: 'GetDesktopWindow': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(70,41): error C2065: 'WNDENUMPROC': undeclared identifier [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(70,53): error C2146: syntax error: missing ')' before identifier 'EnumWindowProc' [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(70,3): error C3861: 'EnumChildWindows': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(70,53): error C2146: syntax error: missing ';' before identifier 'EnumWindowProc' [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(70,85): error C2059: syntax error: ')' [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(90,8): error C3861: 'OpenClipboard': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(92,5): error C3861: 'EmptyClipboard': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(99,6): error C3861: 'SetClipboardData': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(101,5): error C3861: 'CloseClipboard': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(112,8): error C3861: 'OpenClipboard': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(114,20): error C3861: 'GetClipboardData': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]
     5>D:\buildtrees\mygui\src\f6fd7d446b-197296d096.clean\MyGUIEngine\src\MyGUI_WindowsClipboardHandler.cpp(121,5): error C3861: 'CloseClipboard': identifier not found [D:\buildtrees\mygui\x64-uwp-dbg\MyGUIEngine\MyGUIEngine.vcxproj]

Some of them only support win32 app.

"dependencies": [
"freetype",
"sdl2-image",
Expand Down
12 changes: 12 additions & 0 deletions ...s/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/nanosvg.h
+++ b/nanosvg.h
@@ -2778,7 +2778,7 @@ static void nsvg__content(void* ud, const char* s)
if (p->styleFlag) {

int state = 0;
- const char* start;
+ const char* start = 0;
while (*s) {
char c = *s;
if (nsvg__isspace(c) || c == '{') {

22 changes: 11 additions & 11 deletions ports/sdl2-image/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${SDL2_IMAGE_VERSION}
PATCHES
0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

set(USE_JPEG OFF)
if("libjpeg-turbo" IN_LIST FEATURES)
Expand All @@ -29,9 +31,8 @@ if("libwebp" IN_LIST FEATURES)
set(USE_WEBP ON)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}"
-DUSE_PNG=ON
Expand All @@ -40,14 +41,13 @@ vcpkg_configure_cmake(
-DUSE_WEBP=${USE_WEBP}
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_cmake_install()
vcpkg_copy_pdbs()

vcpkg_cmake_config_fixup()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-image)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-image/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-image/copyright)

vcpkg_copy_pdbs()
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
12 changes: 10 additions & 2 deletions ports/sdl2-image/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
{
"name": "sdl2-image",
"version-string": "2.0.5",
"port-version": 3,
"port-version": 4,
"description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
"homepage": "https://www.libsdl.org/projects/SDL_image",
"dependencies": [
"libpng",
"sdl2"
"sdl2",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"libjpeg-turbo": {
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,8 +1330,6 @@ sdformat9:x64-windows-static-md=fail
sdl1:arm-uwp=fail
sdl1:x64-uwp=fail
sdl1:x64-osx=fail
sdl2-image:arm-uwp=fail
sdl2-image:x64-uwp=fail
sdl2-mixer:arm-uwp=fail
sdl2-mixer:x64-uwp=fail
sdl2-net:arm-uwp=fail
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4618,7 +4618,7 @@
},
"mygui": {
"baseline": "3.4.1",
"port-version": 1
"port-version": 2
},
"nameof": {
"baseline": "0.10.1",
Expand Down Expand Up @@ -6246,7 +6246,7 @@
},
"sdl2-image": {
"baseline": "2.0.5",
"port-version": 3
"port-version": 4
},
"sdl2-mixer": {
"baseline": "2.0.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mygui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162",
"version": "3.4.1",
"port-version": 2
},
{
"git-tree": "d06b2f348d834355086a927f9aabdd47d271819b",
"version": "3.4.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2-image.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34",
"version-string": "2.0.5",
"port-version": 4
},
{
"git-tree": "7cd6ce4e9108671f3f4bad86c37ee2586acbf440",
"version-string": "2.0.5",
Expand Down