diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-gfx/nvidia-texture-tools | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'media-gfx/nvidia-texture-tools')
12 files changed, 0 insertions, 508 deletions
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest deleted file mode 100644 index 51748e21b80b..000000000000 --- a/media-gfx/nvidia-texture-tools/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX nvidia-texture-tools-2.0.8-cg.patch 1077 BLAKE2B 87b20084932013b969e1b497944f64eef7d017b300fc07afc37fc1b5f133062387f32bceced14ae4d93fa7567eb3e4a79f5ec7d1e69cb22883afad472bcc367d SHA512 9c528320efa9c274c805dd3202e6c44d1391486c5c3d574ce4a6264ee4013a8b215467fbd0a880193048a716365f499b4cb1e935bb6e49d165c674a03d45a387 -AUX nvidia-texture-tools-2.0.8-clang.patch 684 BLAKE2B 0908b6509e94b8909e6af22f4f0e075ddcf41be883e82982edc270b97a71f504fc3281d4fc3b7995eda133376ad4ed4797f2a3e9bf4f41aaf7641b513f05d2ae SHA512 2e2f7645c8a29e6c158e054d27ccd270a5441d33254a0cc27c12aeb1b8c423374b0900a71ed87ef7bc055597302adfc0eeb27e1c788dca54850df53004c50822 -AUX nvidia-texture-tools-2.0.8-cpp14.patch 1566 BLAKE2B b5ffbc9c4b680a46683a628cba25b582d5ee35eab521c63ee887dfbda77cb46e3d091c8b827273f3b8feb71051befdab1667a0083243deaaa880f2f940d6e48d SHA512 4234facfc77da76a5d1a394ba48a5d6cfc664b695af1e8fdd90e6bb51de6ce949061a9a30e32aa2d668d21fe41c31caae50dc6efa607a568e2ab1329c41f2ba5 -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 1516 BLAKE2B 6607ec0e9e4c15a8a93a6887baee944472b84e1f29f03363ed2e74c818e7e4bb05e81d131070ecb5f0ed641c3a9732e7a6f91ac108a9e4b3120c7c748e7a11ad SHA512 5d8a2726931cce582b80bca0ea0b9c8eb3a533a9dfbbd94737eeab32e2525a9048006355ee2b339466009f7ed66c7745809fbe4218d618b7c152486830489b99 -EBUILD nvidia-texture-tools-2.1.2.ebuild 1154 BLAKE2B 7b134563c4013d8efe198ce8676f9d47d4e609f104d30e6ffa8937c4f01f14c224c39188bfdb9fb18b03ca6cffc49570cc0c627a85e832c1f3024345d4609967 SHA512 6d7bada47b7f3e3c22ba451f2937926c640eabdc162c9f30e4c27ed5e4365fee00dff0ba2d797b936ea5ec51fd8017e22542fda0a66db3cd954ce445da74dbb4 -MISC metadata.xml 549 BLAKE2B ebd2ca9d85f2e8b5621275c7bfd554ff0f9c721c73f203f9e1d3ba76cd6428d78169586b3ec418f95e0632d083f747fdbb8a487532f668cd525b58561f133078 SHA512 5631940e5c4c18bbf6bfca1645fc46f736d867f38417106930437f09f6a12964f8c1a65d8a6baba2bc2f2e77964f025bd604f1a48c2db2f10a13e0e163ca4b60 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 <hasufell@gentoo.org> -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 <hasufell@gentoo.org> -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 <hasufell@gentoo.org> -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 <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 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>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.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 -} |