* [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
@ 2017-01-04 13:25 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-01-04 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 606148aa9f8c8b33fa9b75a8d60c87e90756c068
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Sat Nov 26 21:53:27 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 13:25:15 2017 +0000
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 00000000..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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
@ 2020-09-04 20:22 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2020-09-04 20:22 UTC (permalink / raw
To: gentoo-commits
commit: d0995edea447345b318ca48e143486d70e24f060
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 16:24:19 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 20:22:43 2020 +0000
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 <voyageur <AT> 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 00000000000..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.000000000 +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.000000000 +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.000000000 +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.000000000 +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.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvmath/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
+@@ -19,6 +19,6 @@
+ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
+
+ INSTALL(TARGETS nvmath
+- 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/nvthread/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvthread/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvthread/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvthread/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
+@@ -23,6 +23,6 @@
+ TARGET_LINK_LIBRARIES(nvthread ${LIBS} nvcore)
+
+ INSTALL(TARGETS nvthread
+- 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/nvtt/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvtt/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvtt/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvtt/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
+@@ -56,9 +56,9 @@
+ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvsquish bc6h bc7 nvmath rg_etc1)
+
+ INSTALL(TARGETS nvtt
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib/static)
++ RUNTIME DESTINATION ${BINDIR}
++ LIBRARY DESTINATION ${LIBDIR}
++ ARCHIVE DESTINATION ${LIBDIR})
+
+ INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt)
+
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
new file mode 100644
index 00000000000..335938d3103
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A set of cuda-enabled texture tools and compressors"
+HOMEPAGE="https://github.com/castano/nvidia-texture-tools"
+SRC_URI="https://github.com/castano/nvidia-texture-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/ilmbase:=
+ media-libs/libpng:0=
+ media-libs/tiff:0
+ sys-libs/zlib
+ virtual/jpeg:0
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+ # May be able to restore CUDA, but needs an old gcc
+ local mycmakeargs=(
+ -DCUDA_FOUND=OFF
+ -DNVTT_SHARED=TRUE
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
@ 2020-09-07 12:50 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2020-09-07 12:50 UTC (permalink / raw
To: gentoo-commits
commit: c5cc1ae4ac02761eb3a638ba8138e542814bdf60
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 12:50:06 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 12:50:19 2020 +0000
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 <voyageur <AT> 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 00000000000..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 <bernard.cafarelli@gmail.com>
+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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-07 12:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-07 12:50 [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2020-09-04 20:22 Bernard Cafarelli
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