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

[Bernard Cafarelli]

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
+}