diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index b9c99ca7c9..aabe5bb807 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_from_github( fix-sdl.patch fix-nvtt-squish.patch plugin-pdb-install.patch - use-boost-asio.patch osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode openexr3.patch unofficial-export.patch @@ -66,9 +65,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 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 ) # The package osg can be configured to use different OpenGL profiles via a custom triplet file: diff --git a/ports/osg/use-boost-asio.patch b/ports/osg/use-boost-asio.patch deleted file mode 100644 index 4d804973c0..0000000000 --- a/ports/osg/use-boost-asio.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/CMakeModules/FindAsio.cmake b/CMakeModules/FindAsio.cmake -index 433d5c7..04a0edf 100644 ---- a/CMakeModules/FindAsio.cmake -+++ b/CMakeModules/FindAsio.cmake -@@ -1,22 +1,7 @@ - # Locate ASIO-headers (http://think-async.com/Asio) --# This module defines --# ASIO_FOUND, if false, do not try to link to gdal --# ASIO_INCLUDE_DIR, where to find the headers --# - # Created by Stephan Maximilian Huber - --FIND_PATH(ASIO_INCLUDE_DIR -- NAMES -- asio.hpp -- PATHS -- /usr/include -- /usr/local/include --) -- --SET(ASIO_FOUND "NO") --IF(ASIO_INCLUDE_DIR) -- FIND_PACKAGE( Boost 1.37 ) -- IF(Boost_FOUND) -- SET(ASIO_FOUND "YES") -- ENDIF() -+FIND_PACKAGE( Boost 1.37 COMPONENTS asio ) -+IF(Boost_FOUND) -+ SET(ASIO_FOUND "YES") - ENDIF() -diff --git a/src/osgPlugins/RestHttpDevice/CMakeLists.txt b/src/osgPlugins/RestHttpDevice/CMakeLists.txt -index 8464b9d..073e8ed 100644 ---- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt -+++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt -@@ -1,5 +1,4 @@ - INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) --INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR}) - - SET(TARGET_SRC - connection.cpp -diff --git a/src/osgPlugins/RestHttpDevice/connection.hpp b/src/osgPlugins/RestHttpDevice/connection.hpp -index 99f3a93..b205759 100644 ---- a/src/osgPlugins/RestHttpDevice/connection.hpp -+++ b/src/osgPlugins/RestHttpDevice/connection.hpp -@@ -11,7 +11,7 @@ - #ifndef HTTP_SERVER_CONNECTION_HPP - #define HTTP_SERVER_CONNECTION_HPP - --#include -+#include - #include - #include - #include -diff --git a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp -index 1d363a8..b6e7195 100644 ---- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp -+++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp -@@ -11,7 +11,7 @@ - #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP - #define HTTP_SERVER_IO_SERVICE_POOL_HPP - --#include -+#include - #include - #include - #include -diff --git a/src/osgPlugins/RestHttpDevice/reply.hpp b/src/osgPlugins/RestHttpDevice/reply.hpp -index 89f264a..b63d0b9 100644 ---- a/src/osgPlugins/RestHttpDevice/reply.hpp -+++ b/src/osgPlugins/RestHttpDevice/reply.hpp -@@ -13,7 +13,7 @@ - - #include - #include --#include -+#include - #include "header.hpp" - - namespace http { -diff --git a/src/osgPlugins/RestHttpDevice/server.hpp b/src/osgPlugins/RestHttpDevice/server.hpp -index a14f263..91c4b62 100644 ---- a/src/osgPlugins/RestHttpDevice/server.hpp -+++ b/src/osgPlugins/RestHttpDevice/server.hpp -@@ -11,7 +11,7 @@ - #ifndef HTTP_SERVER_SERVER_HPP - #define HTTP_SERVER_SERVER_HPP - --#include -+#include - #include - #include - #include diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 30a3d86f9e..1f01fd6db9 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 22, + "port-version": 23, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, @@ -50,14 +50,6 @@ ], "platform": "!uwp" }, - { - "name": "osg", - "default-features": false, - "features": [ - "rest-http-device" - ], - "platform": "!windows" - }, { "name": "osg", "default-features": false, @@ -170,20 +162,6 @@ } ] }, - "rest-http-device": { - "description": "Build RestHttpDevice plugin", - "supports": "!windows", - "dependencies": [ - "boost-array", - "boost-asio", - "boost-bind", - "boost-core", - "boost-lexical-cast", - "boost-logic", - "boost-smart-ptr", - "boost-tuple" - ] - }, "sdl1": { "description": "Build SDL 1 plugin, and enable SDL 1 app features", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 12904160b6..3db16eff6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6554,7 +6554,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 22 + "port-version": 23 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 40d4e8d984..02e47a455b 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d5d70476050457412d48f466d6215430c8ba64", + "version": "3.6.5", + "port-version": 23 + }, { "git-tree": "27f28ccf9745bc2ca1757d5fa32b92373c176e2a", "version": "3.6.5",