use pkg-config for openexr detection wrt #462494

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 192 insertions, 17 deletions

diff --git a/media-gfx/nvidia-texture-tools/ChangeLog b/media-gfx/nvidia-texture-tools/ChangeLog
index 5f06875130e5..85b4005da680 100644
--- a/media-gfx/nvidia-texture-tools/ChangeLog
+++ b/media-gfx/nvidia-texture-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/nvidia-texture-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.7 2012/06/29 08:26:26 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.8 2013/03/20 23:56:25 hasufell Exp $
+
+*nvidia-texture-tools-2.0.8-r2 (20 Mar 2013)
+
+  20 Mar 2013; Julian Ospald <hasufell@gentoo.org>
+  +nvidia-texture-tools-2.0.8-r2.ebuild,
+  +files/nvidia-texture-tools-2.0.8-openexr.patch:
+  use pkg-config for openexr detection wrt #462494
 
   29 Jun 2012; Julian Ospald <hasufell@gentoo.org>
   nvidia-texture-tools-2.0.8-r1.ebuild,
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index b643a286dfd0..64b1f1e58446 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX nvidia-texture-tools-2.0.8-cg.patch 1073 RMD160 a138f047a5e64fee965a7508edd84bb675162fe7 SHA1 1cca6eca1c49113dcc7f44a1c9c6f5559c113942 SHA256 9e2c683c82fa56ef57f6a568c447fdcb28a4a84e034fe6bc653d9ba6297ccb7c
-AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 402 RMD160 f11e1fef7f83a8df87924fda12cba56bdfe0a37a SHA1 d293bccc9c0103127018dc028e7bc0cb82849d09 SHA256 d7ca5a19766f7b74d32ccfe531f285de312170f0b65de9fff2890f0e86159dd3
-DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 RMD160 dbb2a1ea4bef259af8520d881ab414d69ee0dea2 SHA1 3eaa578acc35159684748055aeb4bacdeaef12d1 SHA256 6b3c83500b420ee976f61eeae16e5727e2401e133f543baeac76c66c381eed2e
-DIST nvidia-texture-tools-2.0.8-patchset-1.tar.xz 9688 RMD160 e20153a6e9692e828e0677fbe255361ff81dd75c SHA1 a3d4d1724685336a3eafa3863a4955547cc55343 SHA256 7cc8ba61cf0290984b31bdbe7b291ff75f2eeab8b07da908dfb5a1b421341516
-EBUILD nvidia-texture-tools-2.0.8-r1.ebuild 1767 RMD160 2a7e937fb919a6d109b328e97ca6d7beb5e628a9 SHA1 16072ea9a2b43c7509a9a27dc0b4fa41cb5119b9 SHA256 0fe25d5ba5b07754cab11ee63520b1bb842a2584fa110a99faa49808a4295002
-MISC ChangeLog 1989 RMD160 8bdbee7c40d766a921f4503f02f42bac1ce9b523 SHA1 7342eabba93d32c495ebf1a3ed6b1f4e26fef0d6 SHA256 35ff0406a24148be5b8817e6ee05b0a42c0899e97d270d9c45fdd9040c4649f0
-MISC metadata.xml 597 RMD160 7b156a0efb17ef004ba146b74fa265528aca3715 SHA1 2e533ed568bb55ffced759d0808c47691632c3d2 SHA256 86c23f0bb1ed47aeebbc91e8d5bfacfccdc68d6406fc29daa952dd2ece2f4da5
+AUX nvidia-texture-tools-2.0.8-cg.patch 1073 SHA256 9e2c683c82fa56ef57f6a568c447fdcb28a4a84e034fe6bc653d9ba6297ccb7c SHA512 62d4af0a019c79ce01316b6d9dbb2c4d9c9b991d8c3e36f5623a79234c699c7d4aee8ad2842a6400502ec07bb41176f2d718ce869176b4078236dc084fa3f347 WHIRLPOOL 032fd812c2bcf5ce3f6d7232e71babf4f874a3e3d85449d466deccac5c4c05d4bda70d8da227c1ba468ed5fe3de1d40ca2b957ae49e0559de9c1fabb0294510b
+AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 402 SHA256 d7ca5a19766f7b74d32ccfe531f285de312170f0b65de9fff2890f0e86159dd3 SHA512 e3c131916ae61d61c5807a5075dad671323a54be5de88997ccb5a4bc1d2b967bff41e2072f554ddc3d38114956643976950bfe3e517f4eb1116b4d2ca39e26b7 WHIRLPOOL d1eb25a60e4bdc7b093f573e852d710db45c63c7327ac395e43ebbe2276c065df805cccc30fa0a94930ab0af0bea7b988339ddb9cb5b6bc674027e3f8010a99f
+AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 SHA256 14e8bfe0b05d8457d4490ebb9923ff3fe0ece7c7eeee648c374c4d196ce3f760 SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade WHIRLPOOL fc228debe0890ba80d773ba4be11c26499bd8d1cd2c18041260360722199ceb550b1894d0d555740c88d8b05c222df131cba26ad90ccdcd5812198535a95bf59
+DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 SHA256 6b3c83500b420ee976f61eeae16e5727e2401e133f543baeac76c66c381eed2e SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d WHIRLPOOL 5f4e3daeab3f2dd0fc057d2fc56d4bfc888cd86449c1b390380b24a561d1538c010bc93c7990b0f156f03df37933333596796e53174fc4ce818845d74b45d400
+DIST nvidia-texture-tools-2.0.8-patchset-1.tar.xz 9688 SHA256 7cc8ba61cf0290984b31bdbe7b291ff75f2eeab8b07da908dfb5a1b421341516 SHA512 36305036d178c4a9960148d4ae5fd72e866ebc3f193f7c75e720275f4fa11d4a1f9067f42309de739db84678c81cd921f117cfe5b2e6a78785cf35c7e3947c8b WHIRLPOOL 6c530a09a7e46a34dbaa9bdaf5017e58e8f490bc5afef230b3fa83362e30f4bbe3d3454e8b9153af0acfb27e77652b578a2c52da86d34b287b919806233942bc
+EBUILD nvidia-texture-tools-2.0.8-r1.ebuild 1767 SHA256 0fe25d5ba5b07754cab11ee63520b1bb842a2584fa110a99faa49808a4295002 SHA512 1ce854c2b50e12e5d14f7d6e8d15d16ba4110fe3715316eb518e3c54fd205362119ae8ee64a670932ac0fd12ac420d1c4a3bdfef28d143ce9bbdc5015a65d1bf WHIRLPOOL 65555274890c8fd8d92cb1b0a59fe0ed450881fd7f147740b4395e1960302c6b251c30156d0ba7e986792dc411d5a552afd1851e3d1aaa729a7959bfe701e5ef
+EBUILD nvidia-texture-tools-2.0.8-r2.ebuild 1829 SHA256 f1f05dc58bb0295b5c3feaf4cce3737c536512037aa8b6759b86ff2c682cc49f SHA512 475138ddfc3d3c6b16d8d313f916e1aa8ed819c7339da000f0347f5c000b48ec76ee56c4b662e10ced793e76803921f3e3fb7cf1bca0a0aeeeb28356a527e438 WHIRLPOOL a3cf8309e9badb8516849bafaf5391e6595befefa3aaeff13459b5f281463ede55bcf7c6ac8ef4fcfb3ff13bdccfaaea45be6ce42e70947027aa509153927265
+MISC ChangeLog 2230 SHA256 954b662bd93ecb3d85f6efe8067ccc8ad7f96c54a30d39dca246532e4d34bbb9 SHA512 9426831eff10934e3df347ca2744a72f697bfeec738a99eabaa59e365802ae43ffcf1e72b81a96ea139e7513bf8eb7e11dd7a93edb9d9f19e2c7afc20e036a6d WHIRLPOOL 657255a878e88d0ba03d8f776ea7eb1193dd7972a0228975ad16afa51ca68e271764d157eefbd1ffb7d191bd95bffb965c903f29848c0c0f72fdaf352bc93f47
+MISC metadata.xml 597 SHA256 86c23f0bb1ed47aeebbc91e8d5bfacfccdc68d6406fc29daa952dd2ece2f4da5 SHA512 f4d4762b398db239143170d4eb36c71d570b33fc608d97be348ab326eea31e2f2646f54f10a89e79ac0d44817a49715ccbd73e927dbdbbc43d0a06612a227e59 WHIRLPOOL 64f758430c06a609c4ea8d356938fe46899cb1362e231da0f3765ea0bfde5654a19cad7df5947feaa6bcd95ad7d5f3f6b5a40e58a54bd3156df6f056eee1d8c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP7WXoAAoJEFpvPKfnPDWzxoUH/3O3EWhLYigO4duJkclhVUEl
-NlxioqxEcm7Clcyb3nnggV9FdlluY/pxBSUZfNLvq2NHmogmxmb62hluFXcnvSuD
-G+gM43Pktp85Ih4z4P7CQTr7WVi2LUBA3JO/r5hNep5H/whww8Dz/Ls0orsytQ2k
-xOnui3YyhqorvcakcdrS8GlEvpVAFz9PgpX8vihRXJuirxN/SXPPY+qnguSq0Uqk
-RYeV+OzSeHV4UVs6gMg6DTp/BxmHIbXsHY6y6U7JW1OpW7mR7uFWOL8/tgNi4Ee6
-hJ4cAI5DHCmNDzFSBhtdheLbMudQYH2XfuUnVS+JRwh7ZIa/TgG7uvPfCjU2GCM=
-=6LN5
+iQEcBAEBCAAGBQJRSkytAAoJEFpvPKfnPDWz2BUH/2dxix4sMzfgFbuWGKSItFeq
+M6Oy9K87VlJ3jFKR3dOpOtmlqZ5cZN8D+8uSAwCUB/iVtxfzGwVfq5hFMgcoallf
+y2uI0Xvn/1BGqy2Pj3nqHGw5J03gTXJRx3oEEarHdOZzywNX/bzaNx9NmSvXvHqJ
+ZCdibf5/DnuPepMDRcyxgz5urSmUdzTeip2RFLeYnMPMkY+TssxqpO8CjXqIEvzh
+9v2xluHw3NeDJ3MdiZBaLgioSibE6ddvqCJXPr5cWaH1kRpw8qDoez3P+dD/6VoP
+OMRdLTX1cq12X9pywM+d51s2kfQxAnn5lDlJaesFesOyONtC/8znwmXIPExa05c=
+=8Laq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch
new file mode 100644
index 000000000000..b49abf9e5c32
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch
@@ -0,0 +1,93 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Mar 20 22:10:22 UTC 2013
+Subject: add pkgconfig checks
+
+https://bugs.gentoo.org/show_bug.cgi?id=462494
+
+--- nvidia-texture-tools/cmake/FindOpenEXR.cmake
++++ nvidia-texture-tools/cmake/FindOpenEXR.cmake
+@@ -7,11 +7,15 @@
+ # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+ # 
+ 
+-INCLUDE(FindZLIB)
++IF(UNIX)
++	INCLUDE(FindPkgConfig)
++	pkg_check_modules(_PKG_OPENEXR OpenEXR)
++ENDIF(UNIX)
+ 
++find_package(ZLIB REQUIRED)
+ 
+-IF(ZLIB_FOUND)
+-
++IF(NOT _PKG_OPENEXR_FOUND)
++	
+ 	SET(LIBRARY_PATHS 
+ 		/usr/lib
+ 		/usr/local/lib
+@@ -46,10 +50,20 @@
+ 		NAMES IlmThread
+ 		PATHS ${LIBRARY_PATHS})
+ 
+-ENDIF(ZLIB_FOUND)
++ENDIF(NOT _PKG_OPENEXR_FOUND)
+ 
+ #MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY})
+ 
++IF(_PKG_OPENEXR_FOUND)
++	SET(OPENEXR_FOUND TRUE)
++	foreach(i ${_PKG_OPENEXR_CFLAGS})
++		SET(OPENEXR_CFLAGS "${OPENEXR_CFLAGS} ${i}")
++	endforeach(i)
++	foreach(p ${_PKG_OPENEXR_LDFLAGS})
++		SET(OPENEXR_LDFLAGS "${OPENEXR_LDFLAGS} ${p}")
++	endforeach(p)
++	SET(OPENEXR_LDFLAGS "${OPENEXR_LDFLAGS} ${ZLIB_LIBRARY}")
++ELSE(_PKG_OPENEXR_FOUND)
+ IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
+ 	SET(OPENEXR_FOUND TRUE)
+ 	SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
+@@ -65,6 +79,8 @@
+ 		MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
+ 	ENDIF(OPENEXR_FIND_REQUIRED)
+ ENDIF(OPENEXR_FOUND)
++ENDIF(_PKG_OPENEXR_FOUND)
++
+ 
+ MARK_AS_ADVANCED(
+ 	OPENEXR_INCLUDE_PATHS
+@@ -73,3 +89,4 @@
+ 	OPENEXR_IMATH_LIBRARY
+ 	OPENEXR_IEX_LIBRARY
+ 	OPENEXR_HALF_LIBRARY)
++
+--- nvidia-texture-tools/src/nvimage/CMakeLists.txt
++++ nvidia-texture-tools/src/nvimage/CMakeLists.txt
+@@ -44,10 +44,10 @@
+ 	INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+ ENDIF(TIFF_FOUND)
+ 
+-IF(OPENEXR_FOUND)
++IF(OPENEXR_FOUND AND NOT _PKG_OPENEXR_FOUND)
+ 	SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
+ 	INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS})
+-ENDIF(OPENEXR_FOUND)
++ENDIF(OPENEXR_FOUND AND NOT _PKG_OPENEXR_FOUND)
+ 
+ # targets
+ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
+@@ -61,6 +61,14 @@
+ 
+ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh)
+ 
++IF(_PKG_OPENEXR_FOUND)
++	SET_TARGET_PROPERTIES(nvimage
++		PROPERTIES
++		COMPILE_FLAGS "${OPENEXR_CFLAGS}"
++		LINK_FLAGS "${OPENEXR_LDFLAGS}"
++	)
++ENDIF(_PKG_OPENEXR_FOUND)
++
+ INSTALL(TARGETS nvimage
+ 	RUNTIME DESTINATION bin
+ 	LIBRARY DESTINATION lib
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..18bfe6827073
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild,v 1.1 2013/03/20 23:56:25 hasufell Exp $
+
+EAPI=4
+inherit cmake-utils eutils multilib toolchain-funcs
+
+DESCRIPTION="A set of cuda-enabled texture tools and compressors"
+HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-1.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg cuda glew glut openexr"
+
+DEPEND="media-libs/libpng:0
+	media-libs/ilmbase
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	glew? ( media-libs/glew )
+	glut? ( media-libs/freeglut )
+	openexr? ( media-libs/openexr )
+	"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	if use cuda; then
+		if [[ $(( $(gcc-major-version) * 10 + $(gcc-minor-version) )) -gt 44 ]] ; then
+			eerror "gcc 4.5 and up are not supported for useflag cuda!"
+			die "gcc 4.5 and up are not supported for useflag cuda!"
+		fi
+	fi
+}
+
+src_prepare() {
+	edos2unix cmake/*
+	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+	# fix bug #414509
+	epatch "${FILESDIR}"/${P}-cg.patch
+	# fix bug #423965
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	# fix bug #462494
+	epatch "${FILESDIR}"/${P}-openexr.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=$(get_libdir)
+		-DNVTT_SHARED=TRUE
+		$(cmake-utils_use cg CG)
+		$(cmake-utils_use cuda CUDA)
+		$(cmake-utils_use glew GLEW)
+		$(cmake-utils_use glut GLUT)
+		$(cmake-utils_use openexr OPENEXR)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc ChangeLog
+}