From nobody Mon Jul 17 12:51:08 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 4R4MQN280Wz4n8ld; Mon, 17 Jul 2023 12:51:08 +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 4R4MQN1kFFz42D1; Mon, 17 Jul 2023 12:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689598268; 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=nnOPcaOZJ7t4oo2gRYLpXNsiqe2EQ3KFRd3UC24Uvws=; b=H3y4pYMaLBDifK+YZJdyBZjYmGQTviAD7Vv89Dqjqyi2AXaMZt4UBOXzlN2IUi1g7+bUXk CL7zloHbcbu/JIGdfazDeZIODAiguAE75C6Nu4ZTU4IHALpa4UDqXamCTwecb1rhl7ID80 Gmd3G9YyAxo9Y+xuvuHOr1bfnEtujayxcz47kVfobPu/6hd9S+qVr3ek8yWfnc48o0yR5a 9oIQUSscQcdkouDj5k4J2+DB7AP/TzJwF67UpaLs472GehgcZrdxUGi3zy/AD4bDtbx1GH b+MzSYx8qRTBDtXvHYRGwIOLgVujXedIU7SUbpWAY96qnKXTFjPlcQBmPO4P3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689598268; 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=nnOPcaOZJ7t4oo2gRYLpXNsiqe2EQ3KFRd3UC24Uvws=; b=gEQQmk6l4D4m8ljS9w1NBKq39YMkL5osoxFEnWuBm4S1dSQKbLJmWuCHTN5XXHt08Jp6zA 8yTIMSv2Rv64rskLcIcELH7Bx9iuaoMn5XM2h5XZDtAWi9GE9Xj1eB2WgdhytN7WLDaV4E sILpuuN1tdgJfBNa3EpKQ01+OkYvkpidC9rU2sOisyC9w5BWUfuLPx4KCUBcKu5rbnXxV9 zmEF/MBpw/kGmDO2PljZk+D1l7zom8QgCz/DSPt0LYNGYCUr5OgLHZv4N+F2lDtmWRNoIW RjcPqxguDSuHJ3Nr79/JqMiIko/Wc254TofNBLIcto7kDsYGaJlJMyQeybntGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689598268; a=rsa-sha256; cv=none; b=nxuR9yAdDnK9t+2xI6RNj+V8mTow5IFLM73T8ChxptW2y3xin4VhVPL96CvylwGm6h6AIx Lm7/aWWP+kSR3ORrE8DtK/EfH4pAbY8WNItaE+Bh4D59B9YvlJcT1U2UKCv6r4OpQqCBIT OkrM2cVnLt/dsu2C3ENpaMKU72+IyNi1QDLaCBOb7XcBviK25wOXQjpS4CedrLoavkYUCL P4tEZaGEZbUXq5W86i/m3asPIfY+Wq8USIAFD0whTnQC6dRMMmYJiLP9dci+hKPdBF28nw IdOmvTmuLqoqzLED5q1CLnbeXvMDm4qB5zAB1VcTJpf0hZmkR6kGLIx5rOQWnA== 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 4R4MQN0qnLzPbG; Mon, 17 Jul 2023 12:51:08 +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 36HCp8O4092600; Mon, 17 Jul 2023 12:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HCp8Wf092599; Mon, 17 Jul 2023 12:51:08 GMT (envelope-from git) Date: Mon, 17 Jul 2023 12:51:08 GMT Message-Id: <202307171251.36HCp8Wf092599@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: 19f37018f591 - main - graphics/osgearth: Unbreak build 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: 19f37018f591aaca4ff811263237dfa5150a0614 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=19f37018f591aaca4ff811263237dfa5150a0614 commit 19f37018f591aaca4ff811263237dfa5150a0614 Author: Felix Palmen AuthorDate: 2023-07-16 19:00:41 +0000 Commit: Felix Palmen CommitDate: 2023-07-17 12:50:43 +0000 graphics/osgearth: Unbreak build The build failed with [...] error: no matching function for call to 'lerc_decode' /usr/local/include/Lerc_c_api.h:223:17: note: candidate function not viable: requires 10 arguments, but 9 were provided and two similar errors. It obviously picked up lerc headers from graphics/lerc although it uses a bundled lerc (which is directly built in, not linked). Add a patch to make sure the include path to the bundled lerc is prepended. With llvm15+, there was a second issue: /usr/include/c++/v1/__random/uniform_int_distribution.h:234:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_urng::value' [...] [...]work/osgearth-osgearth-3.2/src/osgEarth/catch.hpp:6539:18: note: in instantiation of function template specialization 'std::shuffle, Catch::RandomNumberGenerator &>' requested here std::shuffle( vector.begin(), vector.end(), rng ); This is caused by the RNG used there having a signed return type (ptrdiff_t) which is invalid, so add another patch to use size_t instead. Also update LIB_DEPENDS: - remove poco, it was never used, the application using it isn't connected to the build - remove leveldb, it's used by an optional component not enabled by default (could be supported by a port option) - add webp, as advised by stage-qa Approved by: portmgr (blanket) --- graphics/osgearth/Makefile | 11 +++++------ .../files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt | 8 ++++++++ graphics/osgearth/files/patch-src_osgEarth_catch.hpp | 11 +++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 534153ff742f..b5fc4011a837 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -1,7 +1,7 @@ PORTNAME= osgearth PORTVERSION= 3.2 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics geography MAINTAINER= lbartoletti@FreeBSD.org @@ -11,13 +11,12 @@ 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 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; } +