From nobody Fri Apr 1 14:40:49 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 876101A47A6B; Fri, 1 Apr 2022 14:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KVNBp0vvMz3JN1; Fri, 1 Apr 2022 14:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/cZFsiStUeBi/QTlp6AAShzK2jU2QpW8IYHu+umOjA=; b=cqDU2FTW1zXM3BWWWbjy2KoNJfkj2cG9i2JnU2WMwolFMYGwh8q2F6/w9sPOAa9nresKwO GAlk8fATjzhQQmu+xkNH3DHIHoI35kQQfeYeHMvn4dS5afjfUkM+/MiSAcxrPMLkb4GKo7 gjMWGmUIvAxwmwr+Ivagsk1xtdjspHBqOrZrOkdff2BzAF1JpVFdx67B/u5U4rOEal2ccb ViXtR30mJAPNynlhju+k7/3dyPVQEp5YC32tMEFcRokar/42u6kHso4w9/Uc/Q97sSghS1 nlEcmoo07XFcHb6Wb0NTmcLQ2jBILcZOzkpYB74j0VqIC4dv1ivoYgkGTw2YQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A83B216331; Fri, 1 Apr 2022 14:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 231EenQ2031907; Fri, 1 Apr 2022 14:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231EenB0031906; Fri, 1 Apr 2022 14:40:49 GMT (envelope-from git) Date: Fri, 1 Apr 2022 14:40:49 GMT Message-Id: <202204011440.231EenB0031906@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 7784bff647af - main - =?utf-8?Q?graphics/nvidia-texture-tools: update 2.1.1 =E2=86=92 2.1.2?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7784bff647afcc6e49154cb6e909631a464e3cd0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/cZFsiStUeBi/QTlp6AAShzK2jU2QpW8IYHu+umOjA=; b=vsApkkDcTIOWDCDsFu221OM21bIlxmCh+gzWu26SUlda6cQKcFT+oSunRfNrRZim41d5ll ukmRw47d86kHfMj5yUS0CiptXt6KRsc4D7t0evpWhpMx2BZDsaUsqZPjby1EtKz9+zqz7i /mJZyzCT7/WzVgWSkQBBt8B7CVrl7d5rkiD7Z3fmOaW5TOicGWRrnEbEX5Nkdtyv0oiTDt HcNzKwfVU/MpIdB2alG0ddSa3GTeLxvnfBFwD7p2svDwAnaACGO+ofL2rS8d0F1Sn4pbV1 mHtv+Geou3u9ttgJO4VONvJ8cm76ifGuQPV0cPJRB923RbtWFxle9g9DVrfNug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648824050; a=rsa-sha256; cv=none; b=wKkuBfO+JPGON5GN0HCtFx1x+jxvhwkSPivFlHCdxIIuyNR7AkX3M2QauFHQrQm2HP5vI/ g+7nmgfMJ6xzzh+bidIg5Mxn2EkiW5Y5lG/3hjTiooy2PJ8Pxp0/agJijuH9xco3bntGgN kY2tUxNVq8SJMieWaPZvkNo6KQ5qvzkETOGzi9UPUVnInHwMxymede35wlBUdKIo5hhDf1 DrilDg6h1HerxyEG2TGj3WAskNig5G3Cq3mUKAnfxLMgkCxBi/ZyzPOm7xMHLaHBZghwYm kNL7Ob+0vwAGg7EcoZ0wZVH9tCKEwropib1Jggg27iOc2DGJ29M/16ZHaQ2VIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7784bff647afcc6e49154cb6e909631a464e3cd0 commit 7784bff647afcc6e49154cb6e909631a464e3cd0 Author: Dmitry Marakasov AuthorDate: 2022-04-01 13:56:04 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-01 14:37:34 +0000 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. --- graphics/nvidia-texture-tools/Makefile | 9 ++++++--- graphics/nvidia-texture-tools/distinfo | 6 +++--- .../nvidia-texture-tools/files/patch-CMakeLists.txt | 21 +++++---------------- .../files/patch-cmake_OptimalOptions.cmake | 10 ++++++++++ .../files/patch-extern_CMakeLists.txt | 10 ++++++++++ .../files/patch-src_nvmath_CMakeLists.txt | 11 +++++++++++ .../files/patch-src_nvmath_Matrix.cpp | 11 +++++++++++ graphics/nvidia-texture-tools/pkg-plist | 2 ++ 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 + +-#if !NV_CC_MSVC && !NV_OS_ORBIS ++#if !NV_CC_MSVC && !NV_OS_ORBIS && !NV_OS_FREEBSD + #include + #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