From 10c6c495f5c3797ad287e6bd0f70d53332695a51 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Fri, 7 Aug 2026 10:55:20 +0200 Subject: [PATCH 1/2] [minifb] Update to 0.10.1 --- ports/minifb/portfile.cmake | 4 ++-- ports/minifb/vcpkg.json | 8 ++++++-- scripts/ci.baseline.txt | 4 +--- scripts/ci.feature.baseline.txt | 1 + versions/baseline.json | 2 +- versions/m-/minifb.json | 5 +++++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ports/minifb/portfile.cmake b/ports/minifb/portfile.cmake index 3389c2a139f165..840edb11b146f9 100644 --- a/ports/minifb/portfile.cmake +++ b/ports/minifb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emoon/minifb - REF 2ce2449b1bc8d7c6d20c31b86244f1e540f2e788 # 2023-09-21 - SHA512 cbadc06df99f833fedcd9eb9d5afab4572272a9dfd0f4084a2b79a64dc98f19bcddbb6f43992b16f005d26054c454e3cfc34e3e210cdd93ad1adb89e19463a4d + REF "v${VERSION}" + SHA512 c553429dc39d0ae63b4b64cf7eaf06b4faed5d6e93e9610fcdf6a84dc22123e6423fcfd9ce83e570f1e2125a2a5afed25e3eb1413fb61205292614a7e8062c1f HEAD_REF master ) diff --git a/ports/minifb/vcpkg.json b/ports/minifb/vcpkg.json index 07ef620853a52b..b827fff61478ed 100644 --- a/ports/minifb/vcpkg.json +++ b/ports/minifb/vcpkg.json @@ -1,11 +1,15 @@ { "name": "minifb", - "version-date": "2023-09-21", + "version": "0.10.1", "description": "MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window.", "homepage": "https://github.com/emoon/minifb", "license": "MIT", - "supports": "!uwp", + "supports": "!uwp & !android", "dependencies": [ + { + "name": "libx11", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dcc9ca4c197e8d..4664661c9d9f2c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -878,9 +878,7 @@ mesa:arm64-linux=fail mesa:arm64-osx=fail mesa:x64-linux=fail metrohash:arm64-linux=fail -minifb:arm-neon-android=fail -minifb:arm64-android=fail -minifb:x64-android=fail +minifb:arm64-linux=fail # X11 missing on the CI miniply:arm-neon-android=fail minisat-master-keying:arm64-linux=fail monkeys-audio:arm-neon-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index b6b55006f706d1..c3204e947d7f60 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -765,6 +765,7 @@ mesa[llvm]=feature-fails # ERROR: Neither a subproject directory nor a llvm.wrap metrohash:arm64-linux=fail minc:arm64-linux=cascade minc[minc1](android)=feature-fails +minifb:arm64-linux=fail # X11 missing on the CI minisat-master-keying:arm64-linux=fail mnn[cuda]:x64-windows-static-md=cascade mnn[cuda]:x64-windows-static=cascade diff --git a/versions/baseline.json b/versions/baseline.json index 4a73528cdc9bdc..d0b8392a3975c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6641,7 +6641,7 @@ "port-version": 0 }, "minifb": { - "baseline": "2023-09-21", + "baseline": "0.10.1", "port-version": 0 }, "minimp3": { diff --git a/versions/m-/minifb.json b/versions/m-/minifb.json index e40af52e69b0eb..bb60f1ea227ee3 100644 --- a/versions/m-/minifb.json +++ b/versions/m-/minifb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd4171f0d3f6bad44cac78d9620a1020eb347f05", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "745289bcc43c14f1f4c5b1f9f2d319d42fe1d299", "version-date": "2023-09-21", From ae25e095106d690e99b0ed58f802bc159438fb30 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 7 Aug 2026 22:57:58 -0700 Subject: [PATCH 2/2] [minifb] Normalize port files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ports/minifb/portfile.cmake | 45 ++++++++++++++++++------------------- ports/minifb/usage | 4 ---- versions/m-/minifb.json | 2 +- 3 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 ports/minifb/usage diff --git a/ports/minifb/portfile.cmake b/ports/minifb/portfile.cmake index 840edb11b146f9..1f1c3ae047562b 100644 --- a/ports/minifb/portfile.cmake +++ b/ports/minifb/portfile.cmake @@ -1,23 +1,22 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO emoon/minifb - REF "v${VERSION}" - SHA512 c553429dc39d0ae63b4b64cf7eaf06b4faed5d6e93e9610fcdf6a84dc22123e6423fcfd9ce83e570f1e2125a2a5afed25e3eb1413fb61205292614a7e8062c1f - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DMINIFB_BUILD_EXAMPLES=FALSE -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emoon/minifb + REF "v${VERSION}" + SHA512 c553429dc39d0ae63b4b64cf7eaf06b4faed5d6e93e9610fcdf6a84dc22123e6423fcfd9ce83e570f1e2125a2a5afed25e3eb1413fb61205292614a7e8062c1f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMINIFB_BUILD_EXAMPLES=FALSE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/minifb/usage b/ports/minifb/usage deleted file mode 100644 index 68bc6ab9100c23..00000000000000 --- a/ports/minifb/usage +++ /dev/null @@ -1,4 +0,0 @@ -minifb provides CMake targets: - - find_package(minifb CONFIG REQUIRED) - target_link_libraries(main PRIVATE minifb::minifb) diff --git a/versions/m-/minifb.json b/versions/m-/minifb.json index bb60f1ea227ee3..1104e4cf9cbec7 100644 --- a/versions/m-/minifb.json +++ b/versions/m-/minifb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cd4171f0d3f6bad44cac78d9620a1020eb347f05", + "git-tree": "72aad0b07ef68409873dd8b2eea84573b321a6de", "version": "0.10.1", "port-version": 0 },