From nobody Mon Jun 03 10:49:16 2024 X-Original-To: dev-commits-ports-main@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 4Vt9T82J4hz5MJHM; Mon, 03 Jun 2024 10:49:16 +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 4Vt9T81MVDz4Q41; Mon, 3 Jun 2024 10:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717411756; 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=gwkPnovv/Lu/+a5IyjjlmxhXTeYGoFG1mo3L8BX/jlI=; b=Ux4tB2ayN6m7kNbi2r/csJWdFBT1IfJEj3xi60pMpHcO2QLLkMmLXXx2cpV/zPtUxcXZm2 IlyA6tIRwz0COstCNU72r6JOwKXFM6u0wEaux4xIZ5DbnGMGMr30msTOfpGXwgPfi/AM16 Fbq9FfQWa4c9Z7OG9DmA3pXYxTXR5oOfw7UmqYi1EWNfYU3M1vEsrZ/cUXWKO66UghAx3A s/Nju/8QFXRVYO0ip1z8diWLcgMGvvrLJjxP6Ogk5RFku49IIl7C3h5Gn4U3LKY1vFRBd+ 6Hv9Pm5qfEFjGq+n2wB80oIFJBz0DBhCly15hCObuZYjaDS1G7VgaQHSbKC4NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717411756; a=rsa-sha256; cv=none; b=uGXe2nUPsrRhJR8iaGl7yNDDIQGLwHu2H30bstZJ/xpeSpAmY+tptXXjqf+gOgEzioT/rs ff336dzng9MpfPzL6xbqVwWkn3cUtXkmjveTj6HVKgJ6cssijsvS9GrEYdcvi9Zzx/bcUF skAwjqtdoLNnEmoloHCqw50IXS99hqgkzFLUKXHSHcoPmUKpXKMT3sIxS2J5t1kShxjjTY y92kZ13ZDnlt4b7yfASZUUfcChSIzhW+LAuatpp8Nq9vTSeWXXzS5PJewGbgXOOeDZOlMj uE4LwpErIQ1ZHRaoeHP6LBmGdilat8mA6iq+ENqMFLHhrh1DB+tR3LqSliHSQw== 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=1717411756; 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=gwkPnovv/Lu/+a5IyjjlmxhXTeYGoFG1mo3L8BX/jlI=; b=iEQlZs9Rg3G8jm4j+kUZ1R6ttyh4nZFt6DSC1RyYt4srLgZXIqgcwS6PLbYcectDAnwb/y LqDpYL1v2q0vEta5RcfQoodpSJztjlmJqK4WtHbKWLdfRagLQ8c+iyMd5HkiUAH6FEV4CJ 8BVD0Ac04saZxUj8n3NaXfvR/QnZNcQSDz/NLwx5+ewrFbh78vwD88zU+TaOYg1OQVT6Gh moHjo64rSfynQ5D91QJQwiMoZQ63Fu+XFb7dyBQjWyL9Qhofy8amwq6vJS3QAgnTLsqSKC evUbybKdAhU2dyiIXFJrAWQqjEP0KDjtugWg8W0cMVlBIdwJBGDMlDMXw8/POw== 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 4Vt9T80zXnzXvv; Mon, 3 Jun 2024 10:49:16 +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 453AnGu2084731; Mon, 3 Jun 2024 10:49:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453AnGfK084729; Mon, 3 Jun 2024 10:49:16 GMT (envelope-from git) Date: Mon, 3 Jun 2024 10:49:16 GMT Message-Id: <202406031049.453AnGfK084729@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 928157c8fd09 - main - graphics/ptex: replace local patches with committed by upstream List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 928157c8fd0982a747984e075644f928ac09fae0 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=928157c8fd0982a747984e075644f928ac09fae0 commit 928157c8fd0982a747984e075644f928ac09fae0 Author: Vladimir Druzenko AuthorDate: 2024-06-03 10:42:55 +0000 Commit: Vladimir Druzenko CommitDate: 2024-06-03 10:42:55 +0000 graphics/ptex: replace local patches with committed by upstream Replace local patches with committed by upstream: https://github.com/wdas/ptex/commit/8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84 While here sort Makefile, pet portclippy and portlint. PR: 279473 Approved by: Shane (maintainer) --- graphics/ptex/Makefile | 12 +++++++----- graphics/ptex/distinfo | 4 +++- graphics/ptex/files/patch-CMakeLists.txt | 18 ------------------ graphics/ptex/files/patch-src_ptex_PtexPlatform.h | 12 ------------ graphics/ptex/files/patch-src_ptex_PtexWriter.cpp | 10 ---------- 5 files changed, 10 insertions(+), 46 deletions(-) diff --git a/graphics/ptex/Makefile b/graphics/ptex/Makefile index 426be3518688..6d09dd37176b 100644 --- a/graphics/ptex/Makefile +++ b/graphics/ptex/Makefile @@ -2,7 +2,10 @@ PORTNAME= ptex DISTVERSIONPREFIX= v DISTVERSION= 2.4.2 PORTREVISION= 1 -CATEGORIES?= graphics +CATEGORIES= graphics + +PATCH_SITES= https://github.com/wdas/${PORTNAME}/commit/ +PATCHFILES+= 8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch:-p1 # fix builds for FreeBSD MAINTAINER= FreeBSD@Shaneware.biz COMMENT= Per face texture library @@ -12,15 +15,14 @@ LICENSE= BSD3CLAUSE USES= cmake:insource compiler:c++11-lang cpe pkgconfig CPE_VENDOR= disneyanimation -USE_LDCONFIG= yes - USE_GITHUB= yes GH_ACCOUNT= wdas +USE_LDCONFIG= yes # yes really, the release tarbal doesn't know what version it is -CMAKE_ARGS+= -DPTEX_VER:STRING=${DISTVERSION} \ +CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \ -DCMAKE_INSTALL_INCLUDEDIR:STRING=${LOCALBASE}/include/ptex \ - -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} + -DPTEX_VER:STRING=${DISTVERSION} OPTIONS_DEFINE= DOCS diff --git a/graphics/ptex/distinfo b/graphics/ptex/distinfo index 2e8f8483df32..032591a7659a 100644 --- a/graphics/ptex/distinfo +++ b/graphics/ptex/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1666543361 +TIMESTAMP = 1717349736 SHA256 (wdas-ptex-v2.4.2_GH0.tar.gz) = c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1 SIZE (wdas-ptex-v2.4.2_GH0.tar.gz) = 312942 +SHA256 (8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch) = ad62e19cbf74c370b0906a11e0fff13d2057fd10fb00ee7706da4396c309d473 +SIZE (8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch) = 2016 diff --git a/graphics/ptex/files/patch-CMakeLists.txt b/graphics/ptex/files/patch-CMakeLists.txt deleted file mode 100644 index b214fc582564..000000000000 --- a/graphics/ptex/files/patch-CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- CMakeLists.txt.orig 2022-08-05 02:02:51 UTC -+++ CMakeLists.txt -@@ -3,6 +3,7 @@ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex sh - - option(PTEX_BUILD_STATIC_LIBS "Enable building Ptex static libraries" ON) - option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON) -+option(PTEX_BUILD_DOCS "Enable building Ptex documentation (require Doxygen)" OFF) - option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF) - - # The C++ standard can set either through the environment or by specifyign -@@ -114,5 +115,7 @@ add_subdirectory(src/tests) - add_subdirectory(src/ptex) - add_subdirectory(src/utils) - add_subdirectory(src/tests) -+if (PTEX_BUILD_DOCS) - add_subdirectory(src/doc) -+endif () - add_subdirectory(src/build) diff --git a/graphics/ptex/files/patch-src_ptex_PtexPlatform.h b/graphics/ptex/files/patch-src_ptex_PtexPlatform.h deleted file mode 100644 index 999af3344485..000000000000 --- a/graphics/ptex/files/patch-src_ptex_PtexPlatform.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/ptex/PtexPlatform.h.orig 2022-08-05 02:02:51 UTC -+++ src/ptex/PtexPlatform.h -@@ -70,7 +70,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O - - // linux/unix/posix - #include -+#if !defined(__FreeBSD__) - #include -+#endif - #include - #include - diff --git a/graphics/ptex/files/patch-src_ptex_PtexWriter.cpp b/graphics/ptex/files/patch-src_ptex_PtexWriter.cpp deleted file mode 100644 index c8f9366a4877..000000000000 --- a/graphics/ptex/files/patch-src_ptex_PtexWriter.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ptex/PtexWriter.cpp.orig 2022-08-05 02:02:51 UTC -+++ src/ptex/PtexWriter.cpp -@@ -66,6 +66,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O - #include - #include - #include -+#include - - #include "Ptexture.h" - #include "PtexUtils.h"