* [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/
@ 2017-01-04 13:25 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-01-04 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 63b0597c1247c53fe09c20274b17d0a47c3c3d60
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Sat Nov 5 20:02:17 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 13:25:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b0597c
media-gfx/nvidia-texture-tools: fix cpp14 compilation errors; bug #594938
Package-Manager: portage-2.3.2
.../files/nvidia-texture-tools-2.0.8-cpp14.patch | 58 ++++++++++++++++++++++
.../nvidia-texture-tools-2.0.8-r2.ebuild | 4 +-
2 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch
new file mode 100644
index 00000000..3130d2c
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch
@@ -0,0 +1,58 @@
+This patch fixes cpp14 compilation errors.
+Gentoo-bug: 594938
+
+--- a/src/nvimage/ImageIO.cpp
++++ b/src/nvimage/ImageIO.cpp
+@@ -135,7 +135,7 @@
+ StdInputStream stream(fileName);
+
+ if (stream.isError()) {
+- return false;
++ return NULL;
+ }
+
+ return loadFloat(fileName, stream);
+@@ -233,7 +233,7 @@
+ case TGA_TYPE_INDEXED:
+ if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
+ nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
+- return false;
++ return NULL;
+ }
+ pal = true;
+ break;
+@@ -254,7 +254,7 @@
+
+ default:
+ nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
+- return false;
++ return NULL;
+ }
+
+ const uint pixel_size = (tga.pixel_size/8);
+@@ -621,7 +621,7 @@
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ if (png_ptr == NULL) {
+ // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
+- return false;
++ return NULL;
+ }
+
+ // Allocate/initialize a memory block for the image information
+@@ -629,14 +629,14 @@
+ if (info_ptr == NULL) {
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
+- return false;
++ return NULL;
+ }
+
+ // Set up the error handling
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
+- return false;
++ return NULL;
+ }
+
+ // Set up the I/O functions.
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
index 20b73dc..01690b8 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -53,6 +53,8 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-openexr.patch
# fix clang build
epatch "${FILESDIR}"/${P}-clang.patch
+ # fix bug #594938
+ epatch "${FILESDIR}/${P}-cpp14.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/
@ 2018-04-02 9:48 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-04-02 9:48 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-02 9:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-02 9:48 [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2017-01-04 13:25 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox