diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 534153ff742f..b5fc4011a837 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -1,52 +1,51 @@ PORTNAME= osgearth PORTVERSION= 3.2 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics geography MAINTAINER= lbartoletti@FreeBSD.org COMMENT= C++ terrain rendering toolkit for OpenSceneGraph WWW= http://osgearth.org/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libosg.so:graphics/osg \ +LIB_DEPENDS= libcurl.so:ftp/curl \ libgdal.so:graphics/gdal \ - libcurl.so:ftp/curl \ libgeos.so:graphics/geos \ - libleveldb.so:databases/leveldb \ - libPocoUtil.so:devel/poco \ - libprotoc.so:devel/protobuf + libosg.so:graphics/osg \ + libprotoc.so:devel/protobuf \ + libwebp.so:graphics/webp USES= cmake gl pkgconfig sqlite USE_GITHUB= yes GH_ACCOUNT= gwaldron USE_CXXSTD= c++11 USE_LDCONFIG= yes USE_GL+= gl glu CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ -DCMAKE_LIBRARY_PATH:PATH=${LOCALBASE}/lib \ -DLIB_POSTFIX:STRING="" PLIST_SUB= PORTVERSION=${PORTVERSION} .include .if ${ARCH:Mpowerpc64*} CXXFLAGS+= -DNO_WARN_X86_INTRINSICS -maltivec -mvsx USES+= compiler:gcc-c++11-lib .else USES+= compiler:c++11-lang .endif .include .if ${ARCH} == i386 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-i386 .endif .include diff --git a/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt new file mode 100644 index 000000000000..6c8bcc143041 --- /dev/null +++ b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt @@ -0,0 +1,8 @@ +--- src/osgEarthDrivers/lerc/CMakeLists.txt.orig 2021-08-09 17:37:52 UTC ++++ src/osgEarthDrivers/lerc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-INCLUDE_DIRECTORIES( ../../third_party/lerc ) ++INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc ) + + SET(TARGET_SRC + ReaderWriterLERC.cpp diff --git a/graphics/osgearth/files/patch-src_osgEarth_catch.hpp b/graphics/osgearth/files/patch-src_osgEarth_catch.hpp new file mode 100644 index 000000000000..f92d1840daa7 --- /dev/null +++ b/graphics/osgearth/files/patch-src_osgEarth_catch.hpp @@ -0,0 +1,11 @@ +--- src/osgEarth/catch.hpp.orig 2023-07-17 06:00:01 UTC ++++ src/osgEarth/catch.hpp +@@ -6523,7 +6523,7 @@ namespace Catch { + namespace Catch { + + struct RandomNumberGenerator { +- typedef std::ptrdiff_t result_type; ++ typedef std::size_t result_type; + + result_type operator()( result_type n ) const { return std::rand() % n; } +