Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 58A3E852BF for ; Tue, 7 Nov 2023 17:56:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 2oZ-uF_bfDGd for ; Tue, 7 Nov 2023 17:56:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 58ADF852B3 for ; Tue, 7 Nov 2023 17:56:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4CCBCFA2D; Tue, 7 Nov 2023 17:56:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169937981691870" MIME-Version: 1.0 Date: Tue, 7 Nov 2023 17:56:56 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/graphics/ptex To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20231107175656.4CCBCFA2D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169937981691870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Tue Nov 7 17:56:56 UTC 2023 Modified Files: pkgsrc/graphics/ptex: Makefile PLIST buildlink3.mk distinfo pkgsrc/graphics/ptex/patches: patch-src_ptex_PtexPlatform.h patch-src_ptex_PtexWriter.cpp Added Files: pkgsrc/graphics/ptex/patches: patch-CMakeLists.txt patch-src_ptex_CMakeLists.txt Log Message: Update graphics/ptex to version 2.4.2 Pkgsrc changes: Use CMake to check for alloca.h . Include zlib and pthread in buildlink3.mk since the are interface linked in the exported cmake targets. Changes: Export cmake targets to cmake users. Use newer spinlock API:s on MacOSX. Use soname versioning. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/ptex/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/ptex/PLIST \ pkgsrc/graphics/ptex/buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/ptex/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/ptex/patches/patch-CMakeLists.txt \ pkgsrc/graphics/ptex/patches/patch-src_ptex_CMakeLists.txt cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexPlatform.h \ pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexWriter.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169937981691870 Content-Disposition: inline Content-Length: 7900 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/ptex/Makefile diff -u pkgsrc/graphics/ptex/Makefile:1.3 pkgsrc/graphics/ptex/Makefile:1.4 --- pkgsrc/graphics/ptex/Makefile:1.3 Wed Aug 2 19:27:31 2023 +++ pkgsrc/graphics/ptex/Makefile Tue Nov 7 17:56:55 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2023/08/02 19:27:31 nia Exp $ +# $NetBSD: Makefile,v 1.4 2023/11/07 17:56:55 nros Exp $ -DISTNAME= ptex-2.1.28 +DISTNAME= ptex-2.4.2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=wdas/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -10,15 +10,17 @@ HOMEPAGE= http://ptex.us/ COMMENT= Per-Face Texture Mapping for Production Rendering LICENSE= modified-bsd # with slightly changes spelling -USE_CMAKE= yes USE_LANGUAGES= c c++ +CMAKE_CONFIGURE_ARGS+= -DPTEX_SHA=${PKGVERSION_NOREV} +CMAKE_CONFIGURE_ARGS+= -DPTEX_VER=${PKGVERSION_NOREV} + TEST_TARGET= test TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/src/ptex/ -# Uses alloca, cannot use standard C++ on NetBSD. -FORCE_CXX_STD= gnu++03 +.include "../../devel/cmake/build.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/ptex/PLIST diff -u pkgsrc/graphics/ptex/PLIST:1.1 pkgsrc/graphics/ptex/PLIST:1.2 --- pkgsrc/graphics/ptex/PLIST:1.1 Tue Oct 18 02:47:16 2016 +++ pkgsrc/graphics/ptex/PLIST Tue Nov 7 17:56:55 2023 @@ -1,9 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1 2016/10/18 02:47:16 kamil Exp $ +@comment $NetBSD: PLIST,v 1.2 2023/11/07 17:56:55 nros Exp $ bin/ptxinfo +include/PtexExports.h include/PtexHalf.h include/PtexInt.h +include/PtexPlatform.h include/PtexUtils.h include/PtexVersion.h include/Ptexture.h lib/libPtex.a lib/libPtex.so +lib/libPtex.so.2.4 +share/cmake/Ptex/ptex-config-version.cmake +share/cmake/Ptex/ptex-config.cmake +share/cmake/Ptex/ptex-exports-release.cmake +share/cmake/Ptex/ptex-exports.cmake Index: pkgsrc/graphics/ptex/buildlink3.mk diff -u pkgsrc/graphics/ptex/buildlink3.mk:1.1 pkgsrc/graphics/ptex/buildlink3.mk:1.2 --- pkgsrc/graphics/ptex/buildlink3.mk:1.1 Tue Oct 18 02:47:16 2016 +++ pkgsrc/graphics/ptex/buildlink3.mk Tue Nov 7 17:56:55 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/10/18 02:47:16 kamil Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2023/11/07 17:56:55 nros Exp $ BUILDLINK_TREE+= ptex @@ -6,7 +6,11 @@ BUILDLINK_TREE+= ptex PTEX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ptex+= ptex>=2.1.28 +BUILDLINK_ABI_DEPENDS.ptex+= ptex>=2.4.2 BUILDLINK_PKGSRCDIR.ptex?= ../../graphics/ptex + +.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .endif # PTEX_BUILDLINK3_MK BUILDLINK_TREE+= -ptex Index: pkgsrc/graphics/ptex/distinfo diff -u pkgsrc/graphics/ptex/distinfo:1.4 pkgsrc/graphics/ptex/distinfo:1.5 --- pkgsrc/graphics/ptex/distinfo:1.4 Tue Oct 26 10:46:43 2021 +++ pkgsrc/graphics/ptex/distinfo Tue Nov 7 17:56:55 2023 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 10:46:43 nia Exp $ +$NetBSD: distinfo,v 1.5 2023/11/07 17:56:55 nros Exp $ -BLAKE2s (ptex-2.1.28.tar.gz) = ab9e3218d18d3df658cdd845d0d16028795ee34de9018fde5c6d0e14652e9907 -SHA512 (ptex-2.1.28.tar.gz) = ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8 -Size (ptex-2.1.28.tar.gz) = 305327 bytes -SHA1 (patch-src_ptex_PtexPlatform.h) = f3c859f62b3f4ef0b0274939c522c735681fb70e -SHA1 (patch-src_ptex_PtexWriter.cpp) = 2340782b4f70da421134631b625c5b20d133d809 +BLAKE2s (ptex-2.4.2.tar.gz) = 87c646d8a875a4c4b7af1f0a5066fe8ab9838f1aabe41f3e5efb14ddf6724a1b +SHA512 (ptex-2.4.2.tar.gz) = 3b9607b7803e7c857bb00a6d4d8bbe108810c622a3593fb5d655183f3e6689f274ee5e79bcaab6928de38daf05cf25eb56125f39477f134131a8ad45071551b3 +Size (ptex-2.4.2.tar.gz) = 312942 bytes +SHA1 (patch-CMakeLists.txt) = d4bec23f0cd8ede9935829bd9c1ea565c3ec070c +SHA1 (patch-src_ptex_CMakeLists.txt) = 0bc6395b6dbebb417972ada727fb6af4f4ae6b3d +SHA1 (patch-src_ptex_PtexPlatform.h) = 8bbdeffb3afc18824b2d4991cdb561cc9b17ddc6 +SHA1 (patch-src_ptex_PtexWriter.cpp) = 1d4c30f9a30b3428f02d6cbed82cfa73042faee1 Index: pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexPlatform.h diff -u pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexPlatform.h:1.1 pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexPlatform.h:1.2 --- pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexPlatform.h:1.1 Tue Oct 18 02:47:17 2016 +++ pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexPlatform.h Tue Nov 7 17:56:56 2023 @@ -1,16 +1,17 @@ -$NetBSD: patch-src_ptex_PtexPlatform.h,v 1.1 2016/10/18 02:47:17 kamil Exp $ +$NetBSD: patch-src_ptex_PtexPlatform.h,v 1.2 2023/11/07 17:56:56 nros Exp $ The alloca(3) function is an extension and place of its definition varies. The header is required on SunOS and acceptable on other systems, but -unavailable on NetBSD. +unavailable on NetBSD so use CMake to test for it. + is not needed when using Ptex. ---- src/ptex/PtexPlatform.h.orig 2016-04-04 17:14:05.000000000 +0000 +--- src/ptex/PtexPlatform.h.orig 2022-08-05 02:02:51.000000000 +0000 +++ src/ptex/PtexPlatform.h -@@ -62,7 +62,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE +@@ -70,7 +70,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE // linux/unix/posix #include -+#if !defined(__NetBSD__) ++#if defined(PTEX_HAVE_ALLOCA_H) #include +#endif #include Index: pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexWriter.cpp diff -u pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexWriter.cpp:1.1 pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexWriter.cpp:1.2 --- pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexWriter.cpp:1.1 Wed Feb 15 00:54:50 2017 +++ pkgsrc/graphics/ptex/patches/patch-src_ptex_PtexWriter.cpp Tue Nov 7 17:56:56 2023 @@ -1,4 +1,6 @@ -$NetBSD: patch-src_ptex_PtexWriter.cpp,v 1.1 2017/02/15 00:54:50 joerg Exp $ +$NetBSD: patch-src_ptex_PtexWriter.cpp,v 1.2 2023/11/07 17:56:56 nros Exp $ + +unistd.h needed for declaration of unlink --- src/ptex/PtexWriter.cpp.orig 2017-02-15 00:33:54.858207702 +0000 +++ src/ptex/PtexWriter.cpp Added files: Index: pkgsrc/graphics/ptex/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/graphics/ptex/patches/patch-CMakeLists.txt:1.1 --- /dev/null Tue Nov 7 17:56:56 2023 +++ pkgsrc/graphics/ptex/patches/patch-CMakeLists.txt Tue Nov 7 17:56:56 2023 @@ -0,0 +1,23 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2023/11/07 17:56:56 nros Exp $ + +Use extentions for alloca on NetBSD. +Don't build docs. + +--- CMakeLists.txt.orig 2022-08-05 02:02:51.000000000 +0000 ++++ CMakeLists.txt +@@ -16,7 +16,7 @@ if (NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 98) + endif () + endif() +-set(CMAKE_CXX_EXTENSIONS OFF) ++set(CMAKE_CXX_EXTENSIONS ON) + set(CMAKE_CXX_VISIBILITY_PRESET hidden) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON) +@@ -114,5 +114,5 @@ include_directories(src/ptex) + add_subdirectory(src/ptex) + add_subdirectory(src/utils) + add_subdirectory(src/tests) +-add_subdirectory(src/doc) ++#add_subdirectory(src/doc) + add_subdirectory(src/build) Index: pkgsrc/graphics/ptex/patches/patch-src_ptex_CMakeLists.txt diff -u /dev/null pkgsrc/graphics/ptex/patches/patch-src_ptex_CMakeLists.txt:1.1 --- /dev/null Tue Nov 7 17:56:56 2023 +++ pkgsrc/graphics/ptex/patches/patch-src_ptex_CMakeLists.txt Tue Nov 7 17:56:56 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_ptex_CMakeLists.txt,v 1.1 2023/11/07 17:56:56 nros Exp $ + +alloca.h is non standard, check if it can be included + +--- src/ptex/CMakeLists.txt.orig 2022-08-05 02:02:51.000000000 +0000 ++++ src/ptex/CMakeLists.txt +@@ -1,3 +1,9 @@ ++include(CheckIncludeFileCXX) ++check_include_file_cxx("alloca.h" HAVE_ALLOCA_H) ++if(HAVE_ALLOCA_H) ++add_compile_definitions(PTEX_HAVE_ALLOCA_H) ++endif() ++ + configure_file(PtexVersion.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/PtexVersion.h @ONLY) + --_----------=_169937981691870--