[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/

[Pacho Ramos]

commit:     cb46dd2bf777f9b7aeb7aae25f433ed6b2edac38
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 09:23:43 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 09:48:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb46dd2b

media-gfx/nvidia-texture-tools: Drop qt4 automafic dep and cuda USE

Fix qt4 automagic dep (#560248) and cuda support requiring obsolete gcc not
available in current profiles

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 .../nvidia-texture-tools-2.0.8-drop-qt4.patch      | 12 ++++
 .../nvidia-texture-tools-2.0.8-r4.ebuild           | 64 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)

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 00000000000..3fdb25a04ed
--- /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 00000000000..eaabe632f83
--- /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
+}