gentoo resync : 16.09.2020

5 files changed, 189 insertions, 2 deletions

diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index d1b945c35738..1b63817fa8d8 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -4,7 +4,11 @@ AUX nvidia-texture-tools-2.0.8-cpp14.patch 1566 BLAKE2B b5ffbc9c4b680a46683a628c
 AUX nvidia-texture-tools-2.0.8-drop-qt4.patch 319 BLAKE2B 534bcddc9574a14ccd5a61f84f10289705624a8547f38f86df85fb0238581fcedbb6d0bb99483d3f2dfd5521a21006d6ba4a60c528ce1ed640e5bb01d2fa924c SHA512 1024d9890d55493cc92b6254047c19b5895b0ea2a6d9ae2b4e1dbf726a165f4a624ec8acca8655c4efed6c8bec52218ffcd116ef48d3bf68606f04107baab671
 AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 406 BLAKE2B 8c17ed5fd7158f118b450f81c5fa77794db82c0d4de1b37e7b53c929eaadc9ece875cf529b3b3446b90623e563e255fcd90842038cebebf52ec0dda1b7835507 SHA512 1bcd69cbbbd01194bb68bff547b240cb196ef3aa73c73c401fb657c4ae7cd77f995fcd7d39f868d25c49994312b236210306aa577194fe756830a22f03da3e7b
 AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 BLAKE2B 55694c275548dd9177991e008fe9a9c37c290d4e8b17e4dd91a0ec241dc75900e4b6f29f8650780af112ebffcc7ca04c617456b5e2186e590f3e2da705960a1e SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade
+AUX nvidia-texture-tools-2.1.2-cmake.patch 4189 BLAKE2B 77ee5acecff6a05b7714f35b73aa7c1797eac97f448dee222958fc1429d8ff1ae9083745a7b4d70f04677d683112d872661d271e6a45baab52fab28d32b89764 SHA512 4464750881aaa864cbfbf492005ff8d62bb25da2fd024760f3f315833610d0f353c6b50cfc2a36a7e2f7c989f06857032150a9c6ce8d9257222fb1d9248e1e06
+AUX nvidia-texture-tools-2.1.2-test_path.patch 846 BLAKE2B 51a9014da038c9015b767045822e47a5ec0383f4f301110ecbeb1c840c3b9ae62cf5590c424c1ae4acff1d64721a9b942e098e034bb3d89eb992bdf846e9fd71 SHA512 124c75bc1bf0b1247313547b29de36f7d9c39446eda269a08c90d61b23382491845277359f326e77718a7b7c0b30cb8795edb897b36c8675e5d3eed63cf15698
 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
 EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1506 BLAKE2B fa68fcb7198d50acf90bfe8973e1cb7e7a657dcbaadf65c35640de3d7b999259ca6771ed5de15a512bbf493076c9efc895c03d75a77a60cce7e31dfa76618fcd SHA512 f7e293b826a9a0e1b9993b5046ebcb2b44fe0008340fb4ad5ce00ed69fe693a6a60301b60829a9fe2b62f05f5d5b4fafa31735b767fea2d3f9f3abaa08641591
-MISC metadata.xml 370 BLAKE2B b516169c99bf0f8fd79fcb152c6dccc702b037f94483232fd3dee83d96f4a8b71abf82e19c72df9ebed4f95aabe8c26af44b0449961c31619e4e4ec474a69c78 SHA512 11a9aee676f6834be3333dc43e91d2c4980c65cba6d2fcbbb0a8c5d1eaea9e0ee78956905fed45724e465bdda93ce28d65c66de5b92be539a5f5f80afde924bc
+EBUILD nvidia-texture-tools-2.1.2.ebuild 1124 BLAKE2B e4562a10601c49f9ef2d9a7332c027bca00049bfa03e12a7e744557d73ebd47bdac9b2f3569aa1ad96b59e6c77c00e48039780d440ef2a174e89e7b61d702865 SHA512 1717a44a98d3faed523f2727989dab39fa07554864ee5400c30e92030dab750c4182d68c167563d515c34b30120ff786cace46605e4dae15e38bef822a0ec0bf
+MISC metadata.xml 548 BLAKE2B 7ee44cd2eba3f160653796a39cd0d86bb3e9510690dbca309f22e373a7d90022db794cb6e099cc7d0c6195ee842d1482059f717db1f6a1ccfb16b7617ac78dbd SHA512 7614e56190a58544ac155951e1961d7238ed91c512a10db44b3f88bb03e21ecf7b3128ade8d2316df626a65794d673e0d78a61ee35690817a397f3ee8cf98f0f
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 000000000000..61e453a1c4a2
--- /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/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 000000000000..270147823b28
--- /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/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml
index 20324d728bf0..504fd8077747 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<use>
 		<flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
 		<flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">castano/nvidia-texture-tools</remote-id>
+	</upstream>
 </pkgmetadata>
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 000000000000..8a3d4922c2b2
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -0,0 +1,51 @@
+# 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="cpu_flags_x86_sse2 openmp"
+
+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
+	"${FILESDIR}"/${P}-test_path.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
+		-DGCONFTOOL2=OFF
+		-DNVTT_SHARED=0
+		-DBUILD_SQUISH_WITH_OPENMP=$(usex openmp)
+		-DBUILD_SQUISH_WITH_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake_src_configure
+}