From ec05e2e29011cdf399d19d563dbd0c9eba0e2106 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 2 Apr 2009 00:31:25 +0000
Subject: - Add nvidia-texture-tools support - Mark MAKE_JOBS_SAFE

---
 graphics/devil/Makefile                             | 17 +++++++++++++----
 graphics/devil/files/patch-src-IL-src-il_nvidia.cpp | 10 ++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 graphics/devil/files/patch-src-IL-src-il_nvidia.cpp

(limited to 'graphics/devil')

diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 61203746ccfb..9ad7bb9300b3 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	devil
 PORTVERSION=	1.7.8
 PORTEPOCH=	1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/openil
 DISTNAME=	DevIL-${PORTVERSION}
@@ -23,7 +23,8 @@ OPTIONS=	JPEG	"Enable JPEG support"		on \
 		PNG	"Enable PNG support"		on \
 		TIFF	"Enable TIFF support"		on \
 		X11	"Enable X11 support"		on \
-		SDL	"Enable SDL support"		off
+		SDL	"Enable SDL support"		off \
+		NVTT	"Enable NVidia texture tools support" off
 
 WRKSRC=		${WRKDIR}/${DISTNAME:L}
 
@@ -34,9 +35,9 @@ AUTOMAKE_ARGS=	--add-missing --copy --force-missing
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-ILU \
 		--disable-allegro --disable-directx8 --disable-directx9 \
-		--disable-altivec --disable-sse --disable-sse2 --disable-sse3 \
-		--without-nvtt
+		--disable-altivec --disable-sse --disable-sse2 --disable-sse3
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
@@ -100,6 +101,14 @@ USE_SDL=	sdl
 CONFIGURE_ARGS+=--disable-sdl
 .endif
 
+.if defined(WITH_NVTT)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools
+RUN_DEPENDS+=	${LOCALBASE}/lib/libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools
+LDFLAGS+=	${PTHREAD_LIBS}
+.else
+CONFIGURE_ARGS+=--without-nvtt
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e '/^pkgdir=/s|$$(libdir)/|$$(prefix)/libdata/|g' \
diff --git a/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp b/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp
new file mode 100644
index 000000000000..1779d679d44b
--- /dev/null
+++ b/graphics/devil/files/patch-src-IL-src-il_nvidia.cpp
@@ -0,0 +1,10 @@
+--- src-IL/src/il_nvidia.cpp.orig	2009-03-08 10:10:09.000000000 +0300
++++ src-IL/src/il_nvidia.cpp	2009-03-18 18:32:29.000000000 +0300
+@@ -19,7 +19,6 @@
+ 
+ #ifdef IL_USE_DXTC_NVIDIA
+ #include <nvtt/nvtt.h>
+-#include <nvcore/Memory.h>
+ 
+ using namespace nvtt;
+ 
-- 
cgit v1.2.3