[allegro5] update to 5.2.9.0 (#35495)

This commit is contained in:
Mengna Li 2023-12-06 03:41:09 +08:00 committed by GitHub
parent 72010900b7
commit b051c80d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 69 deletions

View File

@ -1,60 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c5720b..72880c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1156,6 +1156,24 @@ if(INSTALL_PKG_CONFIG_FILES)
endforeach(versuffix)
endif(INSTALL_PKG_CONFIG_FILES)
+file(WRITE "${CMAKE_INSTALL_PREFIX}/share/unofficial-allegro5/unofficial-allegro5-config.cmake"
+[[
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegroTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_audioTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_videoTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_primitivesTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_fontTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_ttfTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_memfileTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_physfsTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_imageTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_mainTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_dialogTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_colorTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_acodecTargets.cmake")
+
+]])
+
#-----------------------------------------------------------------------------#
#
# Documentation
diff --git a/cmake/Common.cmake b/cmake/Common.cmake
index b95479f..4093a47 100644
--- a/cmake/Common.cmake
+++ b/cmake/Common.cmake
@@ -166,6 +166,7 @@ function(add_our_library target framework_name sources extra_flags link_with)
# Library dependencies are transitive by default. Any target which links
# with this target will therefore pull in these dependencies automatically.
target_link_libraries(${target} ${link_with})
+ target_include_directories(${target} PUBLIC "$<INSTALL_INTERFACE:include>")
# Set list of dependencies that the user would need to explicitly link with
# if static linking.
@@ -220,6 +221,7 @@ endfunction(set_our_framework_properties)
function(install_our_library target filename)
install(TARGETS ${target}
+ EXPORT unofficial-${target}Targets
LIBRARY DESTINATION "lib${LIB_SUFFIX}"
ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}"
@@ -227,6 +229,10 @@ function(install_our_library target filename)
# Doesn't work, see below.
# PUBLIC_HEADER DESTINATION "include"
)
+ install(EXPORT unofficial-${target}Targets
+ NAMESPACE unofficial-allegro5::
+ DESTINATION share/unofficial-allegro5
+ )
if(0)
install(FILES ${CMAKE_BINARY_DIR}/lib/\${CMAKE_INSTALL_CONFIG_NAME}/${filename}.pdb
DESTINATION lib

View File

@ -1,12 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO liballeg/allegro5
REF 5.2.6.0
SHA512 d590c1a00d1b314c6946e0f6ad3e3a8b6e6309bada2ec38857186f817147ac99dae8a1c4412abe701af88da5dca3dd8f989a1da66630192643d3c08c0146b603
REF ${VERSION}
SHA512 2e7833b725718fdf11f1cd5999dc9fafca4b34adda15d3d8cb551c0eb00368d2e1c08b15f8beb766e2f208ffdc3b5e33175e969c7333ad6dc92f269522ac3d32
HEAD_REF master
PATCHES
do-not-copy-pdbs-to-lib.patch
export-targets.patch
msvc-arm64-atomic.patch
)
@ -64,9 +63,9 @@ vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-allegro5 CONFIG_PATH share/unofficial-allegro5)
vcpkg_cmake_config_fixup(PACKAGE_NAME allegro CONFIG_PATH lib/cmake/allegro)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

View File

@ -1,7 +1,6 @@
{
"name": "allegro5",
"version": "5.2.6.0",
"port-version": 4,
"version": "5.2.9.0",
"description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.",
"homepage": "https://github.com/liballeg/allegro5",
"license": "BSD-3-Clause AND Zlib",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "93860d1ef432006526823ace61750eb6b0e86ec2",
"version": "5.2.9.0",
"port-version": 0
},
{
"git-tree": "a50ae858c1ef5e8d94fa850e2857b7a449cc5f55",
"version": "5.2.6.0",

View File

@ -81,8 +81,8 @@
"port-version": 3
},
"allegro5": {
"baseline": "5.2.6.0",
"port-version": 4
"baseline": "5.2.9.0",
"port-version": 0
},
"alpaca": {
"baseline": "0.2.1",