diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-03-13 08:52:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 17:52:45 -0700 |
| commit | fea4df8b23ff90610aff5ee99fafe62c57da36ad (patch) | |
| tree | 23be860d52957dbaa3b28ec74560666414764f42 | |
| parent | cd0ea138120168c8bbab5b16becd1f992d49e1ee (diff) | |
| download | vcpkg-fea4df8b23ff90610aff5ee99fafe62c57da36ad.tar.gz vcpkg-fea4df8b23ff90610aff5ee99fafe62c57da36ad.zip | |
[raylib] Update to 2.6.0 (#10068)
* [raylib] Update to 2.6.0
* Remove unused comment
| -rw-r--r-- | ports/raylib/CONTROL | 3 | ||||
| -rw-r--r-- | ports/raylib/portfile.cmake | 26 |
2 files changed, 10 insertions, 19 deletions
diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL index 2113f5760..c3d9db745 100644 --- a/ports/raylib/CONTROL +++ b/ports/raylib/CONTROL @@ -1,8 +1,7 @@ Source: raylib
-Version: 2.5.0
+Version: 2.6.0
Description: A simple and easy-to-use library to enjoy videogames programming
Supports: !(arm|uwp)
-#Build-Depends: glfw3
Feature: non-audio
Description: Build raylib without audio module
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 523cbb2b7..4620075ae 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -1,9 +1,7 @@ # https://github.com/raysan5/raylib/issues/388
-if(TARGET_TRIPLET MATCHES "^arm" OR TARGET_TRIPLET MATCHES "uwp$")
- message(FATAL_ERROR "raylib doesn't support ARM or UWP.")
-endif()
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
message(
"raylib currently requires the following libraries from the system package manager:
libgl1-mesa-dev
@@ -15,24 +13,21 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li )
endif()
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO raysan5/raylib
- REF a9f33c9a8962735fed5dd1857709d159bc4056fc # 2.5.0
- SHA512 36ee474d5f1791385a6841e20632e078c0d3a591076faed0a648533513a3218e2817b0bbf7a921cc003c9aaf6a07024fd48830697d9d85eba307be27bd884ad8
+ REF 6f3c99a295533e41de3049db5e683d15fd5c6e1a # 2.6.0
+ SHA512 358ebcffb7e11f319f82ecf791480eb23c40a53b764cad1d2109064bb06575c7af0325bf06ec86bbb2c43b70b12f52b5b6d1318d8857e07ff8e965a1dadbd8e2
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)
-if("non-audio" IN_LIST FEATURES)
- set(USE_AUDIO OFF)
-else()
- set(USE_AUDIO ON)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ INVERTED_FEATURES
+ non-audio USE_AUDIO
+)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
@@ -83,7 +78,4 @@ endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
\ No newline at end of file |