graphics/nvidia-texture-tools: update 2.1.1 → 2.1.2

Note: upstream no longer supports shared libnvmath, but consumer
ports (devel/osg*) still require it, so forcibly make it shared.

8 files changed, 58 insertions, 22 deletions

diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index 38e87c1e536a..f44ac04a2d6c 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-texture-tools
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -11,8 +11,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64 armv6 aarch64  # see src/nvcore/nvcore.h
 
 USES=		cmake compiler:c++11-lang
-CMAKE_ARGS=	-DNVTT_SHARED=TRUE \
-		-DNVTHREAD_SHARED=TRUE
+CMAKE_ON=	NVTT_SHARED \
+		NVCORE_SHARED \
+		NVTHREAD_SHARED \
+		NVIMAGE_SHARED
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	castano
 USE_LDCONFIG=	yes
diff --git a/graphics/nvidia-texture-tools/distinfo b/graphics/nvidia-texture-tools/distinfo
index d50ddd21fc0d..3795c5b78a1e 100644
--- a/graphics/nvidia-texture-tools/distinfo
+++ b/graphics/nvidia-texture-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647528012
-SHA256 (castano-nvidia-texture-tools-2.1.1_GH0.tar.gz) = 4cd23eef0c4af473b6ca644fb3a96d65ffc6bb06c1b207255c2c899f3c15e726
-SIZE (castano-nvidia-texture-tools-2.1.1_GH0.tar.gz) = 45303260
+TIMESTAMP = 1648815344
+SHA256 (castano-nvidia-texture-tools-2.1.2_GH0.tar.gz) = 0187336b0285038fab4f4a6b7654f51beaebab040b6aad53c147c917c5ab519b
+SIZE (castano-nvidia-texture-tools-2.1.2_GH0.tar.gz) = 45172897
diff --git a/graphics/nvidia-texture-tools/files/patch-CMakeLists.txt b/graphics/nvidia-texture-tools/files/patch-CMakeLists.txt
index 788d874fb0b5..2fe1e849840b 100644
--- a/graphics/nvidia-texture-tools/files/patch-CMakeLists.txt
+++ b/graphics/nvidia-texture-tools/files/patch-CMakeLists.txt
@@ -1,26 +1,15 @@
---- CMakeLists.txt.orig	2017-08-23 18:05:30 UTC
+--- CMakeLists.txt.orig	2020-08-24 06:27:21 UTC
 +++ CMakeLists.txt
-@@ -25,9 +25,8 @@ IF(WIN32)
- 	
- ENDIF(WIN32)
- 
--INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # the only useful line from OptimalOptions.cmake
- MESSAGE(STATUS "Setting optimal options")
--MESSAGE(STATUS "  Processor: ${NV_SYSTEM_PROCESSOR}")
- MESSAGE(STATUS "  Compiler Flags: ${CMAKE_CXX_FLAGS}")
- 
- IF(CMAKE_BUILD_TYPE MATCHES "debug")
-@@ -45,12 +44,6 @@ ENDIF(NVTT_SHARED)
- ADD_SUBDIRECTORY(extern)
+@@ -28,12 +28,6 @@ ADD_SUBDIRECTORY(extern)
  
  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 --git a/graphics/nvidia-texture-tools/files/patch-cmake_OptimalOptions.cmake b/graphics/nvidia-texture-tools/files/patch-cmake_OptimalOptions.cmake
new file mode 100644
index 000000000000..3e9cc9d64463
--- /dev/null
+++ b/graphics/nvidia-texture-tools/files/patch-cmake_OptimalOptions.cmake
@@ -0,0 +1,10 @@
+--- cmake/OptimalOptions.cmake.orig	2020-08-24 06:27:21 UTC
++++ cmake/OptimalOptions.cmake
+@@ -1,7 +1,6 @@
+ 
+ # Set optimal options for gcc:
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ ENDIF()
+ 
diff --git a/graphics/nvidia-texture-tools/files/patch-extern_CMakeLists.txt b/graphics/nvidia-texture-tools/files/patch-extern_CMakeLists.txt
new file mode 100644
index 000000000000..841b8509eb9c
--- /dev/null
+++ b/graphics/nvidia-texture-tools/files/patch-extern_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- extern/CMakeLists.txt.orig	2020-08-24 06:27:21 UTC
++++ extern/CMakeLists.txt
+@@ -5,7 +5,5 @@ ADD_SUBDIRECTORY(EtcLib)

+ ADD_SUBDIRECTORY(rg_etc1_v104)

+ #ADD_SUBDIRECTORY(etcpack)

+ 

+-ADD_SUBDIRECTORY(libsquish-1.15)

+-

+ ADD_SUBDIRECTORY(CMP_Core)

+ 

diff --git a/graphics/nvidia-texture-tools/files/patch-src_nvmath_CMakeLists.txt b/graphics/nvidia-texture-tools/files/patch-src_nvmath_CMakeLists.txt
new file mode 100644
index 000000000000..fad8798c0a73
--- /dev/null
+++ b/graphics/nvidia-texture-tools/files/patch-src_nvmath_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/nvmath/CMakeLists.txt.orig	2020-08-24 06:27:21 UTC
++++ src/nvmath/CMakeLists.txt
+@@ -14,7 +14,7 @@ SET(MATH_SRCS
+ 
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-ADD_LIBRARY(nvmath ${MATH_SRCS})
++ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
+ 
+ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
+ 
diff --git a/graphics/nvidia-texture-tools/files/patch-src_nvmath_Matrix.cpp b/graphics/nvidia-texture-tools/files/patch-src_nvmath_Matrix.cpp
new file mode 100644
index 000000000000..05e1ff4c376f
--- /dev/null
+++ b/graphics/nvidia-texture-tools/files/patch-src_nvmath_Matrix.cpp
@@ -0,0 +1,11 @@
+--- src/nvmath/Matrix.cpp.orig	2020-08-24 06:27:21 UTC
++++ src/nvmath/Matrix.cpp
+@@ -7,7 +7,7 @@
+ 

+ #include <float.h>

+ 

+-#if !NV_CC_MSVC && !NV_OS_ORBIS

++#if !NV_CC_MSVC && !NV_OS_ORBIS && !NV_OS_FREEBSD

+ #include <alloca.h>

+ #endif

+ 

diff --git a/graphics/nvidia-texture-tools/pkg-plist b/graphics/nvidia-texture-tools/pkg-plist
index cc5ce4a5c031..50d259f6183f 100644
--- a/graphics/nvidia-texture-tools/pkg-plist
+++ b/graphics/nvidia-texture-tools/pkg-plist
@@ -4,9 +4,11 @@ bin/nvcompress
 bin/nvddsinfo
 bin/nvdecompress
 bin/nvhdrtest
+bin/nvimgdiff
 bin/nvtestsuite
 bin/nvzoom
 include/nvtt/nvtt.h
+include/nvtt/nvtt_wrapper.h
 lib/libnvcore.so
 lib/libnvimage.so
 lib/libnvmath.so