From nobody Fri Dec 01 08:56:58 2023 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 4ShRky4fhKz52J9f; Fri, 1 Dec 2023 08:56:58 +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 4ShRky3pCrz4L5v; Fri, 1 Dec 2023 08:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701421018; 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=GJo4KI4jSI10D4j9lUrcWSBUXNIM/k3Xz/wj/rYeVvg=; b=JlIbD87BpAN+iIwcsJyv9YJFhly11/6ONkL6lAYcgA2mIxz0M/+BaBsJNbVVeMLKTL6aGz 2FwWucqNo2obga68rqqpi2ZYh64h9N34yNQOnCquC1VYDuM59KfikJ5n+E/+Vbai2YaZZm MqAqjRrHslfSlP37oHwvhcegxI7Hp/nmTjUpmJmbl+H3bbUS94qnflEBUQ2SYsYE6EZ1rP n4GFgSgKGStRjeceUDWwL2QUBuOc5lU9Q/KuBRvfyztXKbZq947ajqLfl92CsOwVECJ9WJ jR806OTjtrZNVVsWD3X9tOVp9TxXIMGeBPKb161Zgqg8J1cEV07y4OdLwavJXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701421018; 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=GJo4KI4jSI10D4j9lUrcWSBUXNIM/k3Xz/wj/rYeVvg=; b=vtri2hX2uC3WQPTk6M9uhTUFpg0X9UvuWoHtiv0/SjS6tNE7yMImZBfz+T3e5FypHFLw8w k3X3TPRG17JaeDSjlY9Drxfu/anf4AJdvRwAzYDZjRcaDjTdiMWJAbpfJSTOATSxm2y6+F Ws/bilfEabA3q9o3lXxO07ujnzR2WZeHnFA4t/xbydV27QJ9QSjnZlxSaTUlxkeHuxECxb 8ijtUM7xKg2tx+CpB0ImuCr1SCn8AFo2n70X8pzuUro6pQZDR3g00dlQmcJ4AgoaLeKeu5 ipnJAnP+cZHReWdPRy88+Z2x6vwn8E4KCLhvae5Ndau0axLvfE1V/UIvNxOWuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701421018; a=rsa-sha256; cv=none; b=Oa0eD6C3V/A80vVGa9/XPHbYOQsVmo1HedW8Uv5b+jqsJ98+hIpv+tI+rJQuKF7oU+1rsq SbE7/gLwY802R8tSIkRFbJ/CwR0VpJLph6Q91l9O1L+f3tOL54w/If1yeKXfpYoN0SMJys Jd6rvwVcZIWFwRGQ48C+VXGKske4KvKl2sAMUEKY+Gx1zAoRCeWY0aji79p202wddx9BEM 6N3T6YDF2Pxs+vp4Xbang6V4CdupsdWT9MBERgqz8YPR5uzFBCI1ZqsZ8wZ0cyLIGltV9L +44vAUHMDzTRDjn8hbn9hp1cTQzqe/kE+o7E0Z+xGApbKU0Q1XEYhTiC71RwVQ== 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 4ShRky2qv5zCGL; Fri, 1 Dec 2023 08:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B18uwQS093330; Fri, 1 Dec 2023 08:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B18uwc5093327; Fri, 1 Dec 2023 08:56:58 GMT (envelope-from git) Date: Fri, 1 Dec 2023 08:56:58 GMT Message-Id: <202312010856.3B18uwc5093327@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: 7eb506d8b294 - main - graphics/opencoloriov1: unbreak the port's build in C++17 mode 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb506d8b2947349eeb9ce9c74be3382c02f1f9b Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=7eb506d8b2947349eeb9ce9c74be3382c02f1f9b commit 7eb506d8b2947349eeb9ce9c74be3382c02f1f9b Author: Alexey Dokuchaev AuthorDate: 2023-12-01 08:56:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-12-01 08:56:04 +0000 graphics/opencoloriov1: unbreak the port's build in C++17 mode While here, expand COMMENT, drop `localbase:ldflags' from USES, tight up the `post-install' recipe (trim some useless commands, wrap overly long lines), pacify stage Q/A report. Reported by: pkg-fallout --- graphics/opencoloriov1/Makefile | 25 ++++++++++++---------- graphics/opencoloriov1/files/patch-CMakeLists.txt | 9 ++++++++ .../files/patch-src_core_CMakeLists.txt | 5 +++-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/graphics/opencoloriov1/Makefile b/graphics/opencoloriov1/Makefile index a3158ed40ee1..35dd8259edad 100644 --- a/graphics/opencoloriov1/Makefile +++ b/graphics/opencoloriov1/Makefile @@ -5,7 +5,7 @@ CATEGORIES= graphics multimedia PKGNAMESUFFIX= v1 MAINTAINER= danfe@FreeBSD.org -COMMENT= Complete color management solution v1 +COMMENT= Complete color management solution (legacy version) WWW= https://opencolorio.org/ LICENSE= BSD3CLAUSE @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libyaml-cpp.so:devel/yaml-cpp -USES= alias cmake compiler:c++11-lang localbase:ldflags pkgconfig \ +USES= alias cmake compiler:c++11-lang pkgconfig \ python:build shebangfix USE_GITHUB= yes @@ -42,16 +42,19 @@ CMAKE_ON+= OCIO_USE_SSE CMAKE_OFF+= OCIO_USE_SSE .endif +post-patch: + @${REINPLACE_CMD} -e 's| : std::binary_function.*||' \ + ${WRKSRC}/src/core/PathUtils.h + post-install: - ${RM} -R ${STAGEDIR}/${PREFIX}/share/ocio - # add v1 suffix - ${REINPLACE_CMD} -e 's| diff --git a/graphics/opencoloriov1/files/patch-CMakeLists.txt b/graphics/opencoloriov1/files/patch-CMakeLists.txt index 8f6a7aab459a..c1a16d9e200c 100644 --- a/graphics/opencoloriov1/files/patch-CMakeLists.txt +++ b/graphics/opencoloriov1/files/patch-CMakeLists.txt @@ -9,6 +9,15 @@ # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. # Don't bother doing this step if we are already including the boost headers for shared_ptr if(NOT OCIO_USE_BOOST_PTR) +@@ -384,7 +384,7 @@ else() + set(OCIO_INLINES_HIDDEN OFF) + endif() + +-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}") ++set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}") + + set(EXTERNAL_LINK_FLAGS "") + set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib) @@ -531,8 +531,6 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY) diff --git a/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt b/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt index 34588903eba0..047e0a79cab7 100644 --- a/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt +++ b/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt @@ -1,4 +1,4 @@ ---- src/core/CMakeLists.txt.orig 2021-12-07 20:11:03 UTC +--- src/core/CMakeLists.txt.orig 2019-03-28 05:12:57 UTC +++ src/core/CMakeLists.txt @@ -56,7 +56,7 @@ if(OCIO_BUILD_SHARED) endif() @@ -22,6 +22,7 @@ configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc +- DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/) + ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIOv1.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIOv1.pc - DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/) ++ DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)