From nobody Sun Apr 03 04:58:30 2022 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 EAC591A46CAC; Sun, 3 Apr 2022 04:58:30 +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 4KWM9y68m4z3Lb3; Sun, 3 Apr 2022 04:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648961910; 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=w68Y8WniuaK50JppYpbDIwEfflUgdXldPBjOgcFCJ44=; b=UUeeL4dRv/pWbf87Tt9P0SoJTzUw+vf4OUlLyZlnj5wTLdoPrf13NZm0AaRHE5fUhlAcYi n7xen2VD22EHLRJxJv7R0u/qTBncxdxsX8H8yslGiJ3QaBPt5rIXx8Xvq5EWT5keFTl6uS tOXeu1uF1GhBuvb7tIiO4hWqfurEwS+PM0yCJmqGaBo/qzQsvnWEruu8YlSTrxpKT8IFwr ZK2xBldGJ+fXxHlIYP2hWFdJ0c9mJWxXj2H1gyu4vtBMmrPrrH4QwPcCUsUe/Fa9hTioIH b49ech8iw4ceb0z68Eu/JEpFEHHkAUtEi7if/3c9CSgl++Ej/OionUkl/sulwQ== 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 AEDE217482; Sun, 3 Apr 2022 04:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2334wUP6047336; Sun, 3 Apr 2022 04:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2334wUHM047335; Sun, 3 Apr 2022 04:58:30 GMT (envelope-from git) Date: Sun, 3 Apr 2022 04:58:30 GMT Message-Id: <202204030458.2334wUHM047335@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 70216e56a4b6 - main - graphics/cloudcompare: Update to 2.12.0 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70216e56a4b628cff5f03e1cb4dc56cc833c5c91 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648961910; 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=w68Y8WniuaK50JppYpbDIwEfflUgdXldPBjOgcFCJ44=; b=s5nUnqQGXqkN424L9B8dJbCd/83g6rZ06IIrdGXwucUpYPILYvG0a4RwU++esgD0qnetWI JMuTm1lec2jYwPYkSoQ1TLb9oE4FTG4bj6JlAbVD8hRLbreWK3S0g6Ms20mVydRAW3U+oY Ayyyn5hvF0YtxE7JU9lm8EWo6kEEhf+B20MHGDCsVUw8gMhvf8SupjiM02F8JgFRfWTSuo 5sNpysXZpWRhW5fTpbQb0sfqnLsn86dZ7CTJaOUgfFpOseAk1n1tZm6FnhO0EqmNBrJuEe b/GlRnvm7X+hXiBUDa7QPTBLoG0z2qH1bq77woavXJTAg59JN2Im7r4U76xiiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648961910; a=rsa-sha256; cv=none; b=n90SqSpwIvrK8WC3+A+mh4+9XlpOmSYU5QoVATADNBPckrNxzNnE/iReamgEC1CVJ20fBn 69YkY/A8d6m0qGdev/GrBjoxOTjkluhHjHbJ23zDNW9pgVxssd83NJtI+nnArH7OAphiKj 6uQn6ltUt7qmFXqV5bnDvVqLoiR4p3uKkMdx9cvSGVaZIGXu4a2u9/jwr9CZPJpmY9Ival cCtMQCDnXDYaRZrp8eSmgHCzHebgAz5b9G190pEp3B1b8PWt7lV9z9iJI/ufXdciEF/ZFA HinC6excoPTI2ytMQO9ETmZSsAzim7Hm0W2Tr/pfrJE/Q9vGKGX4DGM3yIlxRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=70216e56a4b628cff5f03e1cb4dc56cc833c5c91 commit 70216e56a4b628cff5f03e1cb4dc56cc833c5c91 Author: Neel Chauhan AuthorDate: 2022-04-03 04:58:29 +0000 Commit: Neel Chauhan CommitDate: 2022-04-03 04:58:29 +0000 graphics/cloudcompare: Update to 2.12.0 --- graphics/cloudcompare/Makefile | 4 +++- graphics/cloudcompare/distinfo | 8 +++++--- graphics/cloudcompare/files/patch-common_ccPluginManager.cpp | 11 ----------- ...andard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h | 10 ---------- ..._core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h | 11 ----------- ..._qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h} | 4 ++-- graphics/cloudcompare/pkg-plist | 9 ++++++++- 7 files changed, 18 insertions(+), 39 deletions(-) diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index c6173262d012..a63536160d04 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -1,6 +1,6 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v -DISTVERSION= 2.11.3 +DISTVERSION= 2.12.0 CATEGORIES= graphics MAINTAINER= nc@FreeBSD.org @@ -13,6 +13,8 @@ USES= cmake compiler:c++11-lang localbase:ldflags qt:5 USE_GITHUB= yes GH_ACCOUNT= CloudCompare GH_PROJECT= ${GH_ACCOUNT} +GH_TUPLE= CloudCompare:CCCoreLib:b81e0ba:CloudCompare/libs/qCC_db/extern/CCCoreLib + USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build svg linguisttools_build USE_LDCONFIG= yes diff --git a/graphics/cloudcompare/distinfo b/graphics/cloudcompare/distinfo index 8adf928da222..1bdbd0c155e9 100644 --- a/graphics/cloudcompare/distinfo +++ b/graphics/cloudcompare/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1644590655 -SHA256 (CloudCompare-CloudCompare-v2.11.3_GH0.tar.gz) = b41cebd5e4832a8b7aa1f019d97bcc208be9f7e15cd056ff2a1a1fe4c369fc21 -SIZE (CloudCompare-CloudCompare-v2.11.3_GH0.tar.gz) = 35108749 +TIMESTAMP = 1648960375 +SHA256 (CloudCompare-CloudCompare-v2.12.0_GH0.tar.gz) = 214ef88c454c41dc8d0b758f5b02b021b469b4d4d0ee5de753b0552127249a53 +SIZE (CloudCompare-CloudCompare-v2.12.0_GH0.tar.gz) = 35582467 +SHA256 (CloudCompare-CCCoreLib-b81e0ba_GH0.tar.gz) = 88a3f8c5bfa7a713b1da51aa6806beac7d3086bfd8b4db17efa2720cee077c90 +SIZE (CloudCompare-CCCoreLib-b81e0ba_GH0.tar.gz) = 235020 diff --git a/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp b/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp deleted file mode 100644 index 2842e76ffff6..000000000000 --- a/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- common/ccPluginManager.cpp.orig 2020-09-08 09:36:07 UTC -+++ common/ccPluginManager.cpp -@@ -273,7 +273,7 @@ void ccPluginManager::loadFromPathsAndAddToList() - "*.dylib" - #elif defined(Q_OS_WIN) - "*.dll" --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - "*.so" - #else - #error Need to specify the dynamic library extension for this OS. diff --git a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h deleted file mode 100644 index 17f438423878..000000000000 --- a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h.orig 2020-09-08 09:36:07 UTC -+++ plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h -@@ -1,6 +1,6 @@ - #ifndef GfxTL__FLATCOPYVECTOR_HEADER__ - #define GfxTL__FLATCOPYVECTOR_HEADER__ --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #else - #include diff --git a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h deleted file mode 100644 index ec259b53f6d0..000000000000 --- a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h.orig 2020-09-08 09:36:07 UTC -+++ plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h -@@ -14,7 +14,7 @@ - #include - #include - #include --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #else - #include diff --git a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h similarity index 68% rename from graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h rename to graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h index 2536668bccd8..283e9407a327 100644 --- a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h +++ b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h @@ -1,5 +1,5 @@ ---- plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2020-09-08 09:36:07 UTC -+++ plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h +--- plugins/core/Standard/qRANSAC_SD/extern/RANSAC_SD/MiscLib/AlignedAllocator.h.orig 2022-04-03 04:17:08 UTC ++++ plugins/core/Standard/qRANSAC_SD/extern/RANSAC_SD/MiscLib/AlignedAllocator.h @@ -1,7 +1,7 @@ #ifndef MiscLib__ALIGNEDALLOCATOR_HEADER__ #define MiscLib__ALIGNEDALLOCATOR_HEADER__ diff --git a/graphics/cloudcompare/pkg-plist b/graphics/cloudcompare/pkg-plist index 2b7288c00269..0b79090fffa7 100644 --- a/graphics/cloudcompare/pkg-plist +++ b/graphics/cloudcompare/pkg-plist @@ -1,7 +1,11 @@ bin/CloudCompare bin/ccViewer -lib/cloudcompare/libCC_CORE_LIB.so +lib/cloudcompare/libCCAppCommon.so +lib/cloudcompare/libCCCoreLib.so +lib/cloudcompare/libCCPluginAPI.so +lib/cloudcompare/libCC_FBO_LIB.so lib/cloudcompare/libQCC_DB_LIB.so +lib/cloudcompare/libQCC_GL_LIB.so lib/cloudcompare/libQCC_IO_LIB.so %%PLUGINS%%lib/cloudcompare/plugins/libQANIMATION_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQBROOM_PLUGIN.so @@ -32,10 +36,13 @@ share/applications/cloudcompare.desktop %%PLUGINS%%%%DATADIR%%/shaders/EDL/edl_shade.vert %%PLUGINS%%%%DATADIR%%/shaders/SSAO/ssao.frag %%PLUGINS%%%%DATADIR%%/shaders/SSAO/ssao.vert +%%DATADIR%%/translations/CloudCompare_de.qm %%DATADIR%%/translations/CloudCompare_es_AR.qm %%DATADIR%%/translations/CloudCompare_fr.qm %%DATADIR%%/translations/CloudCompare_ja.qm +%%DATADIR%%/translations/CloudCompare_kr.qm %%DATADIR%%/translations/CloudCompare_pt.qm %%DATADIR%%/translations/CloudCompare_ru.qm +%%DATADIR%%/translations/CloudCompare_zh.qm share/pixmaps/ccViewer.png share/pixmaps/cloudcompare.png