[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/, ...
commit: 2074b5a9bed7a014ab800d89b77f813e93ddcc9e
Author: Sam James gentoo org>
AuthorDate: Fri Jun 10 08:01:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 10 08:01:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2074b5a9
media-gfx/nvidia-texture-tools: treeclean
Closes: https://bugs.gentoo.org/741846
Closes: https://bugs.gentoo.org/770760
Signed-off-by: Sam James gentoo.org>
media-gfx/nvidia-texture-tools/Manifest| 3 -
.../files/nvidia-texture-tools-2.0.8-cg.patch | 39 -
.../files/nvidia-texture-tools-2.0.8-clang.patch | 18
.../files/nvidia-texture-tools-2.0.8-cpp14.patch | 58 -
.../nvidia-texture-tools-2.0.8-drop-qt4.patch | 12 ---
.../files/nvidia-texture-tools-2.0.8-gcc-4.7.patch | 16
.../files/nvidia-texture-tools-2.0.8-openexr.patch | 93 -
.../files/nvidia-texture-tools-2.1.2-cmake.patch | 97 --
.../nvidia-texture-tools-2.1.2-test_path.patch | 29 ---
media-gfx/nvidia-texture-tools/metadata.xml| 15
.../nvidia-texture-tools-2.0.8-r4.ebuild | 65 ---
.../nvidia-texture-tools-2.1.2.ebuild | 52
profiles/package.mask | 5 --
13 files changed, 502 deletions(-)
diff --git a/media-gfx/nvidia-texture-tools/Manifest
b/media-gfx/nvidia-texture-tools/Manifest
deleted file mode 100644
index 35dd7d857d23..
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B
aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721
SHA512
8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
-DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B
b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5
SHA512
988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
-DIST nvidia-texture-tools-2.1.2.tar.gz 45172897 BLAKE2B
de1827ccf9900499e089e7f0ccdf2acab089afb2c4d8e41978c3cf653aca81f8d9136bdd0e4467e7f5534b44f7329883f1ca66508c289200b23dfdd1158a9fc6
SHA512
4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
diff --git
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
deleted file mode 100644
index 79d38f576316..
--- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: hasufell
-Date: Thu May 3 20:06:31 UTC 2012
-
-fix compilation for cg useflag
-
a/cmake/FindCg.cmake
-+++ b/cmake/FindCg.cmake
-@@ -86,6 +86,7 @@
- FIND_PROGRAM( CG_COMPILER cgc
- /usr/bin
- /usr/local/bin
-+ /opt/nvidia-cg-toolkit/bin
- DOC "The Cg Compiler"
- )
- GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH)
-@@ -93,6 +94,7 @@
- FIND_PATH( CG_INCLUDE_PATH Cg/cg.h
- /usr/include
- /usr/local/include
-+ /opt/nvidia-cg-toolkit/include
- ${CG_COMPILER_SUPER_DIR}/include
- DOC "The directory where Cg/cg.h resides"
- )
-@@ -102,6 +104,7 @@
- /usr/lib
- /usr/local/lib64
- /usr/local/lib
-+ /opt/nvidia-cg-toolkit/lib
- ${CG_COMPILER_SUPER_DIR}/lib64
- ${CG_COMPILER_SUPER_DIR}/lib
- DOC "The Cg runtime library"
-@@ -113,6 +116,7 @@
- /usr/lib
- /usr/local/lib64
- /usr/local/lib
-+ /opt/nvidia-cg-toolkit/lib
- ${CG_COMPILER_SUPER_DIR}/lib64
- ${CG_COMPILER_SUPER_DIR}/lib
- DOC "The Cg runtime library"
diff --git
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch
deleted file mode 100644
index 373c87e4171b..
---
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/src/nvtt/squish/CMakeLists.txt
-===
src/src/nvtt/squish/CMakeLists.txt (revision 13060)
-+++ src/src/nvtt/squish/CMakeLists.txt (working copy)
-@@ -22,7 +22,11 @@
-
- ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
-
--IF(CMAKE_COMPILER_IS_GNUCXX)
-+IF("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR
"${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-+ SET(CMAKE_COMPILER_IS_CLANGXX 1)
-+ENDIF()
-+
-+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
- SET_TARGET_PROPERTIES(squish PROPERTIES COMPILE_FLAGS -fPIC)
--ENDIF(CMAKE_COMPILER_IS_GNUCXX)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: 7b9375683efeff60e57f69f25d0aed49462269d1
Author: David Seifert gentoo org>
AuthorDate: Wed May 11 13:23:51 2022 +
Commit: David Seifert gentoo org>
CommitDate: Wed May 11 13:23:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b937568
media-gfx/nvidia-texture-tools: [QA] fix BDEPEND and OpenMP checks
Signed-off-by: David Seifert gentoo.org>
.../nvidia-texture-tools-2.1.2.ebuild | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
index 803456bf123a..0653f47f3995 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,9 +22,8 @@ RDEPEND="
virtual/jpeg:0
x11-libs/libX11
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-cmake.patch
@@ -33,9 +32,11 @@ PATCHES=(
DOCS=( ChangeLog README.md )
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
commit: c5cc1ae4ac02761eb3a638ba8138e542814bdf60
Author: Bernard Cafarelli gentoo org>
AuthorDate: Mon Sep 7 12:50:06 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Mon Sep 7 12:50:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5cc1ae4
media-gfx/nvidia-texture-tools: fix test datapath handling
Closes: https://bugs.gentoo.org/740766
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli gentoo.org>
.../nvidia-texture-tools-2.1.2-test_path.patch | 29 ++
.../nvidia-texture-tools-2.1.2.ebuild | 5 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch
new file mode 100644
index 000..270147823b2
--- /dev/null
+++
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch
@@ -0,0 +1,29 @@
+From 4c95dc87165a439698f63c3861c7c17b1fe2193a Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli
+Date: Mon, 7 Sep 2020 14:29:22 +0200
+Subject: [PATCH] Fix data testsuite path
+
+Add separator between base path and set path if base path is set
+
+Fixes #299
+---
+ src/nvtt/tests/testsuite.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/nvtt/tests/testsuite.cpp b/src/nvtt/tests/testsuite.cpp
+index 9737807..06ab9d1 100644
+--- a/src/nvtt/tests/testsuite.cpp
b/src/nvtt/tests/testsuite.cpp
+@@ -509,6 +509,9 @@ int main(int argc, char *argv[])
+ nvtt::Context context;
+ context.enableCudaAcceleration(!nocuda);
+
++if (basePath.length() > 0) {
++basePath.appendSeparator();
++}
+ basePath.append(set.basePath);
+
+ FileSystem::changeDirectory(basePath.str());
+--
+2.28.0
+
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
index b2db5d4e20c..8a3d4922c2b 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-test_path.patch
+ )
DOCS=( ChangeLog README.md )
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: 4312bd73b0f1f01f656820a241658b78e6fd42e8
Author: Bernard Cafarelli gentoo org>
AuthorDate: Sat Sep 5 10:08:48 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sat Sep 5 10:08:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4312bd73
media-gfx/nvidia-texture-tools: add some build options
Use recommended upstream options for shared flag
libsquish has build options for sse2 and openmp
Disable old gconf schema installation (triggers sandbox failure)
Closes: https://bugs.gentoo.org/740430
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli gentoo.org>
.../nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
index 335938d3103..b2db5d4e20c 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/castano/nvidia-texture-tools/archive/${PV}.tar.gz ->
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="cpu_flags_x86_sse2 openmp"
RDEPEND="
media-libs/ilmbase:=
@@ -29,11 +29,20 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
DOCS=( ChangeLog README.md )
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible
compiler"
+ fi
+}
+
src_configure() {
# May be able to restore CUDA, but needs an old gcc
local mycmakeargs=(
-DCUDA_FOUND=OFF
- -DNVTT_SHARED=TRUE
+ -DGCONFTOOL2=OFF
+ -DNVTT_SHARED=0
+ -DBUILD_SQUISH_WITH_OPENMP=$(usex openmp)
+ -DBUILD_SQUISH_WITH_SSE2=$(usex cpu_flags_x86_sse2)
)
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: e31aa28927c900cd4389575b1b05abbf33b4278d Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Sep 4 14:36:15 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Sep 4 20:22:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31aa289 media-gfx/nvidia-texture-tools: adopt package There is newer version upstream, will bump Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Bernard Cafarelli gentoo.org> media-gfx/nvidia-texture-tools/metadata.xml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml index 20324d728bf..504fd807774 100644 --- a/media-gfx/nvidia-texture-tools/metadata.xml +++ b/media-gfx/nvidia-texture-tools/metadata.xml @@ -1,9 +1,15 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + voyag...@gentoo.org + Bernard Cafarelli + Enable NVIDIA C graphics compiler toolkit plug-in Enable support for The OpenGL Extension Wrangler Library (media-libs/glew) + + castano/nvidia-texture-tools +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
commit: d0995edea447345b318ca48e143486d70e24f060
Author: Bernard Cafarelli gentoo org>
AuthorDate: Fri Sep 4 16:24:19 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Fri Sep 4 20:22:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0995ede
media-gfx/nvidia-texture-tools: 2.1.2 bump
Latest version from current upstream, lots of patches merged
Most optional features do not exist anymore or are not used
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli gentoo.org>
media-gfx/nvidia-texture-tools/Manifest| 1 +
.../files/nvidia-texture-tools-2.1.2-cmake.patch | 97 ++
.../nvidia-texture-tools-2.1.2.ebuild | 39 +
3 files changed, 137 insertions(+)
diff --git a/media-gfx/nvidia-texture-tools/Manifest
b/media-gfx/nvidia-texture-tools/Manifest
index e8778f08d30..35dd7d857d2 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -1,2 +1,3 @@
DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B
aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721
SHA512
8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B
b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5
SHA512
988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
+DIST nvidia-texture-tools-2.1.2.tar.gz 45172897 BLAKE2B
de1827ccf9900499e089e7f0ccdf2acab089afb2c4d8e41978c3cf653aca81f8d9136bdd0e4467e7f5534b44f7329883f1ca66508c289200b23dfdd1158a9fc6
SHA512
4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
diff --git
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch
new file mode 100644
index 000..61e453a1c4a
--- /dev/null
+++
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch
@@ -0,0 +1,97 @@
+diff -Naur nvidia-texture-tools-2.1.2.orig/CMakeLists.txt
nvidia-texture-tools-2.1.2/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/CMakeLists.txt 2020-08-24
08:27:21.0 +0200
nvidia-texture-tools-2.1.2/CMakeLists.txt 2020-09-04 18:10:04.297646679
+0200
+@@ -28,12 +28,6 @@
+
+ ADD_SUBDIRECTORY(src)
+
+-# These files should only be installed when creating packages.
+-INSTALL(FILES
+- LICENSE
+- README.md
+- DESTINATION share/doc/nvtt)
+-
+ # Add packaging support
+ INCLUDE(InstallRequiredSystemLibraries)
+
+diff -Naur
nvidia-texture-tools-2.1.2.orig/extern/libsquish-1.15/CMakeLists.txt
nvidia-texture-tools-2.1.2/extern/libsquish-1.15/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/extern/libsquish-1.15/CMakeLists.txt
2020-08-24 08:27:21.0 +0200
nvidia-texture-tools-2.1.2/extern/libsquish-1.15/CMakeLists.txt
2020-09-04 18:09:45.861623060 +0200
+@@ -111,7 +111,7 @@
+
+ INSTALL(
+ TARGETS squish
+-LIBRARY DESTINATION lib
++LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION lib
+ PUBLIC_HEADER DESTINATION include
+ )
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvcore/CMakeLists.txt
nvidia-texture-tools-2.1.2/src/nvcore/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvcore/CMakeLists.txt 2020-08-24
08:27:21.0 +0200
nvidia-texture-tools-2.1.2/src/nvcore/CMakeLists.txt 2020-09-04
18:09:45.860623059 +0200
+@@ -45,6 +45,6 @@
+ endif()
+
+ INSTALL(TARGETS nvcore
+-RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib/static)
++RUNTIME DESTINATION ${BINDIR}
++LIBRARY DESTINATION ${LIBDIR}
++ARCHIVE DESTINATION ${LIBDIR})
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvimage/CMakeLists.txt
nvidia-texture-tools-2.1.2/src/nvimage/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvimage/CMakeLists.txt 2020-08-24
08:27:21.0 +0200
nvidia-texture-tools-2.1.2/src/nvimage/CMakeLists.txt 2020-09-04
18:09:45.860623059 +0200
+@@ -57,7 +57,7 @@
+ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore posh bc6h bc7 nvmath)
+
+ INSTALL(TARGETS nvimage
+-RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib/static)
++RUNTIME DESTINATION ${BINDIR}
++LIBRARY DESTINATION ${LIBDIR}
++ARCHIVE DESTINATION ${LIBDIR})
+
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvmath/CMakeLists.txt
nvidia-texture-tools-2.1.2/src/nvmath/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvmath/CMakeLists.txt 2020-08-24
08:27:21.0 +0200
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: 62b9631e6e06e4a6cee677f45198bd169111b9dc
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Feb 15 18:29:38 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Feb 15 18:32:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b9631e
media-gfx/nvidia-texture-tools: amd64 stable wrt bug #676554
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 01ae2355eb0..c71aa223a89 100644
--- 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
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="cg glew glut openexr"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: 312449f7a29fbd212f0b365c729324c3ec7a12f3
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Feb 15 18:32:06 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Feb 15 18:32:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312449f7
media-gfx/nvidia-texture-tools: Drop old
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/nvidia-texture-tools/metadata.xml| 1 -
.../nvidia-texture-tools-2.0.8-r3.ebuild | 72 --
2 files changed, 73 deletions(-)
diff --git a/media-gfx/nvidia-texture-tools/metadata.xml
b/media-gfx/nvidia-texture-tools/metadata.xml
index 0d4c5582813..20324d728bf 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -4,7 +4,6 @@
Enable NVIDIA C graphics compiler toolkit
plug-in
- Enable NVIDIA CUDA toolkit support
Enable support for The OpenGL Extension
Wrangler Library (media-libs/glew)
diff --git
a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
deleted file mode 100644
index d8f2a464d7e..000
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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/~soap/distfiles/${P}-patchset-1-r1.tar.xz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cg cuda 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 )
- cuda? ( dev-util/nvidia-cuda-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
- "${WORKDIR}/patches"
-)
-
-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/*
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIBDIR=$(get_libdir)
- -DNVTT_SHARED=TRUE
- -DCG=$(usex cg)
- -DCUDA=$(usex cuda)
- -DGLEW=$(usex glew)
- -DGLUT=$(usex glut)
- -DOPENEXR=$(usex openexr)
- )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: c55ff43b06e83d9fb812ec0b75e2f6c9db2ea1db
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Feb 15 00:03:18 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Feb 15 00:17:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55ff43b
media-gfx/nvidia-texture-tools: x86 stable (bug #676554)
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
index a334693dbd2..01ae2355eb0 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="cg glew glut openexr"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: 131d5000370c3ff3956eba3e208feed734e0b42f
Author: Marty E. Plummer startmail com>
AuthorDate: Fri Apr 20 08:50:19 2018 +
Commit: David Seifert gentoo org>
CommitDate: Fri Apr 20 20:00:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131d5000
media-gfx/nvidia-texture-tools: epatch->eapply
Also reworked the patchset tarball to all be -p1 applicable, and made
the formatting uniform between the two revisions.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-gfx/nvidia-texture-tools/Manifest | 2 +-
.../nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild | 11 ++-
.../nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild | 5 +++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/media-gfx/nvidia-texture-tools/Manifest
b/media-gfx/nvidia-texture-tools/Manifest
index 5620dbab0b1..e8778f08d30 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -1,2 +1,2 @@
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
+DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B
b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5
SHA512
988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
diff --git
a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
index f264f6ce7ef..d8f2a464d7e 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ 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;
+ https://dev.gentoo.org/~soap/distfiles/${P}-patchset-1-r1.tar.xz;
LICENSE="MIT"
SLOT="0"
@@ -28,9 +28,10 @@ RDEPEND="
glew? ( media-libs/glew:0= )
glut? ( media-libs/freeglut )
openexr? ( media-libs/openexr:= )
- "
+"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
PATCHES=(
"${FILESDIR}/${P}-cg.patch" # fix bug #414509
@@ -38,6 +39,7 @@ PATCHES=(
"${FILESDIR}/${P}-openexr.patch" # fix bug #462494
"${FILESDIR}/${P}-clang.patch" # fix clang build
"${FILESDIR}/${P}-cpp14.patch" # fix bug #594938
+ "${WORKDIR}/patches"
)
S="${WORKDIR}/${PN}"
@@ -53,7 +55,6 @@ pkg_setup() {
src_prepare() {
edos2unix cmake/*
- EPATCH_SUFFIX=patch epatch "${WORKDIR}/patches"
cmake-utils_src_prepare
}
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
index eaabe632f83..a334693dbd2 100644
--- 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
@@ -2,12 +2,13 @@
# 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;
+ https://dev.gentoo.org/~soap/distfiles/${P}-patchset-1-r1.tar.xz;
LICENSE="MIT"
SLOT="0"
@@ -38,13 +39,13 @@ PATCHES=(
"${FILESDIR}/${P}-clang.patch" # fix clang build
"${FILESDIR}/${P}-cpp14.patch" # fix bug #594938
"${FILESDIR}/${P}-drop-qt4.patch" # fix bug #560248
+ "${WORKDIR}/patches"
)
S="${WORKDIR}/${PN}"
src_prepare() {
edos2unix cmake/*
- EPATCH_SUFFIX=patch epatch "${WORKDIR}/patches"
cmake-utils_src_prepare
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/
commit: cb46dd2bf777f9b7aeb7aae25f433ed6b2edac38
Author: Pacho Ramos gentoo org>
AuthorDate: Mon Apr 2 09:23:43 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Mon Apr 2 09:48:24 2018 +
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 000..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.0 +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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: 45b9ff64275271661cb9a4f2a02bea87fdd1adeb
Author: Johannes Huber gentoo org>
AuthorDate: Sun Feb 12 16:03:32 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Feb 12 16:07:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b9ff64
media-gfx/nvidia-texture-tools: Remove 2.0.8 (r2)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../nvidia-texture-tools-2.0.8-r2.ebuild | 78 --
1 file changed, 78 deletions(-)
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
deleted file mode 100644
index 01690b8809..00
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="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 cuda glew glut openexr"
-
-RDEPEND="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 )
- "
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-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
- # fix clang build
- epatch "${FILESDIR}"/${P}-clang.patch
- # fix bug #594938
- epatch "${FILESDIR}/${P}-cpp14.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
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/
commit: cda0bd12bc35820569f3869a2425dc9feade82e4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Feb 12 14:46:10 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Feb 12 14:48:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda0bd12
media-gfx/nvidia-texture-tools: amd64 stable wrt bug #608884
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
index e49ec73432..2551dd17c5 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="cg cuda glew glut openexr"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
commit: 606148aa9f8c8b33fa9b75a8d60c87e90756c068
Author: Kacper Kołodziej kolodziej in>
AuthorDate: Sat Nov 26 21:53:27 2016 +
Commit: David Seifert gentoo org>
CommitDate: Wed Jan 4 13:25:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606148aa
media-gfx/nvidia-texture-tools: upgrade to EAPI=6
Package-Manager: portage-2.3.2
.../files/nvidia-texture-tools-2.0.8-cg.patch | 4 +-
.../files/nvidia-texture-tools-2.0.8-gcc-4.7.patch | 4 +-
.../nvidia-texture-tools-2.0.8-r3.ebuild | 72 ++
3 files changed, 76 insertions(+), 4 deletions(-)
diff --git
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
index 6dcb1b4..79d38f5 100644
--- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
@@ -3,8 +3,8 @@ Date: Thu May 3 20:06:31 UTC 2012
fix compilation for cg useflag
cmake/FindCg.cmake
-+++ cmake/FindCg.cmake
+--- a/cmake/FindCg.cmake
b/cmake/FindCg.cmake
@@ -86,6 +86,7 @@
FIND_PROGRAM( CG_COMPILER cgc
/usr/bin
diff --git
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch
index 62f33e9..aaba262 100644
---
a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch
+++
b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch
@@ -4,8 +4,8 @@ Subject: fix compilation on gcc 4.7
https://bugs.gentoo.org/show_bug.cgi?id=423965
src/nvcore/nvcore.h
-+++ src/nvcore/nvcore.h
+--- a/src/nvcore/nvcore.h
b/src/nvcore/nvcore.h
@@ -158,6 +158,7 @@
#elif NV_CC_GNUC
# if NV_OS_LINUX
diff --git
a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
new file mode 100644
index ..e49ec73
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 cuda 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 )
+ cuda? ( dev-util/nvidia-cuda-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
+)
+
+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"
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIBDIR=$(get_libdir)
+ -DNVTT_SHARED=TRUE
+ -DCG=$(usex cg)
+ -DCUDA=$(usex cuda)
+ -DGLEW=$(usex glew)
+ -DGLUT=$(usex glut)
+ -DOPENEXR=$(usex openexr)
+ )
+ cmake-utils_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/, media-gfx/nvidia-texture-tools/files/
commit: 63b0597c1247c53fe09c20274b17d0a47c3c3d60
Author: Kacper Kołodziej kolodziej in>
AuthorDate: Sat Nov 5 20:02:17 2016 +
Commit: David Seifert gentoo org>
CommitDate: Wed Jan 4 13:25:11 2017 +
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 ..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(_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(_ptr, _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() {
