commit: 2074b5a9bed7a014ab800d89b77f813e93ddcc9e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 10 08:01:33 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 10 08:01:50 2022 +0000 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 <sam <AT> 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..000000000000 --- 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..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: hasufell <[email protected]> -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..000000000000 --- 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) -+ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) - 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 deleted file mode 100644 index 3130d2c60bb1..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch +++ /dev/null @@ -1,58 +0,0 @@ -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(&png_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(&png_ptr, &info_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/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 deleted file mode 100644 index 3fdb25a04ede..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-drop-qt4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/CMakeLists.txt~ 2018-04-02 11:18:57.000000000 +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/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 deleted file mode 100644 index aaba26227411..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Julian Ospald <[email protected]> -Date: Fri Jun 29 08:15:12 UTC 2012 -Subject: fix compilation on gcc 4.7 - -https://bugs.gentoo.org/show_bug.cgi?id=423965 - ---- a/src/nvcore/nvcore.h -+++ b/src/nvcore/nvcore.h -@@ -158,6 +158,7 @@ - #elif NV_CC_GNUC - # if NV_OS_LINUX - # include "DefsGnucLinux.h" -+# include <unistd.h> // gcc 4.7 - # elif NV_OS_DARWIN - # include "DefsGnucDarwin.h" - # elif NV_OS_MINGW diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch deleted file mode 100644 index b49abf9e5c32..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch +++ /dev/null @@ -1,93 +0,0 @@ -From: Julian Ospald <[email protected]> -Date: Wed Mar 20 22:10:22 UTC 2013 -Subject: add pkgconfig checks - -https://bugs.gentoo.org/show_bug.cgi?id=462494 - ---- nvidia-texture-tools/cmake/FindOpenEXR.cmake -+++ nvidia-texture-tools/cmake/FindOpenEXR.cmake -@@ -7,11 +7,15 @@ - # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR. - # - --INCLUDE(FindZLIB) -+IF(UNIX) -+ INCLUDE(FindPkgConfig) -+ pkg_check_modules(_PKG_OPENEXR OpenEXR) -+ENDIF(UNIX) - -+find_package(ZLIB REQUIRED) - --IF(ZLIB_FOUND) -- -+IF(NOT _PKG_OPENEXR_FOUND) -+ - SET(LIBRARY_PATHS - /usr/lib - /usr/local/lib -@@ -46,10 +50,20 @@ - NAMES IlmThread - PATHS ${LIBRARY_PATHS}) - --ENDIF(ZLIB_FOUND) -+ENDIF(NOT _PKG_OPENEXR_FOUND) - - #MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY}) - -+IF(_PKG_OPENEXR_FOUND) -+ SET(OPENEXR_FOUND TRUE) -+ foreach(i ${_PKG_OPENEXR_CFLAGS}) -+ SET(OPENEXR_CFLAGS "${OPENEXR_CFLAGS} ${i}") -+ endforeach(i) -+ foreach(p ${_PKG_OPENEXR_LDFLAGS}) -+ SET(OPENEXR_LDFLAGS "${OPENEXR_LDFLAGS} ${p}") -+ endforeach(p) -+ SET(OPENEXR_LDFLAGS "${OPENEXR_LDFLAGS} ${ZLIB_LIBRARY}") -+ELSE(_PKG_OPENEXR_FOUND) - IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - SET(OPENEXR_FOUND TRUE) - SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR") -@@ -65,6 +79,8 @@ - MESSAGE(FATAL_ERROR "Could not find OpenEXR library") - ENDIF(OPENEXR_FIND_REQUIRED) - ENDIF(OPENEXR_FOUND) -+ENDIF(_PKG_OPENEXR_FOUND) -+ - - MARK_AS_ADVANCED( - OPENEXR_INCLUDE_PATHS -@@ -73,3 +89,4 @@ - OPENEXR_IMATH_LIBRARY - OPENEXR_IEX_LIBRARY - OPENEXR_HALF_LIBRARY) -+ ---- nvidia-texture-tools/src/nvimage/CMakeLists.txt -+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt -@@ -44,10 +44,10 @@ - INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) - ENDIF(TIFF_FOUND) - --IF(OPENEXR_FOUND) -+IF(OPENEXR_FOUND AND NOT _PKG_OPENEXR_FOUND) - SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES}) - INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS}) --ENDIF(OPENEXR_FOUND) -+ENDIF(OPENEXR_FOUND AND NOT _PKG_OPENEXR_FOUND) - - # targets - ADD_DEFINITIONS(-DNVIMAGE_EXPORTS) -@@ -61,6 +61,14 @@ - - TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh) - -+IF(_PKG_OPENEXR_FOUND) -+ SET_TARGET_PROPERTIES(nvimage -+ PROPERTIES -+ COMPILE_FLAGS "${OPENEXR_CFLAGS}" -+ LINK_FLAGS "${OPENEXR_LDFLAGS}" -+ ) -+ENDIF(_PKG_OPENEXR_FOUND) -+ - INSTALL(TARGETS nvimage - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib 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 deleted file mode 100644 index 61e453a1c4a2..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 270147823b28..000000000000 --- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4c95dc87165a439698f63c3861c7c17b1fe2193a Mon Sep 17 00:00:00 2001 -From: Bernard Cafarelli <[email protected]> -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 deleted file mode 100644 index 55721d2a1782..000000000000 --- a/media-gfx/nvidia-texture-tools/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</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.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild deleted file mode 100644 index 7ce85d72afbd..000000000000 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils edos2unix - -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 -riscv 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 - "${WORKDIR}/patches" -) - -S="${WORKDIR}/${PN}" - -src_prepare() { - edos2unix cmake/* - 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 -} 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 deleted file mode 100644 index 0653f47f3995..000000000000 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 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 -riscv ~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}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-test_path.patch - ) -DOCS=( ChangeLog README.md ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -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 -} diff --git a/profiles/package.mask b/profiles/package.mask index 1619f9a192f9..82bd6f7437cf 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -355,11 +355,6 @@ dev-python/django-rq # does not support Python 3.10+. Removal on 2022-06-15. dev-python/python-iptables -# David Seifert <[email protected]> (2022-05-11) -# Declared EOL by upstream at the end of 2020, no revdeps, last version -# has many issues. Removal on 2022-06-10. Bug #741846, #770760. -media-gfx/nvidia-texture-tools - # Florian Schmaus <[email protected]> (2022-05-10) # Was split by upstream (and us) into # net-analyzer/gsa and net-analyzer/gsad.
