aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ports/allegro5/CONTROL4
-rw-r--r--ports/allegro5/fix-pdb-install.patch21
-rw-r--r--ports/allegro5/portfile.cmake14
-rw-r--r--ports/boost/CONTROL2
-rw-r--r--ports/boost/portfile.cmake11
-rw-r--r--ports/jxrlib/portfile.cmake4
-rw-r--r--ports/spdlog/CONTROL2
-rw-r--r--ports/spdlog/portfile.cmake4
-rw-r--r--toolsrc/src/commands_edit.cpp9
9 files changed, 51 insertions, 20 deletions
diff --git a/ports/allegro5/CONTROL b/ports/allegro5/CONTROL
index 2d3003935..4bb51ae4e 100644
--- a/ports/allegro5/CONTROL
+++ b/ports/allegro5/CONTROL
@@ -1,4 +1,4 @@
Source: allegro5
-Version: 5.2.1.0
+Version: 5.2.2.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.
-Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora \ No newline at end of file
+Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile \ No newline at end of file
diff --git a/ports/allegro5/fix-pdb-install.patch b/ports/allegro5/fix-pdb-install.patch
index ef964b9f3..714c69cf5 100644
--- a/ports/allegro5/fix-pdb-install.patch
+++ b/ports/allegro5/fix-pdb-install.patch
@@ -1,3 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72348fe..c6fbecb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1010,14 +1010,9 @@ else()
+ set(PKG_CONFIG_FILES allegro ${ADDON_PKG_CONFIG_FILES})
+ endif(WANT_MONOLITH)
+
+-# Install pkg-config files on Unix, and when cross-compiling on Unix.
++# Install pkg-config files
+
+-if(UNIX AND NOT WANT_FRAMEWORKS AND NOT IPHONE)
+- set(INSTALL_PKG_CONFIG_FILES true)
+-endif()
+-if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_UNIX)
+- set(INSTALL_PKG_CONFIG_FILES true)
+-endif()
++set(INSTALL_PKG_CONFIG_FILES true)
+
+ if(INSTALL_PKG_CONFIG_FILES)
+ append_lib_type_suffix(lib_type)
diff --git a/cmake/Common.cmake b/cmake/Common.cmake
index 782196f..de29535 100644
--- a/cmake/Common.cmake
diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake
index d2801d5d4..d4f74a569 100644
--- a/ports/allegro5/portfile.cmake
+++ b/ports/allegro5/portfile.cmake
@@ -11,19 +11,19 @@
#
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-7d8892a9278c57f2d8bb1e555f9ec59cf9ed4f73)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-e8b209bc20a60224859eb8a0cae082bd20d32ed1)
vcpkg_from_github(
OUT_SOURCE_PATH ${SOURCE_PATH}
REPO liballeg/allegro5
- REF 7d8892a9278c57f2d8bb1e555f9ec59cf9ed4f73
- SHA512 b1531fa2f22023ecd4e053d03d1c54bf0b94aa3af004a3a06245c4d8278fea64e9d354467873ebd665301903d954795fed88e2467c88441f39c273e7e0d87d6e
+ REF e8b209bc20a60224859eb8a0cae082bd20d32ed1
+ SHA512 50b30d4b539bd4a2488d2b33e9fbfc6fdfd340039d9086993a5719bab3cb020ee6fe7f6d3578755a52c8aab9816d25cd74710ce93b0b374a2f97620b6138419d
HEAD_REF master
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- set(ALLEGRO_USE_STATIC -DSHARED=ON)
+ set(ALLEGRO_USE_STATIC ON)
else()
- set(ALLEGRO_USE_STATIC -DSHARED=OFF)
+ set(ALLEGRO_USE_STATIC OFF)
endif()
vcpkg_apply_patches(
@@ -39,7 +39,7 @@ vcpkg_configure_cmake(
-DWANT_DOCS=OFF
-DALLEGRO_SDL=OFF
-DWANT_DEMO=OFF
- ${ALLEGRO_USE_STATIC}
+ -DSHARED=${ALLEGRO_USE_STATIC}
-DWANT_EXAMPLES=OFF
-DWANT_CURL_EXAMPLE=OFF
-DWANT_TESTS=OFF
@@ -63,7 +63,7 @@ vcpkg_configure_cmake(
-DWANT_OPENAL=ON
-DWANT_OPENGL=ON
-DWANT_OPENSL=OFF # Not yet available on vcpkg
- -DWANT_OPUS=OFF # opus is available on vcpkg, but opusfile isn't
+ -DWANT_OPUS=ON
-DWANT_PHYSFS=ON
-DWANT_POPUP_EXAMPLES=OFF
-DWANT_PRIMITIVES=ON
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 964665b96..2a45ca1d8 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,4 +1,4 @@
Source: boost
-Version: 1.64-5
+Version: 1.65
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib, bzip2
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 8db544237..9f0390468 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -1,14 +1,15 @@
include(vcpkg_common_functions)
-set(VERSION 1_64)
+set(VERSION 1_65)
+set(VERSION2 1.65.0)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_${VERSION}_0)
######################
# Acquire and arrange sources
######################
vcpkg_download_distfile(ARCHIVE_FILE
- URLS "https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_${VERSION}_0.tar.bz2"
- FILENAME "boost_${VERSION}_0.tar.bz2"
- SHA512 68477f148f61be617552ef48559c5c2cb90d42264cabd6d5e87215d0d5024b48fca27c4afcfc1f77e490c6220d44fb1abdf0a53703867a2e4132c2857f69fedf
+ URLS "https://sourceforge.net/projects/boost/files/boost/${VERSION2}/boost_${VERSION}_0.7z" "http://dl.bintray.com/boostorg/release/${VERSION2}/source/boost_${VERSION}_0.7z"
+ FILENAME "boost_${VERSION}_0.7z"
+ SHA512 41909136371b3aac53fc06ae92404bd52adde4cbda9337886433d197059105208b67331abf6ca8dc45e4d28679733b5c01fc701cba17516c7134c97785cc5f7e
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
@@ -61,7 +62,7 @@ file(MAKE_DIRECTORY
if(NOT EXISTS ${SOURCE_PATH}/b2.exe)
message(STATUS "Bootstrapping")
vcpkg_execute_required_process(
- COMMAND "${SOURCE_PATH}/bootstrap.bat"
+ COMMAND "${SOURCE_PATH}/bootstrap.bat" msvc
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME bootstrap
)
diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake
index 57c9dc1fe..ddd02c3c7 100644
--- a/ports/jxrlib/portfile.cmake
+++ b/ports/jxrlib/portfile.cmake
@@ -3,7 +3,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
vcpkg_download_distfile(ARCHIVE
URLS "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=jxrlib&changeSetId=e922fa50cdf9a58f40cad07553bcaa2883d3c5bf"
FILENAME "jxrlib_1_1.zip"
- SHA512 6e8b579108444e9bea8d01f57e2ac3b63963c084adb8e265cfd82bb1199b8bd168b8aa41319cf34b87e97db1d72d0f3cc2d3dac881fcd1a6f398fe808d55772d
+ SHA512 c4f42c690a2543b00ef9fe6e4f479b582e966b27c13e8b0efad39fa85d70b4edb60eac91a856c371a4e875e7a2769e0aba31b508ee61f7314150c6eb34a19c0b
)
vcpkg_extract_source_archive(${ARCHIVE})
@@ -26,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxrlib)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/jxrlib/LICENSE ${CURRENT_PACKAGES_DIR}/share/jxrlib/copyright)
-vcpkg_copy_pdbs() \ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
index 540e4eb5e..e060a2665 100644
--- a/ports/spdlog/CONTROL
+++ b/ports/spdlog/CONTROL
@@ -1,4 +1,4 @@
Source: spdlog
-Version: 0.13.0
+Version: 0.14.0
Description: Very fast, header only, C++ logging library
Build-Depends: fmt
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index c0adbf457..8cd05f343 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gabime/spdlog
- REF v0.13.0
- SHA512 5bb89cbeb17a054832ce70f6013d54e7641c1aa36cbad08388b4a2e63f4851943edfe292551ff01de6de1ed6325617384325a67f3e1024f346c6d22a1148c80c
+ REF v0.14.0
+ SHA512 f49b7f26f4fde57fe16f32ab89082f0c590645c627f5b4646f633a16f3eec2926b3465e742bc4899cb802e7b974978c547638205065e9955ed9696fbcaf0b444
HEAD_REF master
)
diff --git a/toolsrc/src/commands_edit.cpp b/toolsrc/src/commands_edit.cpp
index 4e83fcca8..12ddaad77 100644
--- a/toolsrc/src/commands_edit.cpp
+++ b/toolsrc/src/commands_edit.cpp
@@ -32,6 +32,15 @@ namespace vcpkg::Commands::Edit
if (env_EDITOR.empty())
{
+ const fs::path CODE_EXE_PATH = System::get_ProgramFiles_platform_bitness() / "Microsoft VS Code/Code.exe";
+ if (fs.exists(CODE_EXE_PATH))
+ {
+ env_EDITOR = CODE_EXE_PATH;
+ }
+ }
+
+ if (env_EDITOR.empty())
+ {
const fs::path CODE_EXE_PATH = System::get_ProgramFiles_32_bit() / "Microsoft VS Code/Code.exe";
if (fs.exists(CODE_EXE_PATH))
{
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-23 12:55:20 +0000