gentoo resync : 02.04.2018

3 files changed, 78 insertions, 0 deletions

diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index b460e0211dfd..a5ff6c592f32 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -1,9 +1,11 @@
 AUX nvidia-texture-tools-2.0.8-cg.patch 1077 BLAKE2B 87b20084932013b969e1b497944f64eef7d017b300fc07afc37fc1b5f133062387f32bceced14ae4d93fa7567eb3e4a79f5ec7d1e69cb22883afad472bcc367d SHA512 9c528320efa9c274c805dd3202e6c44d1391486c5c3d574ce4a6264ee4013a8b215467fbd0a880193048a716365f499b4cb1e935bb6e49d165c674a03d45a387
 AUX nvidia-texture-tools-2.0.8-clang.patch 684 BLAKE2B 0908b6509e94b8909e6af22f4f0e075ddcf41be883e82982edc270b97a71f504fc3281d4fc3b7995eda133376ad4ed4797f2a3e9bf4f41aaf7641b513f05d2ae SHA512 2e2f7645c8a29e6c158e054d27ccd270a5441d33254a0cc27c12aeb1b8c423374b0900a71ed87ef7bc055597302adfc0eeb27e1c788dca54850df53004c50822
 AUX nvidia-texture-tools-2.0.8-cpp14.patch 1566 BLAKE2B b5ffbc9c4b680a46683a628cba25b582d5ee35eab521c63ee887dfbda77cb46e3d091c8b827273f3b8feb71051befdab1667a0083243deaaa880f2f940d6e48d SHA512 4234facfc77da76a5d1a394ba48a5d6cfc664b695af1e8fdd90e6bb51de6ce949061a9a30e32aa2d668d21fe41c31caae50dc6efa607a568e2ab1329c41f2ba5
+AUX nvidia-texture-tools-2.0.8-drop-qt4.patch 319 BLAKE2B 534bcddc9574a14ccd5a61f84f10289705624a8547f38f86df85fb0238581fcedbb6d0bb99483d3f2dfd5521a21006d6ba4a60c528ce1ed640e5bb01d2fa924c SHA512 1024d9890d55493cc92b6254047c19b5895b0ea2a6d9ae2b4e1dbf726a165f4a624ec8acca8655c4efed6c8bec52218ffcd116ef48d3bf68606f04107baab671
 AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 406 BLAKE2B 8c17ed5fd7158f118b450f81c5fa77794db82c0d4de1b37e7b53c929eaadc9ece875cf529b3b3446b90623e563e255fcd90842038cebebf52ec0dda1b7835507 SHA512 1bcd69cbbbd01194bb68bff547b240cb196ef3aa73c73c401fb657c4ae7cd77f995fcd7d39f868d25c49994312b236210306aa577194fe756830a22f03da3e7b
 AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 BLAKE2B 55694c275548dd9177991e008fe9a9c37c290d4e8b17e4dd91a0ec241dc75900e4b6f29f8650780af112ebffcc7ca04c617456b5e2186e590f3e2da705960a1e SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade
 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
 DIST nvidia-texture-tools-2.0.8-patchset-1.tar.xz 9688 BLAKE2B b64aec479779a9d3e0b01d13571c3bfadbcad75d3288c57524805a55b40d1a3a558ad166921fe45beb7cc9b961fe50bb6e02422eccab3ad3fbe19811082a6aa8 SHA512 36305036d178c4a9960148d4ae5fd72e866ebc3f193f7c75e720275f4fa11d4a1f9067f42309de739db84678c81cd921f117cfe5b2e6a78785cf35c7e3947c8b
 EBUILD nvidia-texture-tools-2.0.8-r3.ebuild 1700 BLAKE2B ab8efdf608ae02ed8352306cf5bf99c17a994d624bf1777f5c9755d1eb729759914ac05006cb138cd67f6b2b9055e14581aef54ceaa6f7cc67b02bc0b570667b SHA512 c3a0453d9d83c673f2b8457bacd9967b0f8fb3694269444276025e77f48ebe9253cc96c17ad14f6b9dd9e264e086f0d6e6f910083115793346d239f2975affbb
+EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1529 BLAKE2B da69fe497b57b1462f54197e8fa116e0af0b9ca37fecf084b73e4d22ebc821018d32e7680cde0bab23db8af35f043a486fbd771169d1c214e93e8c8fa4b09262 SHA512 c2ae373f93e10713ce6a4e3f2d4326a67c4e8fd6fa65b7ff775fd22ff445269e4e9c61aeb4ae93361791b760a2a757f9e5c0ff159f1473f5f6099874bd9b5267
 MISC metadata.xml 432 BLAKE2B 61cdc841e0492423330339399f620001ae3a7b176631dcfed14345e39bb02aaf28225bd5a469ad1da9341003a0a12f28d5dc0ed48bea94fc15c90711e56d0b27 SHA512 04ae34b58e838041211dfbb73bc88dd3f9d53f8eb6c8f8736e148790d5b3e50498c3e135c8333c37ca996378d0fc50d21b9e5ac8f7664cac868841fd66adbd0c
diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch
new file mode 100644
index 000000000000..3fdb25a04ede
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch
@@ -0,0 +1,12 @@
+--- a/src/CMakeLists.txt~	2018-04-02 11:18:57.000000000 +0200
++++ b/src/CMakeLists.txt	2018-04-02 11:19:53.855751960 +0200
+@@ -118,9 +118,6 @@
+ 	ENDIF(OPENEXR_FOUND)
+ ENDIF(OPENEXR)
+ 
+-# Qt
+-FIND_PACKAGE(Qt4)
+-
+ # Threads
+ FIND_PACKAGE(Threads REQUIRED)
+ MESSAGE(STATUS "Use thread library: ${CMAKE_THREAD_LIBS_INIT}")
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
new file mode 100644
index 000000000000..eaabe632f83e
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils
+
+DESCRIPTION="A set of cuda-enabled texture tools and compressors"
+HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html"
+SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
+	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg glew glut openexr"
+
+RDEPEND="
+	media-libs/ilmbase:=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	glew? ( media-libs/glew:0= )
+	glut? ( media-libs/freeglut )
+	openexr? ( media-libs/openexr:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cg.patch" # fix bug #414509
+	"${FILESDIR}/${P}-gcc-4.7.patch" # fix bug #423965
+	"${FILESDIR}/${P}-openexr.patch" # fix bug #462494
+	"${FILESDIR}/${P}-clang.patch" # fix clang build
+	"${FILESDIR}/${P}-cpp14.patch" # fix bug #594938
+	"${FILESDIR}/${P}-drop-qt4.patch" # fix bug #560248
+)
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	edos2unix cmake/*
+	EPATCH_SUFFIX=patch epatch "${WORKDIR}/patches"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# cuda support requires old gcc 4.5 that is hardmasked in current
+	# profiles
+	local mycmakeargs=(
+		-DCUDA=no
+		-DLIBDIR=$(get_libdir)
+		-DNVTT_SHARED=TRUE
+		-DCG=$(usex cg)
+		-DGLEW=$(usex glew)
+		-DGLUT=$(usex glut)
+		-DOPENEXR=$(usex openexr)
+	)
+	cmake-utils_src_configure
+}