From nobody Mon Jul 17 19:44:26 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 4R4XbH0d4qz4nNFs; Mon, 17 Jul 2023 19:44:27 +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 4R4XbH08M0z41yG; Mon, 17 Jul 2023 19:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689623067; 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=W7JZgfBeef+Dg2Q91JILBXoc9/nSj7cxN1puyQb2dfk=; b=yvoyFX2A8SbrRFgs6u8RKLuNYQLDDJ0wcR3erE1L5hVMLp5+yp8H6yPYOMciZN0HiFU/UB 4AoFChNlOUyjcDyW9VmJvt/lXdr5F5Q6f1T4EIeaRFsCgUxjcJKtzbTpWrsFBXxpjzI4CZ wFcwEe4KdZujVI2YWzmsfnpCSolTDUQW2bVUysE+M7xNNaXw3G04/g1856ogrEekcUAlZ2 kvVc9xKfGFpBD3mmUtTJY53WoHQyXyrOb7hvzsPhTm1xyChj2eSu8d7ygz2P5vDYgUk9Om oKKgfFjfQgUts9jQPJruxZRVVIQ+gQjszQQ0hpAHtt7hchdqLGaAAc5JQvNpgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689623067; 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=W7JZgfBeef+Dg2Q91JILBXoc9/nSj7cxN1puyQb2dfk=; b=I6BHJiAZPNW/fCbqCzFvH9Svq9Uqgb2VQWrOnD71uJEm7D6rvH5YjmfOR4ji9ZUH3i/Plq 0ldo43lWAyn2GCvMsDvFIxYF4m95VkQYccnELT/S9GrUaRvk9Ia54do9RGNKUI+BS6XDwz oWvChnKtQb1dkoXWPEMzR4ssZQYvtYK1/RvyylYwqEqdleJSf6AAE6KLRp9LjoKhiLfae5 oFVe1sENBidmW2dUVDmGwcweabWLSza+f/c2NbO3gO7y1BwA2dC9JVcuHh/JB5yc2m3Ha9 jVRVHwxFbLer0RyOFBSN38sKQ8Ho3AbF9BBBZDhOwrkfz377xV9RTE2UJyh2Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689623067; a=rsa-sha256; cv=none; b=DsM5WluSxLTouLhM+L6l3PlqouQuW1xUbCfvpMX8KL+CQF8hQ+ACackMtt+QQeEqkloRPw 2z4IpTLYcVLi6c1cG5fO8zzlaNjGAdbvdQMifmZzb81teudw1zk3rEjcvq9EX4LrHy4uD7 R2Nt/tDllgX18eLfPwuQd1XDmJ55xM4Ey3PfuE/bA/6lkreT7eXCmcjS1XKO6Du/IUUXK7 b80gR61R8Gji4kWA00Xf3itCldLEglZ7QSCKH7zUW0hJjXjOqO5cDn21SinOLJDr8md5yR A/RkAklIbNQg5L4upm2k0Dz5CvPsk1YYGYmGId6xktdHlfB9+QqvdqyFveO+IA== 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 4R4XbG6K5FzbcX; Mon, 17 Jul 2023 19:44:26 +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 36HJiQ0m079383; Mon, 17 Jul 2023 19:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HJiQ58079382; Mon, 17 Jul 2023 19:44:26 GMT (envelope-from git) Date: Mon, 17 Jul 2023 19:44:26 GMT Message-Id: <202307171944.36HJiQ58079382@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Felix Palmen Subject: git: 8de62e2df584 - 2023Q3 - 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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 8de62e2df5846f2d67348ac3fb8b5f939addcd0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=8de62e2df5846f2d67348ac3fb8b5f939addcd0a commit 8de62e2df5846f2d67348ac3fb8b5f939addcd0a Author: Felix Palmen AuthorDate: 2023-07-16 19:00:41 +0000 Commit: Felix Palmen CommitDate: 2023-07-17 19:44:08 +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) (cherry picked from commit 19f37018f591aaca4ff811263237dfa5150a0614) --- 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; } +