[raylib] update to 6.0 (#51355)

2026-04-24 06:17:01 +09:00 · 2026-04-24 06:17:01 +09:00 · e8c2ec9120
parent f77737496d
commit e8c2ec9120
6 changed files with 117 additions and 112 deletions
--- a/ports/raylib/fix-cgltf.patch
+++ b/ports/raylib/fix-cgltf.patch
@ -0,0 +1,13 @@
+diff --git a/src/rmodels.c b/src/rmodels.c
+index 6d3169e..4010287 100644
+--- a/src/rmodels.c
+++ b/src/rmodels.c
+@@ -5279,7 +5279,7 @@ static cgltf_result LoadFileGLTFCallback(const struct cgltf_memory_options *memo
+ }
+ 
+ // Release file data callback for cgltf
+-static void ReleaseFileGLTFCallback(const struct cgltf_memory_options *memoryOptions, const struct cgltf_file_options *fileOptions, void *data, cgltf_size size)
+static void ReleaseFileGLTFCallback(const struct cgltf_memory_options *memoryOptions, const struct cgltf_file_options *fileOptions, void *data)
+ {
+     UnloadFileData((unsigned char *)data);
+ }
--- a/ports/raylib/fix-link-path.patch
+++ b/ports/raylib/fix-link-path.patch
@ -1,13 +0,0 @@
-diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake
-index 700965c..4815cd6 100644
--- a/cmake/raylib-config.cmake
-+++ b/cmake/raylib-config.cmake
-@@ -65,7 +65,7 @@ if (NOT TARGET raylib)
-       IMPORTED_LOCATION             "${raylib_LIBRARIES}"
-       IMPORTED_IMPLIB               "${raylib_LIBRARIES}"
-       INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES      "${raylib_LDFLAGS}"
-+      INTERFACE_LINK_LIBRARIES      "${raylib_LIBRARIES}"
-       INTERFACE_COMPILE_OPTIONS     "${raylib_DEFINITIONS}"
-     )
- 
--- a/ports/raylib/portfile.cmake
+++ b/ports/raylib/portfile.cmake
@ -1,95 +1,96 @@
-if(VCPKG_TARGET_IS_LINUX)
-    message(
-    "raylib currently requires the following libraries from the system package manager:
-    libgl1-mesa-dev
-    libx11-dev
-    libxcursor-dev
-    libxinerama-dev
-    libxrandr-dev
-These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev"
-    )
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO raysan5/raylib
-    REF "${VERSION}"
-    SHA512 503483a5436e189ad67533dc6c90be592283b84fbd57c86ab457dd1507b1dd11c897767ea9efa83affaf236f2711ec59e56658cf6fcad582a790a5fdc01b5ace
-    HEAD_REF master
-    PATCHES
-        android.diff
-        fix-link-path.patch
-)
-file(GLOB vendored_headers RELATIVE "${SOURCE_PATH}/src/external"
-    "${SOURCE_PATH}/src/external/cgltf.h"
-    # Do not use dirent from vcpkg: It is a different implementation which has
-    # 'include <windows.h>', leading to duplicate and conflicting definitions.
-    #"${SOURCE_PATH}/src/external/dirent.h"
-    "${SOURCE_PATH}/src/external/nanosvg*.h"
-    "${SOURCE_PATH}/src/external/qoi.h"
-    "${SOURCE_PATH}/src/external/s*fl.h"  # from mmx
-    "${SOURCE_PATH}/src/external/stb_*"
-)
-file(GLOB vendored_audio_headers RELATIVE "${SOURCE_PATH}/src/external"
-    "${SOURCE_PATH}/src/external/dr_*.h"
-    "${SOURCE_PATH}/src/external/miniaudio.h"
-)
-set(optional_vendored_headers
-    "stb_image_resize2.h"  # not yet in vcpkg
-)
-foreach(header IN LISTS vendored_headers vendored_audio_headers)
-    unset(vcpkg_file)
-    find_file(vcpkg_file NAMES "${header}" PATHS "${CURRENT_INSTALLED_DIR}/include" PATH_SUFFIXES mmx nanosvg NO_DEFAULT_PATH NO_CACHE)
-    if(header IN_LIST vendored_audio_headers AND NOT "audio" IN_LIST FEATURES)
-        message(STATUS "Emptying '${header}' (audio disabled)")
-        file(WRITE "${SOURCE_PATH}/src/external/${vcpkg_file}" "# audio disabled")
-    elseif(vcpkg_file)
-        message(STATUS "De-vendoring '${header}'")
-        file(COPY "${vcpkg_file}" DESTINATION "${SOURCE_PATH}/src/external")
-    elseif(header IN_LIST optional_vendored_headers)
-        message(STATUS "Not de-vendoring '${header}' (absent in vcpkg)")
-    else()
-        message(FATAL_ERROR "No replacement for vendored '${header}'")
-    endif()
-endforeach()
-
-set(PLATFORM_OPTIONS "")
-if(VCPKG_TARGET_IS_ANDROID)
-    list(APPEND PLATFORM_OPTIONS -DPLATFORM=Android -DUSE_EXTERNAL_GLFW=OFF)
-elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
-    list(APPEND PLATFORM_OPTIONS -DPLATFORM=Web -DUSE_EXTERNAL_GLFW=OFF)
-else()
-    list(APPEND PLATFORM_OPTIONS -DPLATFORM=Desktop -DUSE_EXTERNAL_GLFW=ON)
-endif()
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        audio SUPPORT_MODULE_RAUDIO
-        audio USE_AUDIO
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_EXAMPLES=OFF
-        -DCMAKE_POLICY_DEFAULT_CMP0072=NEW # Prefer GLVND
-        -DCUSTOMIZE_BUILD=ON
-        ${PLATFORM_OPTIONS}
-        ${FEATURE_OPTIONS}
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/raylib.h" "defined(USE_LIBTYPE_SHARED)" "1")
-endif()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+if(VCPKG_TARGET_IS_LINUX)
+    message(
+    "raylib currently requires the following libraries from the system package manager:
+    libgl1-mesa-dev
+    libx11-dev
+    libxcursor-dev
+    libxinerama-dev
+    libxrandr-dev
+These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev"
+    )
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO raysan5/raylib
+    REF "${VERSION}"
+    SHA512 dfdb2578859e28d424b6f318669579ab2361c35c4d45e0fee5a80b4c1d7d487a0e084ec2bafffad149b3dd96d34d092586fc3d30c8de6a211b0a2a038a959c07
+    HEAD_REF master
+    PATCHES
+        android.diff
+        # Once the next version of cgltf is released, this patch will no longer be necessary.
+        fix-cgltf.patch
+)
+file(GLOB vendored_headers RELATIVE "${SOURCE_PATH}/src/external"
+    "${SOURCE_PATH}/src/external/cgltf.h"
+    # Do not use dirent from vcpkg: It is a different implementation which has
+    # 'include <windows.h>', leading to duplicate and conflicting definitions.
+    #"${SOURCE_PATH}/src/external/dirent.h"
+    "${SOURCE_PATH}/src/external/nanosvg*.h"
+    "${SOURCE_PATH}/src/external/qoi.h"
+    "${SOURCE_PATH}/src/external/s*fl.h"  # from mmx
+    "${SOURCE_PATH}/src/external/stb_*"
+)
+file(GLOB vendored_audio_headers RELATIVE "${SOURCE_PATH}/src/external"
+    "${SOURCE_PATH}/src/external/dr_*.h"
+    "${SOURCE_PATH}/src/external/miniaudio.h"
+)
+set(optional_vendored_headers
+    "stb_image_resize2.h"  # not yet in vcpkg
+)
+foreach(header IN LISTS vendored_headers vendored_audio_headers)
+    unset(vcpkg_file)
+    find_file(vcpkg_file NAMES "${header}" PATHS "${CURRENT_INSTALLED_DIR}/include" PATH_SUFFIXES mmx nanosvg NO_DEFAULT_PATH NO_CACHE)
+    if(header IN_LIST vendored_audio_headers AND NOT "audio" IN_LIST FEATURES)
+        message(STATUS "Emptying '${header}' (audio disabled)")
+        file(WRITE "${SOURCE_PATH}/src/external/${vcpkg_file}" "# audio disabled")
+    elseif(vcpkg_file)
+        message(STATUS "De-vendoring '${header}'")
+        file(COPY "${vcpkg_file}" DESTINATION "${SOURCE_PATH}/src/external")
+    elseif(header IN_LIST optional_vendored_headers)
+        message(STATUS "Not de-vendoring '${header}' (absent in vcpkg)")
+    else()
+        message(FATAL_ERROR "No replacement for vendored '${header}'")
+    endif()
+endforeach()
+
+set(PLATFORM_OPTIONS "")
+if(VCPKG_TARGET_IS_ANDROID)
+    list(APPEND PLATFORM_OPTIONS -DPLATFORM=Android -DUSE_EXTERNAL_GLFW=OFF)
+elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
+    list(APPEND PLATFORM_OPTIONS -DPLATFORM=Web -DUSE_EXTERNAL_GLFW=OFF)
+else()
+    list(APPEND PLATFORM_OPTIONS -DPLATFORM=Desktop -DUSE_EXTERNAL_GLFW=ON)
+endif()
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        audio SUPPORT_MODULE_RAUDIO
+        audio USE_AUDIO
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DCMAKE_POLICY_DEFAULT_CMP0072=NEW # Prefer GLVND
+        -DCUSTOMIZE_BUILD=ON
+        ${PLATFORM_OPTIONS}
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/raylib.h" "defined(USE_LIBTYPE_SHARED)" "1")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/raylib/vcpkg.json
+++ b/ports/raylib/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "raylib",
-  "version": "5.5",
-  "port-version": 1,
+  "version": "6.0",
  "description": "A simple and easy-to-use library to enjoy videogames programming",
  "homepage": "https://github.com/raysan5/raylib",
  "license": "Zlib",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -8609,8 +8609,8 @@
      "port-version": 0
    },
    "raylib": {
-      "baseline": "5.5",
-      "port-version": 1
+      "baseline": "6.0",
+      "port-version": 0
    },
    "raylib-cpp": {
      "baseline": "5.5.1",
--- a/versions/r-/raylib.json
+++ b/versions/r-/raylib.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "9aaf16b023e24b53362077934b6ed40610176914",
+      "version": "6.0",
+      "port-version": 0
+    },
    {
      "git-tree": "e0d1117e1778220a4a156f56056f9e3cf3d28028",
      "version": "5.5",