From nobody Thu Dec 14 17:03:32 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 4SrdwN4c9Wz52kpp; Thu, 14 Dec 2023 17:03:32 +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 4SrdwN3dHMz3ZD2; Thu, 14 Dec 2023 17:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573412; 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=POWWJmA3f+jGiA6cQJNZAzUl9lsb2bSAB3LMJ231ZxQ=; b=wS7SQsBqg6pbAWviRsa8NEfxaHJV8c8bzFIWYEHFl/svpZzWAV9FOurFPRkPeJJBdN6dMU OlygDYYG7vR9EwrYDkK9vrk8UZ/vi4ticJUhadTOhh+pVXh1IzL3nem+wqPBDOogGdk5ez eSC0TGLyODPSuEmJNlVnPQ/hydxZIKDlgM3wEiaOL86hGsIpcKmzMdi9OHgE0R7NhMb8zv pe98YpcPOXKhQQpoKOr2EGjE55PFCqkV1hi2fEjWGhMXKVqVbcTw4j/+0o0oaqLH6cxg15 u7mX41wtxtsEKmsQXB+Q7qLO/M5zCgrmLX8bEQtPvJUXFDi9NgO+DzvbFE0jtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573412; a=rsa-sha256; cv=none; b=YGRMQsph0iP1Kgrd68Be7AAaHZ01oQlXyA10z8H9AcWKRsYfILu+nbnick9Sv89Q/T9tjz 31CF1XEH0RoJhyYCiLLjcuI3vsi8wIE+avsesczCewZzpnEUIRaJyTOi1ZkhZmp6aqm4/r kA4OFlePgvaGVBKViIyWjxGXoM2ELtBrZZYd7yxWjMLua58h9CAWg+qRBnbNdb0fMxI7uP s1rkRj0E8wd8hlPes4pTC/MrdUp0KXrq/pkT6OnW/br2mG42z4Uf3LqfBVWXzeNLy977dh 135zriISPo7ZrH5ze5QW8G/30o28LQqgRVmHZv2tiC2gErguIeHd84bRz8Q8ZQ== 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=1702573412; 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=POWWJmA3f+jGiA6cQJNZAzUl9lsb2bSAB3LMJ231ZxQ=; b=rFOsZMqMPQP2ZzQtMmfzLlk9rMT74dnP29OZLH1Tc72vtyfNj7gRHyChbDlS3HINnRcNVl 25EiXVooTUDXYpnLqoeN+OqPeGiBFays8ycRKVSJeu/ufEMy1MlCBYkGVo1ivMMZ+ZEtbm MyYWGtz0TTmdZNniI3RNQquJAyw5S1F07+06/KbcGG7vExikakVtdwGoGRIJyqgJgC9UIf v1EeDKP+LdA9Tc+yHESkrj8cTMvZKuI7qLO/sKgkBOEAdeeUP0eiRwWuatFxgHXlpeiKaj nGyANukNjnu+52Gs/+7TJtyfhu+gwC+kAaemWLjP1+r4dw/AW8amWwnBNfH2TQ== 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 4SrdwN2j5gzb00; Thu, 14 Dec 2023 17:03:32 +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 3BEH3WFS016899; Thu, 14 Dec 2023 17:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3WKZ016896; Thu, 14 Dec 2023 17:03:32 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:32 GMT Message-Id: <202312141703.3BEH3WKZ016896@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 07238aa57022 - main - graphics/osgearth: Fix build with protobuf 22+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07238aa570226ad0b43a502805f1cc9d39f93f50 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=07238aa570226ad0b43a502805f1cc9d39f93f50 commit 07238aa570226ad0b43a502805f1cc9d39f93f50 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:32 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:05 +0000 graphics/osgearth: Fix build with protobuf 22+ 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 --- graphics/osgearth/Makefile | 4 ++-- graphics/osgearth/files/patch-protobuf | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 97da332dcd2b..9851c226593a 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -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 diff --git a/graphics/osgearth/files/patch-protobuf b/graphics/osgearth/files/patch-protobuf new file mode 100644 index 000000000000..981fffb56167 --- /dev/null +++ b/graphics/osgearth/files/patch-protobuf @@ -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