Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[nvtt,osg] Update feature baseline, fix osg:android (#45213)

Browse Source
This commit is contained in:
Kai Pastor
2025-04-28 23:17:48 +02:00
committed by GitHub
parent ea3cd1e405
commit 1bdadb8cc5
9 changed files with 72 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ports/nvtt/vcpkg.json
View File

@@ -1,11 +1,11 @@
{
"name": "nvtt",
"version": "2.1.2",
"port-version": 8,
"port-version": 9,
"description": "Texture processing tools with support for Direct3D 10 and 11 formats.",
"homepage": "https://github.com/castano/nvidia-texture-tools",
"license": "MIT",
"supports": "!uwp & !arm",
"supports": "!android & !uwp & !arm",
"dependencies": [
"libsquish",
{

22
ports/osg/android.diff Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d0acf8..d5ebe90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -734,7 +734,7 @@ OPTION(OSG_USE_LOCAL_LUA_SOURCE "Enable to use local Lua source when building th
# you can use the following style of command line option when invoking Cmake (here illustrating ignoring PythonLibs) :
# cmake -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=1 .
#
-IF(ANDROID)
+IF(0)
ANDROID_3RD_PARTY()
ELSE()
# Common to all platforms except android:
@@ -815,7 +815,7 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
# Image readers/writers depend on 3rd party libraries except for OS X which
# can use Quicktime.
-IF(NOT ANDROID)
+IF(1)
IF(NOT APPLE)
FIND_PACKAGE(GIFLIB)
FIND_PACKAGE(JPEG)

49
ports/osg/portfile.cmake
View File

@@ -17,6 +17,7 @@ vcpkg_from_github(
unofficial-export.patch
fix-min-max-macro.patch
fix-error-c3861.patch
android.diff
)
file(REMOVE
@@ -66,18 +67,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
nvtt CMAKE_REQUIRE_FIND_PACKAGE_NVTT
openexr BUILD_OSG_PLUGIN_EXR
openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR
rest-http-device BUILD_OSG_PLUGIN_RESTHTTPDEVICE
rest-http-device CMAKE_REQUIRE_FIND_PACKAGE_Boost
sdl1 BUILD_OSG_PLUGIN_SDL
INVERTED_FEATURES
sdl1 CMAKE_DISABLE_FIND_PACKAGE_SDL # for apps and examples
rest-http-device CMAKE_DISABLE_FIND_PACKAGE_Boost
sdl1 VCPKG_LOCK_FIND_PACKAGE_SDL
)
# The package osg can be configured to use different OpenGL profiles via a custom triplet file:
# Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3, and GLES2+GLES3
if(NOT DEFINED osg_OPENGL_PROFILE)
set(osg_OPENGL_PROFILE "GL2")
if(VCPKG_TARGET_IS_ANDROID)
set(osg_OPENGL_PROFILE "GLES2")
endif()
endif()
# Plugin control variables are used only if prerequisites are satisfied.
@@ -95,31 +95,34 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC}
-DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC}
-DOSG_MSVC_VERSIONED_DLL=OFF
-DOSG_DETERMINE_WIN_VERSION=OFF
-DUSE_3RDPARTY_BIN=OFF
-DBUILD_OSG_PLUGIN_DICOM=OFF
-DBUILD_OSG_PLUGIN_OPENCASCADE=OFF
-DBUILD_OSG_PLUGIN_INVENTOR=OFF
-DBUILD_OSG_PLUGIN_FBX=OFF
-DBUILD_OSG_PLUGIN_DIRECTSHOW=OFF
-DBUILD_OSG_PLUGIN_LAS=OFF
-DBUILD_OSG_PLUGIN_QTKIT=OFF
-DBUILD_OSG_PLUGIN_SVG=OFF
-DBUILD_OSG_PLUGIN_VNC=OFF
-DBUILD_OSG_PLUGIN_LUA=OFF
-DOPENGL_PROFILE=${osg_OPENGL_PROFILE}
-DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF
-DBUILD_DASHBOARD_REPORTS=OFF
-DCMAKE_CXX_STANDARD=11
-DCMAKE_POLICY_DEFAULT_CMP0057=NEW
-DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC}
-DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC}
-DOPENGL_PROFILE=${osg_OPENGL_PROFILE}
-DOSG_MSVC_VERSIONED_DLL=OFF
-DOSG_DETERMINE_WIN_VERSION=OFF
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
-DUSE_3RDPARTY_BIN=OFF
# Plugins
-DBUILD_OSG_PLUGIN_DICOM=OFF
-DBUILD_OSG_PLUGIN_DIRECTSHOW=OFF
-DBUILD_OSG_PLUGIN_FBX=OFF
-DBUILD_OSG_PLUGIN_INVENTOR=OFF
-DBUILD_OSG_PLUGIN_LAS=OFF
-DBUILD_OSG_PLUGIN_LUA=OFF
-DBUILD_OSG_PLUGIN_OPENCASCADE=OFF
-DBUILD_OSG_PLUGIN_QTKIT=OFF
-DBUILD_OSG_PLUGIN_RESTHTTPDEVICE=OFF
-DBUILD_OSG_PLUGIN_SVG=OFF
-DBUILD_OSG_PLUGIN_VNC=OFF
-DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON
-DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON
-DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON
-DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Inventor=ON
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
${OPTIONS}
OPTIONS_DEBUG
-DBUILD_OSG_APPLICATIONS=OFF

6
ports/osg/vcpkg.json
View File

@@ -1,7 +1,7 @@
{
"name": "osg",
"version": "3.6.5",
"port-version": 26,
"port-version": 27,
"description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
"homepage": "https://www.openscenegraph.com/",
"license": null,
@@ -35,7 +35,7 @@
"freetype",
{
"name": "nvtt",
"platform": "!x86 & !(windows & arm64) & !uwp"
"platform": "x64 & (linux | osx | windows) & !uwp"
},
{
"name": "openexr",
@@ -55,6 +55,7 @@
},
"examples": {
"description": "Enable to build OSG Examples",
"supports": "!android",
"dependencies": [
{
"name": "libiconv",
@@ -152,6 +153,7 @@
},
"tools": {
"description": "Enable to build OSG Applications (e.g. osgviewer)",
"supports": "!android",
"dependencies": [
{
"name": "curl",

1
scripts/ci.baseline.txt
View File

@@ -734,7 +734,6 @@ ngspice:x64-windows-static=fail
nrf-ble-driver:arm-neon-android=fail
nrf-ble-driver:arm64-android=fail
nrf-ble-driver:x64-android=fail
nvtt:x64-android=fail
oatpp-libressl:x64-android=fail
offscale-libetcd-cpp:arm64-uwp=fail
offscale-libetcd-cpp:x64-uwp=fail

14
scripts/ci.feature.baseline.txt
View File

@@ -1523,6 +1523,7 @@ numcpp:x64-uwp = cascade
numcpp[python]:arm64-windows = cascade
nuspell:arm64-uwp = cascade
nuspell:x64-uwp = cascade
nvtt[cuda](osx) = cascade
nvtt[cuda]:x86-windows = cascade
oatpp-mbedtls:arm64-uwp = cascade
oatpp-mbedtls:x64-uwp = cascade
@@ -1633,15 +1634,11 @@ openvino:x64-uwp = cascade
openvms[cuda](osx) = cascade
openvpn3:arm64-uwp = cascade
openvpn3:x64-uwp = cascade
osg[default-features]:arm64-osx = cascade
osg[nvtt]:arm64-osx = cascade
osg[nvtt]:arm64-windows = cascade
osg[nvtt](android | arm) = cascade
osg[sdl1](android | osx) = cascade
osg-qt:arm64-osx = cascade
osg-qt:arm64-uwp = cascade
osg-qt:arm64-windows = cascade
osg-qt:x64-uwp = cascade
osgearth:x64-uwp = cascade
osg-qt(arm) = cascade
osg-qt(uwp) = cascade
osgearth(uwp) = cascade
osmanip:arm64-uwp = cascade
osmanip:x64-uwp = cascade
pagmo2:arm64-uwp = cascade
@@ -2249,6 +2246,7 @@ ms-quic(windows) = fail # fixed upstream. See https://github.com/microsoft/vcpkg
msdfgen[core,extensions,geometry-preprocessing,openmp,tools](osx) = combination-fails # requires openmp (works with right setup)
msdfgen[openmp](osx) = feature-fails # No openmp on osx
mygui[tools](osx) = feature-fails # Linker errors undefined symbols. See https://github.com/microsoft/vcpkg/issues/34416
nvtt[cuda](x64 & (linux | windows)) = feature-fails # nvtt getting dated wrt cuda
opencv2[ffmpeg](!windows) = feature-fails # ffmpeg5+ is not supported under opencv2. See https://github.com/microsoft/vcpkg/issues/32151
opencv2[python](osx) = feature-fails # requires python2
opencv2[world] = feature-fails # See https://github.com/microsoft/vcpkg/issues/29943

4
versions/baseline.json
View File

@@ -6658,7 +6658,7 @@
},
"nvtt": {
"baseline": "2.1.2",
"port-version": 8
"port-version": 9
},
"nyan-lang": {
"baseline": "0.3.1",
@@ -7018,7 +7018,7 @@
},
"osg": {
"baseline": "3.6.5",
"port-version": 26
"port-version": 27
},
"osg-qt": {
"baseline": "Qt5",

5
versions/n-/nvtt.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "89adc1b43d44f5f959d95d3e613d5c83442c7691",
"version": "2.1.2",
"port-version": 9
},
{
"git-tree": "3da8e5721ec0b2c3a408e5708802209258ae8945",
"version": "2.1.2",

5
versions/o-/osg.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8cade93544c5e86bae462e7ac5667d6bb2ed6f04",
"version": "3.6.5",
"port-version": 27
},
{
"git-tree": "782637270e1dff6f57b081ce594dc8eb413059c5",
"version": "3.6.5",