From nobody Sun Jul 28 05:31:27 2024 X-Original-To: dev-commits-ports-main@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 4WWqq33Hzpz5RTP7; Sun, 28 Jul 2024 05:31:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WWqq31fkHz4rSh; Sun, 28 Jul 2024 05:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722144687; 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=2gSpKN/4XqeUBUUC54ImCm+XFnUT6EuU6J6VHLDvwAM=; b=P0WIUbCH/raldJDg36WyGqgrTJmwTEiLw6VlAVJJR6zUgpTweSbmml2LjpI7BgWMCYmXiG Okurl8b8yAjdCiMGgp0D/7Pdvd+NGWbKSVqTG5qQK/YczRZ9rEA7tj+rq4daEOB7cdD/3S /KxEyRNDLcMuvzKzQdk7iFuy57nWX/R7rRknIk3bOT+RCd2oxYUCZLXlYxLJc7pfcD6R+j zAj9KCoZQWmwg5l+gfMHvgy5s3KG+5XStMEojdovTq+dazscGYIw341f3hfQTNf/WwASYu duurkzsSdUIILQwKZup6pDPI3DJiYJ+JoI4QLPopdr5INSzN8SjJW1usGCMV+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722144687; a=rsa-sha256; cv=none; b=IYhVVkSxM2puQLh3IgJecd5IAS2Qt+M0RXoThUaF7Fr6ommfKYIhzubnTyYosdRR27D9nq ETpfvXEemGGODa3njfbrMlu/7A9JTICzueNaiepGxBuV5OSuMGYe1/gtIpYhA/n865QGd2 XuvUZMFGGVVitxfz0MPUHajtOR5I4WMqnlLwtkMNoHRMo2MSJ0aSK7KV7WyNbV9aUNhVbm p/h55NusGMblHIu22LY0IZ9zVB2LdBuFPeppHfnVLpykrQG6vPg3EVyDtnCHFZRsFMbrN9 WWY2shuF0n16DBpgoHYVBDuz+474yyvsh0UHaW3EDtj3naPXVvYGGqMaXwnLog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722144687; 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=2gSpKN/4XqeUBUUC54ImCm+XFnUT6EuU6J6VHLDvwAM=; b=uOc/yg3+7tWkPsA7r2+mJI4ni8PsK+5/YcZAE377+mz/jnWfrMZOhN73EpY7sjaNWRowbH wcG/aDfcKbPWHRD4pZB+H2Y+4J/4MFVyMpmTM6cnL5XaAdn9uLy0aaMBeO1D35a76AMHoH 0ezuSmSGESlwYQlKR+tkkoUtYj5AbJlr3AuByPXVLwO8Gnebz37IZCTcgSbXcz7Gk0AYWP WRtEA7WsPr/HZb0WaKsYctKEwuz7kKJOq3H1pfSvpQpOdldynwyGtFe62lrhV6l/Ehnoqh kxb3A5hZDryWlWC8inbFgchcMYXHx4mqjASgjgzg3pxnahh2cXOE7IaW24XBZw== 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 4WWqq31G6KzdWk; Sun, 28 Jul 2024 05:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46S5VRFD041714; Sun, 28 Jul 2024 05:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46S5VRhZ041711; Sun, 28 Jul 2024 05:31:27 GMT (envelope-from git) Date: Sun, 28 Jul 2024 05:31:27 GMT Message-Id: <202407280531.46S5VRhZ041711@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 9dbff489d9bb - main - graphics/appleseed: try to unbreak and slightly improve the port (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dbff489d9bb402d2fc5ef3a38a97f36ea7bb9ab Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9dbff489d9bb402d2fc5ef3a38a97f36ea7bb9ab commit 9dbff489d9bb402d2fc5ef3a38a97f36ea7bb9ab Author: Alexey Dokuchaev AuthorDate: 2024-07-28 05:29:50 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-07-28 05:29:50 +0000 graphics/appleseed: try to unbreak and slightly improve the port (+) Pull the patch from the Arch/AUR package to unbreak the build against OSL version 1.13.7 and later. While here, cleanup Imath 3.x support: drop actually useless patch and fix detection logic in the right file instead of polluting global CFLAGS and using naive search heuristics. Nagged by: pkg-fallout (after commit cfcb40e24056) --- graphics/appleseed/Makefile | 12 ++++++------ graphics/appleseed/distinfo | 2 ++ graphics/appleseed/files/patch-CMakeLists.txt | 16 +++++++++++++--- .../patch-sandbox_share_cmake_Modules_FindImath.cmake | 14 -------------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile index 3c8864ec92f1..bc3fef5bd010 100644 --- a/graphics/appleseed/Makefile +++ b/graphics/appleseed/Makefile @@ -3,6 +3,9 @@ DISTVERSION= 2.1.0-beta PORTREVISION= 14 CATEGORIES= graphics +PATCH_SITES= http://vault.101011010.xyz/distfiles/ LOCAL/danfe +PATCHFILES= OSL-01.13.7.patch:-p1 + MAINTAINER= danfe@FreeBSD.org COMMENT= Modern, physically-based production renderer WWW= https://appleseedhq.net/ @@ -29,9 +32,6 @@ ONLY_FOR_ARCHS_REASON= not ported to it yet USES= cmake compiler:c++11-lang shebangfix SHEBANG_FILES= scripts/*.py -CFLAGS+= -I${LOCALBASE}/include/Imath -CFLAGS+= -I${LOCALBASE}/include/OpenEXR - CMAKE_ARGS= -DWITH_PYTHON2_BINDINGS:BOOL=OFF \ -DWITH_DOXYGEN:BOOL=OFF \ -DINSTALL_HEADERS:BOOL=OFF \ @@ -72,9 +72,9 @@ STUDIO_IMPLIES= PYTHON post-patch: @${RMDIR} ${WRKSRC}/sandbox/docs/api @${RM} ${WRKSRC}/sandbox/share/cmake/Modules/FindOpenImageIO.cmake - ${REINPLACE_CMD} 's,OpenEXR/Imath,Imath/Imath,' \ - ${WRKSRC}/sandbox/share/cmake/Modules/FindImath.cmake \ - ${WRKSRC}/src/appleseed/foundation/meta/tests/test_quaternion.cpp \ + @${REINPLACE_CMD} -e 's,OpenEXR,Imath, ; /[ {]IMATH_HALF_LIBRARY/d' \ + ${WRKSRC}/cmake/modules/FindImath.cmake + @${REINPLACE_CMD} -e 's,OpenEXR/Imath,Imath/Imath,' \ ${WRKSRC}/src/appleseed/foundation/meta/tests/test_matrix.cpp \ ${WRKSRC}/src/appleseed/foundation/meta/tests/test_quaternion.cpp \ ${WRKSRC}/src/appleseed/foundation/meta/tests/test_vector.cpp \ diff --git a/graphics/appleseed/distinfo b/graphics/appleseed/distinfo index 0cce5a17b714..60408ec4dddb 100644 --- a/graphics/appleseed/distinfo +++ b/graphics/appleseed/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1567266541 SHA256 (appleseedhq-appleseed-2.1.0-beta_GH0.tar.gz) = 5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898 SIZE (appleseedhq-appleseed-2.1.0-beta_GH0.tar.gz) = 203650426 +SHA256 (OSL-01.13.7.patch) = 1c6f597dfb314f059953a2efba32dd19be07a5a815a0982fa62775081ef0d28d +SIZE (OSL-01.13.7.patch) = 19461 diff --git a/graphics/appleseed/files/patch-CMakeLists.txt b/graphics/appleseed/files/patch-CMakeLists.txt index b83bc2c3d408..793cad65f13f 100644 --- a/graphics/appleseed/files/patch-CMakeLists.txt +++ b/graphics/appleseed/files/patch-CMakeLists.txt @@ -1,6 +1,16 @@ --- CMakeLists.txt.orig 2019-08-31 15:49:01 UTC +++ CMakeLists.txt -@@ -681,8 +681,8 @@ if (WITH_PYTHON2_BINDINGS OR WITH_PYTHON3_BINDINGS) +@@ -356,9 +356,7 @@ endif () + if (USE_FIND_PACKAGE_FOR_EXR) + include_directories ( + ${IMATH_INCLUDE_DIRS} +- ${IMATH_INCLUDE_DIRS}/OpenEXR/ + ${OPENEXR_INCLUDE_DIRS} +- ${OPENEXR_INCLUDE_DIRS}/OpenEXR/ + ) + else () + include_directories ( +@@ -681,8 +679,8 @@ if (WITH_PYTHON2_BINDINGS OR WITH_PYTHON3_BINDINGS) endif () if (WITH_STUDIO) @@ -11,7 +21,7 @@ endif () add_subdirectory (src/appleseed.studio) endif () -@@ -732,15 +732,27 @@ install ( +@@ -732,15 +730,27 @@ install ( sandbox/share sandbox/stylesheets DESTINATION . @@ -40,7 +50,7 @@ ${OSL_COMPILER} ${OSL_QUERY_INFO} ${OSL_MAKETX} -@@ -754,11 +766,6 @@ install ( +@@ -754,11 +764,6 @@ install ( sandbox/schemas/settings.xsd sandbox/schemas/project.xsd DESTINATION schemas diff --git a/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake b/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake deleted file mode 100644 index e5f8652b64bc..000000000000 --- a/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- sandbox/share/cmake/Modules/FindImath.cmake.orig 2019-08-31 15:49:01 UTC -+++ sandbox/share/cmake/Modules/FindImath.cmake -@@ -39,10 +39,8 @@ - - include (FindPackageHandleStandardArgs) - --find_path (IMATH_INCLUDE_DIR NAMES OpenEXR/ImathVec.h) -+find_path (IMATH_INCLUDE_DIR NAMES Imath/ImathVec.h) - --find_library (IMATH_HALF_LIBRARY NAMES Half) --find_library (IMATH_IEX_LIBRARY NAMES Iex) - find_library (IMATH_MATH_LIBRARY NAMES Imath) - - # Handle the QUIETLY and REQUIRED arguments and set IMATH_FOUND.