From nobody Thu Oct 26 06:53:48 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGGjS2pttz4ycxw; Thu, 26 Oct 2023 06:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGGjS2B3Jz4vGY; Thu, 26 Oct 2023 06:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698303228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tKj5GutVpzds8bGIy1vwHgBHnAq5xyKP9xWCYnFyUtc=; b=jW9GQKInbzOruXqEtHRhvGytc8UXQZfyQTgxjwd2gzrjoGfztifPilG0ih0wsvqs4+kNyy j1U9miFLkvE5N56oGAlBXzPqIa9aCykjlAe0wuJg2YcL1EbSOxf8c7/SKdRF7iTgJglBZc Mp526IBUbvUtgIGtKm2uUhA4o/BZqRZcxPcg7qusi0etZp8WzGTd+EpSMu1cwM8g14FeuG PUfKUd0s/O0Ab/EtGA2TR6PRhxrTKw5PEHam0hzY1HGUzu0awUGehgeoQ3Drt553LrJ6// C5BB6ba9bc2oF7L8d7W1dLKa4TttAHkcve6FirgQaXHnIRgbksvldWahrCVDMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698303228; a=rsa-sha256; cv=none; b=lGh/9Ka8BcfTvUVYKnvFZ+5/gBCacdKRa9qLszwTaqhvkZhvklstJW8+w+4FTE9iRwPO6E hPnjQZdGy0iXvmPCLJ+du34NixKVHtmdrPEW1DyfFhxbxNyl0jcpetmCXQQJLCrIQCueb7 xvNALT/lmfNoVfkUdPAoeTreNAFLcDPN+mszUfjf/pMlrGGpJmezpCaK8sz3+Sh+LeL0pz +PakebgRFl699sqDINFQX06JWxjYvbLLsh1txi9iUESSHgf3gorNF/CZwGQepHrcPajJ+X J7UJpLcqcbsqm8gKkOZqPd/WQa2Hw1MKOrbz4WM2mmQ0b2SHQGZCwOX8n+nYag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698303228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tKj5GutVpzds8bGIy1vwHgBHnAq5xyKP9xWCYnFyUtc=; b=SH5Kc4851m8ewtUWBrcp7Q6raaym8wcU8V/fEUHSGjAr1nU6vANqgwJa2SysCgQKFQuD2K 8vpGg//LKLxhmyXZByNvwIr6tQ+BH0ebepdwEEwZuGe4UlHCbobATjNOPyvzgk9k7rhe0S PGM2DfZb34BbyWG5Xmy+DQkoiLmowSuhSOy9JKIbCGNR8M/lwZVlUTkQ4aHMpwLKlNkp5q A4ysSGpC7euRx9h5ziT3AIZT7yNZy2FHB6vak0WM4GRIAWdtfX2KiRwAxrR/iJuDbTHhgb GFQEHjKUIpN/K5mvvcF9VnNn+1wvI/2b2zcWod3JJzIDswkAZUql4lxG9wcnFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGGjS1Gf6z6LX; Thu, 26 Oct 2023 06:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39Q6rmmG021063; Thu, 26 Oct 2023 06:53:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39Q6rm0c021060; Thu, 26 Oct 2023 06:53:48 GMT (envelope-from git) Date: Thu, 26 Oct 2023 06:53:48 GMT Message-Id: <202310260653.39Q6rm0c021060@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 30f031e8546c - main - graphics/osgearth: Update to 3.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30f031e8546c1a95b275bca4cb3c012ad21cfae7 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=30f031e8546c1a95b275bca4cb3c012ad21cfae7 commit 30f031e8546c1a95b275bca4cb3c012ad21cfae7 Author: Felix Palmen AuthorDate: 2023-10-25 09:11:03 +0000 Commit: Felix Palmen CommitDate: 2023-10-26 06:53:30 +0000 graphics/osgearth: Update to 3.5 Changes: * New osgEarthCesium nodekit using the cesium-native SDK for 3D-Tiles integration * Upgrades to the TerrainConstraintLayer for better meshing, performance, and support for 3D model constraints * New TerrainMeshLayer for "bring your own" terrain surface meshing * Integration of spdlog logging SDK (optional) * Various updates to the osgearth_imgui panels * Updated Triton and Silverlining shader sets Reported by: portscout --- graphics/osgearth/Makefile | 26 +++++++++++++++++--------- graphics/osgearth/distinfo | 6 +++--- graphics/osgearth/files/patch-CMakeLists.txt | 14 +++++++------- graphics/osgearth/pkg-plist | 13 +++---------- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 77e8db765fec..97da332dcd2b 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -1,6 +1,5 @@ PORTNAME= osgearth -PORTVERSION= 3.4 -PORTREVISION= 3 +PORTVERSION= 3.5 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= graphics geography @@ -13,33 +12,42 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libgdal.so:graphics/gdal \ - libgeos.so:graphics/geos \ + libgeos_c.so:graphics/geos \ libosg.so:graphics/osg \ - libprotoc.so:devel/protobuf \ + libprotobuf.so:devel/protobuf \ libwebp.so:graphics/webp -USES= cmake compiler:c++11-lang gl pkgconfig sqlite - +USES= cmake compiler:c++14-lang gl pkgconfig sqlite +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= gwaldron ocornut:imgui Esri:lerc Tencent:rapidjson GH_PROJECT= imgui:imgui lerc:lerc rapidjson:rapidjson GH_TAGNAME= 9e8e5ac:imgui 19542a0:lerc f54b0e4:rapidjson - -USE_CXXSTD= c++11 +USE_GL= gl USE_LDCONFIG= yes -USE_GL+= gl glu CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ -DCMAKE_LIBRARY_PATH:PATH=${LOCALBASE}/lib \ -DLIB_POSTFIX:STRING="" +LDFLAGS+= -Wl,--as-needed + PLIST_SUB= PORTVERSION=${PORTVERSION} +OPTIONS_DEFINE= SPDLOG +OPTIONS_DEFAULT= SPDLOG +SPDLOG_DESC= Logging support via devel/spdlog + +SPDLOG_LIB_DEPENDS= libspdlog.so:devel/spdlog + post-extract: .for sm in imgui lerc rapidjson @${MV} ${WRKSRC_${sm}}/* ${WRKSRC}/src/third_party/${sm}/ .endfor +post-patch-SPDLOG-off: + @${REINPLACE_CMD} '/find_package(spdlog)/d' ${WRKSRC}/CMakeLists.txt + .include .if ${ARCH} != amd64 diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo index ae9a78f59d26..2d0aa6d34d2f 100644 --- a/graphics/osgearth/distinfo +++ b/graphics/osgearth/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1689531343 -SHA256 (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 2a5aabd6950c598b2310842dfa1e9cf085d54692a0c787cef5627530fcbe682e -SIZE (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 119642993 +TIMESTAMP = 1698300300 +SHA256 (gwaldron-osgearth-osgearth-3.5_GH0.tar.gz) = 9204759f3df0d05356bdead71c13b9e9a086c9ebfa3daa93c149dd7aa664d378 +SIZE (gwaldron-osgearth-osgearth-3.5_GH0.tar.gz) = 119658258 SHA256 (ocornut-imgui-9e8e5ac_GH0.tar.gz) = da877be818e7f4f20915c9982081f958bf5f68b26a5afde64c263427aff8097b SIZE (ocornut-imgui-9e8e5ac_GH0.tar.gz) = 1592220 SHA256 (Esri-lerc-19542a0_GH0.tar.gz) = 5d48ae91b45343c68da336ef6996af3b9495452970185244e21253f4c711e529 diff --git a/graphics/osgearth/files/patch-CMakeLists.txt b/graphics/osgearth/files/patch-CMakeLists.txt index ab12b4b6f4f0..105746ac83b5 100644 --- a/graphics/osgearth/files/patch-CMakeLists.txt +++ b/graphics/osgearth/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- CMakeLists.txt.orig 2023-07-17 15:47:49 UTC +--- CMakeLists.txt.orig 2023-10-23 13:54:59 UTC +++ CMakeLists.txt -@@ -335,4 +335,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConf - COMPATIBILITY SameMajorVersion ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_PREFIX}/cmake ) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/osgEarth ) +@@ -302,4 +302,4 @@ install( + ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake + DESTINATION +- ${CMAKE_INSTALL_PREFIX}/cmake ) ++ ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/osgEarth ) diff --git a/graphics/osgearth/pkg-plist b/graphics/osgearth/pkg-plist index 05b9cb587be0..0b9c9ee1476c 100644 --- a/graphics/osgearth/pkg-plist +++ b/graphics/osgearth/pkg-plist @@ -1,23 +1,19 @@ -bin/osgEarth_tests bin/osgearth_3pv bin/osgearth_annotation bin/osgearth_atlas bin/osgearth_bakefeaturetiles -bin/osgearth_bindless bin/osgearth_boundarygen bin/osgearth_city bin/osgearth_clamp bin/osgearth_cluster bin/osgearth_conv bin/osgearth_createtile -bin/osgearth_drawables bin/osgearth_eci bin/osgearth_ephemeris bin/osgearth_featurefilter bin/osgearth_features bin/osgearth_graticule bin/osgearth_heatmap -bin/osgearth_horizon bin/osgearth_infinitescroll bin/osgearth_lights bin/osgearth_los @@ -28,8 +24,6 @@ bin/osgearth_minimap bin/osgearth_mrt bin/osgearth_mvtindex bin/osgearth_occlusionculling -bin/osgearth_overlayviewer -bin/osgearth_shadercomp bin/osgearth_skyview bin/osgearth_terrainprofile bin/osgearth_tfs @@ -62,7 +56,6 @@ include/osgEarth/BillboardSymbol include/osgEarth/Bing include/osgEarth/Bounds include/osgEarth/BufferFilter -include/osgEarth/BuildConfig.h include/osgEarth/BuildGeometryFilter include/osgEarth/BuildTextFilter include/osgEarth/Cache @@ -222,7 +215,6 @@ include/osgEarth/MVT include/osgEarth/Map include/osgEarth/MapboxGLGlyphManager include/osgEarth/MapCallback -include/osgEarth/MapInfo include/osgEarth/MapModelChange include/osgEarth/MapNode include/osgEarth/MapNodeObserver @@ -332,6 +324,7 @@ include/osgEarth/TerrainEffect include/osgEarth/TerrainEngineNode include/osgEarth/TerrainEngineRequirements include/osgEarth/TerrainLayer +include/osgEarth/TerrainMeshLayer include/osgEarth/TerrainOptions include/osgEarth/TerrainProfile include/osgEarth/TerrainResources @@ -362,6 +355,7 @@ include/osgEarth/TileSourceImageLayer include/osgEarth/TileVisitor include/osgEarth/TiledFeatureModelGraph include/osgEarth/TiledFeatureModelLayer +include/osgEarth/TiledModelLayer include/osgEarth/TimeControl include/osgEarth/TimeSeriesImage include/osgEarth/TopologyGraph @@ -382,7 +376,6 @@ include/osgEarth/VisibleLayer include/osgEarth/WFS include/osgEarth/WMS include/osgEarth/WindLayer -include/osgEarth/WingedEdgeMesh include/osgEarth/WireLines include/osgEarth/XYZ include/osgEarth/XYZFeatureSource @@ -430,7 +423,7 @@ include/osgEarthDrivers/scriptengine_javascript/duktape.h include/osgEarthDrivers/sky_gl/GLSkyOptions include/osgEarthDrivers/sky_simple/SimpleSkyOptions lib/libosgEarth.so -lib/libosgEarth.so.148 +lib/libosgEarth.so.149 lib/libosgEarth.so.%%PORTVERSION%%.0 lib/osgPlugins-3.6.5/osgdb_earth.so lib/osgPlugins-3.6.5/osgdb_fastdxt.so