mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

graphics/osgearth: Fix build with protobuf 22+

Browse Source 
Note that this port has a PLIST issue if libzip is installed.

====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: lib/osgPlugins-3.6.5/osgdb_zip.so
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
*** Error code 1
This commit is contained in:
Po-Chuan Hsieh 2023-12-15 00:22:32 +08:00
parent 066b9d5611
commit 07238aa570
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/osgearth/Makefile
View File

@ -17,8 +17,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libprotobuf.so:devel/protobuf \
libwebp.so:graphics/webp
USES= cmake compiler:c++14-lang gl pkgconfig sqlite
USE_CXXSTD= c++14
USES= cmake compiler:c++17-lang gl pkgconfig sqlite
USE_CXXSTD= c++17
USE_GITHUB= yes
GH_ACCOUNT= gwaldron ocornut:imgui Esri:lerc Tencent:rapidjson
GH_PROJECT= imgui:imgui lerc:lerc rapidjson:rapidjson

22
graphics/osgearth/files/patch-protobuf Normal file
View File

@ -0,0 +1,22 @@
--- CMakeLists.txt.orig 2023-11-03 04:00:05.529976000 +0800
+++ CMakeLists.txt 2023-11-03 04:02:22.522059000 +0800
@@ -23,7 +23,7 @@
set(OSGEARTH_SOVERSION 149)
# Require C++11
-set_property(GLOBAL PROPERTY CXX_STANDARD 11)
+set_property(GLOBAL PROPERTY CXX_STANDARD 17)
set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED ON)
# Detect out-of-source build. You should always do an out-of-source build!
--- src/osgEarthDrivers/fastdxt/intrinsic.cpp.orig 2023-05-16 14:53:59 UTC
+++ src/osgEarthDrivers/fastdxt/intrinsic.cpp
@@ -45,7 +45,7 @@
void ExtractBlock_Intrinsics( const byte *inPtr, int width, byte *colorBlock )
{
__m128i t0, t1, t2, t3;
- register int w = width << 2; // width*4
+ int w = width << 2; // width*4
t0 = _mm_load_si128 ( (__m128i*) inPtr );
_mm_store_si128 ( (__m128i*) &colorBlock[0], t0 ); // copy first row, 16bytes