mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[asmjit]: repair (#48431)
Co-authored-by: Chris Sarbora <tophyr@gmail.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO asmjit/asmjit
|
||||
REF e1b20711cc40c29ec4918b54e328ace96470f6e5 # commited on 2025-10-12
|
||||
SHA512 5d40840ce203bcef86d81b3538be7a4443dbcba52735cf9c90bc9c974d3c7e1ab75ff0fd7e2c72533d73884cce93808e63aa2228c2b7c5376aee4437070714a2
|
||||
REF 9eb6edbf711ceb25346ee40bae68b40a4505cdf5 # commited on 2025-05-08
|
||||
SHA512 9c3567634205bf0c64462833b28b6bbf1c1965216aa09872196048953417fab18822d94d70d112f7a506396a5b94716d714316dd2559c3509edf1273650768b9
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
@@ -12,7 +12,7 @@ vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DASMJIT_STATIC=${ASMJIT_STATIC}
|
||||
)
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asmjit",
|
||||
"version-date": "2025-10-12",
|
||||
"version-date": "2025-10-13",
|
||||
"description": "AsmJit is a lightweight library for machine code generation written in C++ language",
|
||||
"homepage": "https://asmjit.com/",
|
||||
"documentation": "https://asmjit.com/doc/",
|
||||
|
||||
@@ -1,15 +1,28 @@
|
||||
set(PATCHES
|
||||
fix-dependencies.patch
|
||||
fix-static-ffmpeg.patch
|
||||
imath-version-guard.patch
|
||||
fix-openimageio_include_dir.patch
|
||||
fix-openexr-target-missing.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
execute_process(COMMAND xcrun --show-sdk-version
|
||||
OUTPUT_VARIABLE OSX_SDK_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(${OSX_SDK_VERSION} VERSION_GREATER_EQUAL 26)
|
||||
# macOS 26 Tahoe has removed AGL APIs https://bugreports.qt.io/browse/QTBUG-137687
|
||||
list(APPEND PATCHES remove-agl-framework.patch)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO AcademySoftwareFoundation/OpenImageIO
|
||||
REF "v${VERSION}"
|
||||
SHA512 cee6ddfbd825022a45a46b041c894a18718a474a32da8715fe08f918c7387505e81f3220c0ad79d3ec160b9c224bdeafbbb8a2b67a47cd845dca492582607c22
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-dependencies.patch
|
||||
fix-static-ffmpeg.patch
|
||||
imath-version-guard.patch
|
||||
fix-openimageio_include_dir.patch
|
||||
fix-openexr-target-missing.patch
|
||||
PATCHES ${PATCHES}
|
||||
)
|
||||
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
|
||||
|
||||
26
ports/openimageio/remove-agl-framework.patch
Normal file
26
ports/openimageio/remove-agl-framework.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
|
||||
index 6f81e2600..d575a2b4b 100644
|
||||
--- a/src/nuke/txReader/CMakeLists.txt
|
||||
+++ b/src/nuke/txReader/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@ elseif (APPLE)
|
||||
set_target_properties (txReader PROPERTIES
|
||||
PREFIX ""
|
||||
COMPILE_OPTIONS -arch x86_64
|
||||
- LINK_FLAGS "-arch x86_64 -bundle -framework QuartzCore -framework IOKit -framework CoreFoundation -framework Carbon -framework ApplicationServices -framework OpenGL -framework AGL")
|
||||
+ LINK_FLAGS "-arch x86_64 -bundle -framework QuartzCore -framework IOKit -framework CoreFoundation -framework Carbon -framework ApplicationServices -framework OpenGL")
|
||||
else ()
|
||||
target_compile_definitions (txReader PRIVATE USE_GLEW)
|
||||
set_target_properties (txReader PROPERTIES
|
||||
diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
|
||||
index eb090af64..a34d6e6dd 100644
|
||||
--- a/src/nuke/txWriter/CMakeLists.txt
|
||||
+++ b/src/nuke/txWriter/CMakeLists.txt
|
||||
@@ -20,7 +20,7 @@ elseif (APPLE)
|
||||
set_target_properties (txWriter PROPERTIES
|
||||
PREFIX ""
|
||||
COMPILE_OPTIONS -arch x86_64
|
||||
- LINK_FLAGS "-arch x86_64 -bundle -framework QuartzCore -framework IOKit -framework CoreFoundation -framework Carbon -framework ApplicationServices -framework OpenGL -framework AGL")
|
||||
+ LINK_FLAGS "-arch x86_64 -bundle -framework QuartzCore -framework IOKit -framework CoreFoundation -framework Carbon -framework ApplicationServices -framework OpenGL")
|
||||
# N.B. After CMake 3.13, use LINK_OPTIONS (list, not string)
|
||||
else ()
|
||||
target_compile_definitions (txWriter PRIVATE USE_GLEW)
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "openimageio",
|
||||
"version": "3.0.9.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
|
||||
"homepage": "https://github.com/OpenImageIO/oiio",
|
||||
"license": "BSD-3-Clause",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "88ff534e5bff4ad41d0baf07968d767f4a5baa12",
|
||||
"version-date": "2025-10-13",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "73026ced267f3dc6bb1da26712476034cfa2a004",
|
||||
"version-date": "2025-10-12",
|
||||
|
||||
@@ -309,7 +309,7 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"asmjit": {
|
||||
"baseline": "2025-10-12",
|
||||
"baseline": "2025-10-13",
|
||||
"port-version": 0
|
||||
},
|
||||
"asmtk": {
|
||||
@@ -7222,7 +7222,7 @@
|
||||
},
|
||||
"openimageio": {
|
||||
"baseline": "3.0.9.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"openjpeg": {
|
||||
"baseline": "2.5.4",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "780866629207436afdc4882082116feeb7ccf677",
|
||||
"version": "3.0.9.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "e54820d7e44c55eb9d15a76810a5d0905192e83e",
|
||||
"version": "3.0.9.1",
|
||||
|
||||
Reference in New Issue
Block a user