Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/nvidia-texture-tools/files/, media-gfx/nvidia-texture-tools/
Date: Mon, 07 Sep 2020 12:50:31
Message-Id: 1599483019.c5cc1ae4ac02761eb3a638ba8138e542814bdf60.voyageur@gentoo
1 commit: c5cc1ae4ac02761eb3a638ba8138e542814bdf60
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 12:50:06 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 12:50:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5cc1ae4
7
8 media-gfx/nvidia-texture-tools: fix test datapath handling
9
10 Closes: https://bugs.gentoo.org/740766
11 Package-Manager: Portage-3.0.5, Repoman-3.0.1
12 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
13
14 .../nvidia-texture-tools-2.1.2-test_path.patch | 29 ++++++++++++++++++++++
15 .../nvidia-texture-tools-2.1.2.ebuild | 5 +++-
16 2 files changed, 33 insertions(+), 1 deletion(-)
17
18 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
19 new file mode 100644
20 index 00000000000..270147823b2
21 --- /dev/null
22 +++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch
23 @@ -0,0 +1,29 @@
24 +From 4c95dc87165a439698f63c3861c7c17b1fe2193a Mon Sep 17 00:00:00 2001
25 +From: Bernard Cafarelli <bernard.cafarelli@×××××.com>
26 +Date: Mon, 7 Sep 2020 14:29:22 +0200
27 +Subject: [PATCH] Fix data testsuite path
28 +
29 +Add separator between base path and set path if base path is set
30 +
31 +Fixes #299
32 +---
33 + src/nvtt/tests/testsuite.cpp | 3 +++
34 + 1 file changed, 3 insertions(+)
35 +
36 +diff --git a/src/nvtt/tests/testsuite.cpp b/src/nvtt/tests/testsuite.cpp
37 +index 9737807..06ab9d1 100644
38 +--- a/src/nvtt/tests/testsuite.cpp
39 ++++ b/src/nvtt/tests/testsuite.cpp
40 +@@ -509,6 +509,9 @@ int main(int argc, char *argv[])
41 + nvtt::Context context;
42 + context.enableCudaAcceleration(!nocuda);
43 +
44 ++ if (basePath.length() > 0) {
45 ++ basePath.appendSeparator();
46 ++ }
47 + basePath.append(set.basePath);
48 +
49 + FileSystem::changeDirectory(basePath.str());
50 +--
51 +2.28.0
52 +
53
54 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
55 index b2db5d4e20c..8a3d4922c2b 100644
56 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
57 +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
58 @@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
59 virtual/pkgconfig
60 "
61
62 -PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
63 +PATCHES=(
64 + "${FILESDIR}"/${P}-cmake.patch
65 + "${FILESDIR}"/${P}-test_path.patch
66 + )
67 DOCS=( ChangeLog README.md )
68
69 pkg_pretend() {