Attachment #251164 for bug #279473

View | Details | Raw Unified | Return to bug 279473
Collapse All | Expand All




DISTVERSIONPREFIX=	v
DISTVERSION=	2.4.2
PORTREVISION=	1
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


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=	-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \
		-DCMAKE_INSTALL_INCLUDEDIR:STRING=${LOCALBASE}/include/ptex \
		-DPTEX_VER:STRING=${DISTVERSION}

OPTIONS_DEFINE=		DOCS


Lines 1-3 Link Here

(-)b/graphics/ptex/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1666543361	1	TIMESTAMP = 1717349736
2	SHA256 (wdas-ptex-v2.4.2_GH0.tar.gz) = c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1	2	SHA256 (wdas-ptex-v2.4.2_GH0.tar.gz) = c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1
3	SIZE (wdas-ptex-v2.4.2_GH0.tar.gz) = 312942	3	SIZE (wdas-ptex-v2.4.2_GH0.tar.gz) = 312942
		4	SHA256 (8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch) = ad62e19cbf74c370b0906a11e0fff13d2057fd10fb00ee7706da4396c309d473
		5	SIZE (8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch) = 2016




--- 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)




--- 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>
 

Removed Link Here

(-)a/graphics/ptex/files/patch-src_ptex_PtexWriter.cpp (-10 lines)
1	--- src/ptex/PtexWriter.cpp.orig 2022-08-05 02:02:51 UTC
2	+++ src/ptex/PtexWriter.cpp
3	@@ -66,6 +66,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
4	#include <algorithm>
5	#include <iostream>
6	#include <sstream>
7	+#include <unistd.h>
8
9	#include "Ptexture.h"
10	#include "PtexUtils.h"

Return to bug 279473

Lines 2-8 PORTNAME= ptex Link Here

(-)b/graphics/ptex/Makefile (-5 / +7 lines)
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.4.2	3	DISTVERSION= 2.4.2
4	PORTREVISION= 1	4	PORTREVISION= 1
5	CATEGORIES?= graphics	5	CATEGORIES= graphics
		6
		7	PATCH_SITES= https://github.com/wdas/${PORTNAME}/commit/
		8	PATCHFILES+= 8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch:-p1 # fix builds for FreeBSD
6		9
7	MAINTAINER= FreeBSD@Shaneware.biz	10	MAINTAINER= FreeBSD@Shaneware.biz
8	COMMENT= Per face texture library	11	COMMENT= Per face texture library
Lines 12-26 LICENSE= BSD3CLAUSE Link Here
12		15
13	USES= cmake:insource compiler:c++11-lang cpe pkgconfig	16	USES= cmake:insource compiler:c++11-lang cpe pkgconfig
14	CPE_VENDOR= disneyanimation	17	CPE_VENDOR= disneyanimation
15	USE_LDCONFIG= yes
16
17	USE_GITHUB= yes	18	USE_GITHUB= yes
18	GH_ACCOUNT= wdas	19	GH_ACCOUNT= wdas
		20	USE_LDCONFIG= yes
19		21
20	# yes really, the release tarbal doesn't know what version it is	22	# yes really, the release tarbal doesn't know what version it is
21	CMAKE_ARGS+= -DPTEX_VER:STRING=${DISTVERSION} \	23	CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \
22	-DCMAKE_INSTALL_INCLUDEDIR:STRING=${LOCALBASE}/include/ptex \	24	-DCMAKE_INSTALL_INCLUDEDIR:STRING=${LOCALBASE}/include/ptex \
23	-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}	25	-DPTEX_VER:STRING=${DISTVERSION}
24		26
25	OPTIONS_DEFINE= DOCS	27	OPTIONS_DEFINE= DOCS
26		28

Removed Link Here

(-)a/graphics/ptex/files/patch-CMakeLists.txt (-18 lines)
1	--- CMakeLists.txt.orig 2022-08-05 02:02:51 UTC
2	+++ CMakeLists.txt
3	@@ -3,6 +3,7 @@ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex sh
4
5	option(PTEX_BUILD_STATIC_LIBS "Enable building Ptex static libraries" ON)
6	option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
7	+option(PTEX_BUILD_DOCS "Enable building Ptex documentation (require Doxygen)" OFF)
8	option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
9
10	# The C++ standard can set either through the environment or by specifyign
11	@@ -114,5 +115,7 @@ add_subdirectory(src/tests)
12	add_subdirectory(src/ptex)
13	add_subdirectory(src/utils)
14	add_subdirectory(src/tests)
15	+if (PTEX_BUILD_DOCS)
16	add_subdirectory(src/doc)
17	+endif ()
18	add_subdirectory(src/build)

Removed Link Here

(-)a/graphics/ptex/files/patch-src_ptex_PtexPlatform.h (-12 lines)
1	--- src/ptex/PtexPlatform.h.orig 2022-08-05 02:02:51 UTC
2	+++ src/ptex/PtexPlatform.h
3	@@ -70,7 +70,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
4
5	// linux/unix/posix
6	#include <stdlib.h>
7	+#if !defined(__FreeBSD__)
8	#include <alloca.h>
9	+#endif
10	#include <string.h>
11	#include <pthread.h>
12