Date: Mon, 3 Jun 2024 10:49:16 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 928157c8fd09 - main - graphics/ptex: replace local patches with committed by upstream Message-ID: <202406031049.453AnGfK084729@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=928157c8fd0982a747984e075644f928ac09fae0 commit 928157c8fd0982a747984e075644f928ac09fae0 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-06-03 10:42:55 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> 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 <FreeBSD@ShaneWare.Biz> (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 <stdlib.h> -+#if !defined(__FreeBSD__) - #include <alloca.h> -+#endif - #include <string.h> - #include <pthread.h> - 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 <algorithm> - #include <iostream> - #include <sstream> -+#include <unistd.h> - - #include "Ptexture.h" - #include "PtexUtils.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406031049.453AnGfK084729>