From 2acaa84d149de5c2e0c6b7512a73b9a3cae5fd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Tue, 28 Nov 2023 16:24:22 +0100 Subject: [PATCH] MacPorts update --- tools/MacPorts/devel/gnutls/Portfile | 8 +- tools/MacPorts/devel/gnutls/Portfile.orig | 8 +- tools/MacPorts/graphics/opencolorio/Portfile | 42 +--- .../graphics/opencolorio/Portfile.orig | 40 +--- .../graphics/opencolorio/Portfile.patch | 57 ++--- tools/MacPorts/lang/libomp/Portfile.orig | 10 +- tools/MacPorts/lang/libomp/Portfile.patch | 89 +++++++- tools/MacPorts/multimedia/ffmpeg/Portfile | 6 + .../MacPorts/multimedia/ffmpeg/Portfile.orig | 6 + .../ffmpeg/files/patch-texinfo-7.diff | 207 ++++++++++++++++++ tools/MacPorts/print/ghostscript/Portfile | 10 +- .../MacPorts/print/ghostscript/Portfile.orig | 10 +- 12 files changed, 353 insertions(+), 140 deletions(-) create mode 100644 tools/MacPorts/multimedia/ffmpeg/files/patch-texinfo-7.diff diff --git a/tools/MacPorts/devel/gnutls/Portfile b/tools/MacPorts/devel/gnutls/Portfile index 3467702d7..0f5376110 100644 --- a/tools/MacPorts/devel/gnutls/Portfile +++ b/tools/MacPorts/devel/gnutls/Portfile @@ -36,12 +36,12 @@ subport ${name} { subport ${name}-devel { conflicts ${name} - version 3.8.1 + version 3.8.2 revision 0 - checksums rmd160 d9a09dec344ec897e7abaf408ba93e25e91ca2ad \ - sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c \ - size 6447056 + checksums rmd160 94154bab53fef5b66365cb8ebd9caa616e3ed741 \ + sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 \ + size 6456540 patchfiles patch-lib-system-certs.c.diff } diff --git a/tools/MacPorts/devel/gnutls/Portfile.orig b/tools/MacPorts/devel/gnutls/Portfile.orig index b9b1c28c1..c2cce9f66 100644 --- a/tools/MacPorts/devel/gnutls/Portfile.orig +++ b/tools/MacPorts/devel/gnutls/Portfile.orig @@ -36,12 +36,12 @@ subport ${name} { subport ${name}-devel { conflicts ${name} - version 3.8.1 + version 3.8.2 revision 0 - checksums rmd160 d9a09dec344ec897e7abaf408ba93e25e91ca2ad \ - sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c \ - size 6447056 + checksums rmd160 94154bab53fef5b66365cb8ebd9caa616e3ed741 \ + sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 \ + size 6456540 patchfiles patch-lib-system-certs.c.diff } diff --git a/tools/MacPorts/graphics/opencolorio/Portfile b/tools/MacPorts/graphics/opencolorio/Portfile index d39a5c362..83517e932 100644 --- a/tools/MacPorts/graphics/opencolorio/Portfile +++ b/tools/MacPorts/graphics/opencolorio/Portfile @@ -87,7 +87,7 @@ if {${configure.build_arch} in [list ppc ppc64]} { # OpenColorIO intentially installs Python module in lib # see https://github.com/imageworks/OpenColorIO/blob/15e96c1f579d3640947a5fcb5ec831383cc3956e/src/pyglue/CMakeLists.txt#L85 -variant python27 description {Build the Python 2.7 bindings} conflicts python36 python37 python38 python39 python310 python311 { +variant python27 description {Build the Python 2.7 bindings} conflicts python38 python39 python310 python311 { depends_lib-append port:python27 port:py27-pybind11 configure.args-append \ -DOCIO_PYTHON_VERSION=2.7 \ @@ -101,35 +101,7 @@ variant python27 description {Build the Python 2.7 bindings} conflicts python36 } } -variant python36 description {Build the Python 3.6 bindings} conflicts python27 python37 python38 python39 python310 python311 { - depends_lib-append port:python36 port:py36-pybind11 - configure.args-append \ - -DOCIO_PYTHON_VERSION=3.6 \ - -DPYTHON=${prefix}/bin/python3.6 - post-destroot { - xinstall -d -m 0755 \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages - ln -s \ - ${prefix}/lib/python3.6/site-packages/PyOpenColorIO.so \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages/ - } -} - -variant python37 description {Build the Python 3.7 bindings} conflicts python27 python36 python38 python39 python310 python311 { - depends_lib-append port:python37 port:py37-pybind11 - configure.args-append \ - -DOCIO_PYTHON_VERSION=3.7 \ - -DPYTHON=${prefix}/bin/python3.7 - post-destroot { - xinstall -d -m 0755 \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages - ln -s \ - ${prefix}/lib/python3.7/site-packages/PyOpenColorIO.so \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages/ - } -} - -variant python38 description {Build the Python 3.8 bindings} conflicts python27 python36 python37 python39 python310 python311 { +variant python38 description {Build the Python 3.8 bindings} conflicts python27 python39 python310 python311 { depends_lib-append port:python38 port:py38-pybind11 configure.args-append \ -DOCIO_PYTHON_VERSION=3.8 \ @@ -143,7 +115,7 @@ variant python38 description {Build the Python 3.8 bindings} conflicts python27 } } -variant python39 description {Build the Python 3.9 bindings} conflicts python27 python36 python37 python38 python310 python311 { +variant python39 description {Build the Python 3.9 bindings} conflicts python27 python38 python310 python311 { depends_lib-append port:python39 port:py39-pybind11 configure.args-append \ -DOCIO_PYTHON_VERSION=3.9 \ @@ -157,7 +129,7 @@ variant python39 description {Build the Python 3.9 bindings} conflicts python27 } } -variant python310 description {Build the Python 3.10 bindings} conflicts python27 python36 python37 python38 python39 python311 { +variant python310 description {Build the Python 3.10 bindings} conflicts python27 python38 python39 python311 { depends_lib-append port:python310 port:py310-pybind11 configure.args-append \ -DOCIO_PYTHON_VERSION=3.10 \ @@ -172,7 +144,7 @@ variant python310 description {Build the Python 3.10 bindings} conflicts python2 } -variant python311 description {Build the Python 3.11 bindings} conflicts python27 python36 python37 python38 python39 python310 { +variant python311 description {Build the Python 3.11 bindings} conflicts python27 python38 python39 python310 { depends_lib-append port:python311 port:py311-pybind11 configure.args-append \ -DOCIO_PYTHON_VERSION=3.11 \ @@ -186,11 +158,11 @@ variant python311 description {Build the Python 3.11 bindings} conflicts python2 } } -if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { +if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { default_variants +python311 } -if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { +if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { configure.args-append \ -DOCIO_BUILD_PYTHON=OFF \ -DOCIO_BUILD_PYGLUE=OFF diff --git a/tools/MacPorts/graphics/opencolorio/Portfile.orig b/tools/MacPorts/graphics/opencolorio/Portfile.orig index da0f81d92..4aef71ac0 100644 --- a/tools/MacPorts/graphics/opencolorio/Portfile.orig +++ b/tools/MacPorts/graphics/opencolorio/Portfile.orig @@ -106,7 +106,7 @@ if {${configure.build_arch} in [list ppc ppc64]} { # OpenColorIO intentially installs Python module in lib # see https://github.com/imageworks/OpenColorIO/blob/15e96c1f579d3640947a5fcb5ec831383cc3956e/src/pyglue/CMakeLists.txt#L85 -variant python27 description {Build the Python 2.7 bindings} conflicts python36 python37 python38 python39 python310 python311 { +variant python27 description {Build the Python 2.7 bindings} conflicts python38 python39 python310 python311 { depends_lib-append port:python27 configure.args-append \ -DPYTHON=${prefix}/bin/python2.7 @@ -119,33 +119,7 @@ variant python27 description {Build the Python 2.7 bindings} conflicts python36 } } -variant python36 description {Build the Python 3.6 bindings} conflicts python27 python37 python38 python39 python310 python311 { - depends_lib-append port:python36 - configure.args-append \ - -DPYTHON=${prefix}/bin/python3.6 - post-destroot { - xinstall -d -m 0755 \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages - ln -s \ - ${prefix}/lib/python3.6/site-packages/PyOpenColorIO.so \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages/ - } -} - -variant python37 description {Build the Python 3.7 bindings} conflicts python27 python36 python38 python39 python310 python311 { - depends_lib-append port:python37 - configure.args-append \ - -DPYTHON=${prefix}/bin/python3.7 - post-destroot { - xinstall -d -m 0755 \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages - ln -s \ - ${prefix}/lib/python3.7/site-packages/PyOpenColorIO.so \ - ${destroot}${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7/site-packages/ - } -} - -variant python38 description {Build the Python 3.8 bindings} conflicts python27 python36 python37 python39 python310 python311 { +variant python38 description {Build the Python 3.8 bindings} conflicts python27 python39 python310 python311 { depends_lib-append port:python38 configure.args-append \ -DPYTHON=${prefix}/bin/python3.8 @@ -158,7 +132,7 @@ variant python38 description {Build the Python 3.8 bindings} conflicts python27 } } -variant python39 description {Build the Python 3.9 bindings} conflicts python27 python36 python37 python38 python310 python311 { +variant python39 description {Build the Python 3.9 bindings} conflicts python27 python38 python310 python311 { depends_lib-append port:python39 configure.args-append \ -DPYTHON=${prefix}/bin/python3.9 @@ -171,7 +145,7 @@ variant python39 description {Build the Python 3.9 bindings} conflicts python27 } } -variant python310 description {Build the Python 3.10 bindings} conflicts python27 python36 python37 python38 python39 python311 { +variant python310 description {Build the Python 3.10 bindings} conflicts python27 python38 python39 python311 { depends_lib-append port:python310 configure.args-append \ -DPYTHON=${prefix}/bin/python3.10 @@ -185,7 +159,7 @@ variant python310 description {Build the Python 3.10 bindings} conflicts python2 } -variant python311 description {Build the Python 3.11 bindings} conflicts python27 python36 python37 python38 python39 python310 { +variant python311 description {Build the Python 3.11 bindings} conflicts python27 python38 python39 python310 { depends_lib-append port:python311 configure.args-append \ -DPYTHON=${prefix}/bin/python3.11 @@ -198,11 +172,11 @@ variant python311 description {Build the Python 3.11 bindings} conflicts python2 } } -if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { +if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { default_variants +python311 } -if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { +if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { configure.args-append \ -DOCIO_BUILD_PYGLUE=OFF } diff --git a/tools/MacPorts/graphics/opencolorio/Portfile.patch b/tools/MacPorts/graphics/opencolorio/Portfile.patch index 7222366f9..1e0bb5992 100644 --- a/tools/MacPorts/graphics/opencolorio/Portfile.patch +++ b/tools/MacPorts/graphics/opencolorio/Portfile.patch @@ -1,5 +1,5 @@ ---- Portfile.orig 2023-08-29 21:57:17 -+++ Portfile 2023-08-29 21:58:24 +--- Portfile.orig 2023-11-28 15:59:17.000000000 +0100 ++++ Portfile 2023-11-28 16:02:49.000000000 +0100 @@ -7,7 +7,7 @@ boost.depends_type build @@ -22,7 +22,7 @@ # Exclude pre-releases from livecheck github.livecheck.regex {([0-9.]+)} -@@ -31,31 +31,9 @@ +@@ -31,30 +31,8 @@ configure.args-append \ -DCMAKE_CONFIGURATION_TYPES=MacPorts @@ -31,9 +31,7 @@ -if {${os.platform} eq "darwin" && ${os.major} < 20} { - github.setup AcademySoftwareFoundation OpenColorIO 1.1.1 v - revision 3 -+patchfiles-append \ -+ patch-OCIOZArchive.diff - +- - checksums rmd160 81534822cb8350e1b7ba171c91226de996494d02 \ - sha256 b7def3b5383c9b35dc9c0bdd26da74e2199c2b283d52bb84847aa307f70a0bc4 \ - size 13830493 @@ -52,10 +50,11 @@ - - livecheck.type none -} -- ++patchfiles-append \ ++ patch-OCIOZArchive.diff + # source assumes C++11 compiler compiler.cxx_standard 2011 - configure.cxxflags-append \ @@ -93,6 +71,9 @@ port:tinyxml @@ -69,7 +68,7 @@ @@ -107,8 +88,9 @@ # see https://github.com/imageworks/OpenColorIO/blob/15e96c1f579d3640947a5fcb5ec831383cc3956e/src/pyglue/CMakeLists.txt#L85 - variant python27 description {Build the Python 2.7 bindings} conflicts python36 python37 python38 python39 python310 python311 { + variant python27 description {Build the Python 2.7 bindings} conflicts python38 python39 python310 python311 { - depends_lib-append port:python27 + depends_lib-append port:python27 port:py27-pybind11 configure.args-append \ @@ -80,29 +79,7 @@ @@ -120,8 +102,9 @@ } - variant python36 description {Build the Python 3.6 bindings} conflicts python27 python37 python38 python39 python310 python311 { -- depends_lib-append port:python36 -+ depends_lib-append port:python36 port:py36-pybind11 - configure.args-append \ -+ -DOCIO_PYTHON_VERSION=3.6 \ - -DPYTHON=${prefix}/bin/python3.6 - post-destroot { - xinstall -d -m 0755 \ -@@ -133,8 +116,9 @@ - } - - variant python37 description {Build the Python 3.7 bindings} conflicts python27 python36 python38 python39 python310 python311 { -- depends_lib-append port:python37 -+ depends_lib-append port:python37 port:py37-pybind11 - configure.args-append \ -+ -DOCIO_PYTHON_VERSION=3.7 \ - -DPYTHON=${prefix}/bin/python3.7 - post-destroot { - xinstall -d -m 0755 \ -@@ -146,8 +130,9 @@ - } - - variant python38 description {Build the Python 3.8 bindings} conflicts python27 python36 python37 python39 python310 python311 { + variant python38 description {Build the Python 3.8 bindings} conflicts python27 python39 python310 python311 { - depends_lib-append port:python38 + depends_lib-append port:python38 port:py38-pybind11 configure.args-append \ @@ -110,10 +87,10 @@ -DPYTHON=${prefix}/bin/python3.8 post-destroot { xinstall -d -m 0755 \ -@@ -159,8 +144,9 @@ +@@ -133,8 +116,9 @@ } - variant python39 description {Build the Python 3.9 bindings} conflicts python27 python36 python37 python38 python310 python311 { + variant python39 description {Build the Python 3.9 bindings} conflicts python27 python38 python310 python311 { - depends_lib-append port:python39 + depends_lib-append port:python39 port:py39-pybind11 configure.args-append \ @@ -121,10 +98,10 @@ -DPYTHON=${prefix}/bin/python3.9 post-destroot { xinstall -d -m 0755 \ -@@ -172,8 +158,9 @@ +@@ -146,8 +130,9 @@ } - variant python310 description {Build the Python 3.10 bindings} conflicts python27 python36 python37 python38 python39 python311 { + variant python310 description {Build the Python 3.10 bindings} conflicts python27 python38 python39 python311 { - depends_lib-append port:python310 + depends_lib-append port:python310 port:py310-pybind11 configure.args-append \ @@ -132,10 +109,10 @@ -DPYTHON=${prefix}/bin/python3.10 post-destroot { xinstall -d -m 0755 \ -@@ -186,8 +173,9 @@ +@@ -160,8 +145,9 @@ - variant python311 description {Build the Python 3.11 bindings} conflicts python27 python36 python37 python38 python39 python310 { + variant python311 description {Build the Python 3.11 bindings} conflicts python27 python38 python39 python310 { - depends_lib-append port:python311 + depends_lib-append port:python311 port:py311-pybind11 configure.args-append \ @@ -143,9 +120,9 @@ -DPYTHON=${prefix}/bin/python3.11 post-destroot { xinstall -d -m 0755 \ -@@ -204,6 +192,7 @@ +@@ -178,6 +164,7 @@ - if {![variant_isset python27] && ![variant_isset python36] && ![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { + if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} { configure.args-append \ + -DOCIO_BUILD_PYTHON=OFF \ -DOCIO_BUILD_PYGLUE=OFF diff --git a/tools/MacPorts/lang/libomp/Portfile.orig b/tools/MacPorts/lang/libomp/Portfile.orig index 64a4e6f30..2fa916192 100644 --- a/tools/MacPorts/lang/libomp/Portfile.orig +++ b/tools/MacPorts/lang/libomp/Portfile.orig @@ -86,8 +86,14 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { worksrcdir openmp-${version}/final/runtime version 3.8.1 checksums rmd160 a41054068a127ef84610afef8090109078cb6c46 \ - sha256 4c46b5946fe9b2a701661746d11c7c85c51a7f18673194a7ebd2a43470948a34 + sha256 4c46b5946fe9b2a701661746d11c7c85c51a7f18673194a7ebd2a43470948a34 \ + size 5587986 set rtpath "./" + + # use cmake-bootstrap to minimize dependencies. + depends_build-replace \ + path:bin/cmake:cmake port:cmake-bootstrap + configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake } livecheck.type none } @@ -101,7 +107,7 @@ compiler.blacklist-append {clang < 500} *gcc* # https://trac.macports.org/ticket/68490# # Use clang-11-bootstrap on OSX10.11 and older if {${os.major} <= 15} { - compiler.blacklist-append clang *gcc* + configure.compiler.add_deps no depends_build-append port:clang-11-bootstrap depends_skip_archcheck-append clang-11-bootstrap pre-configure { diff --git a/tools/MacPorts/lang/libomp/Portfile.patch b/tools/MacPorts/lang/libomp/Portfile.patch index 7b318430a..8390d060c 100644 --- a/tools/MacPorts/lang/libomp/Portfile.patch +++ b/tools/MacPorts/lang/libomp/Portfile.patch @@ -1,5 +1,5 @@ ---- Portfile.orig 2023-10-31 09:50:26 -+++ Portfile 2023-10-31 09:50:26 +--- Portfile.orig 2023-11-28 15:57:54.000000000 +0100 ++++ Portfile 2023-11-04 17:46:40.000000000 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 @@ -18,7 +18,48 @@ components required to build an executing OpenMP\ program that are outside the compiler itself. \ This port works with MacPorts' clang-3.7+ (optionally \ -@@ -62,34 +62,40 @@ +@@ -29,30 +29,21 @@ + subport libomp-devel {} + + if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { +- +- version 17.0.3 +- revision 0 +- + if { ${subport} eq "libomp-devel" } { +- # Marked obsolete 10/25/2022 +- PortGroup obsolete 1.0 +- replaced_by libomp ++ version 11.1.0 ++ checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ ++ sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ ++ size 971628 ++ livecheck.regex {"llvmorg-([0-9.rc-]+)".*} + } else { ++ version 11.1.0 ++ checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ ++ sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ ++ size 971628 + livecheck.regex {"llvmorg-([0-9.]+)".*} + } + +- distname openmp-${version}.src +- distfiles ${distname}.tar.xz cmake-${version}.src.tar.xz +- +- checksums \ +- openmp-${version}.src.tar.xz \ +- rmd160 a79350f38202f4e9819373a433b1b19cef631eb2 \ +- sha256 e04172c067f256d06cd8112abb49bc65f4e1d986a4b49b36cd837dfee3cdd274 \ +- size 1273276 \ +- cmake-${version}.src.tar.xz \ +- rmd160 2f419efae4d3f8c9d87943cf1873031468a19bd7 \ +- sha256 54fc534f0da09088adbaa6c3bfc9899a500153b96e60c2fb9322a7aa37b1027a \ +- size 8712 ++ revision 0 + + if {${os.major} <= 12} { + # kmp_alloc.c includes but libc++ is not the default on +@@ -62,40 +53,40 @@ # Build requires std::atomic configure.cxxflags-append -std=c++11 @@ -65,8 +106,14 @@ - worksrcdir openmp-${version}/final/runtime - version 3.8.1 - checksums rmd160 a41054068a127ef84610afef8090109078cb6c46 \ -- sha256 4c46b5946fe9b2a701661746d11c7c85c51a7f18673194a7ebd2a43470948a34 +- sha256 4c46b5946fe9b2a701661746d11c7c85c51a7f18673194a7ebd2a43470948a34 \ +- size 5587986 - set rtpath "./" +- +- # use cmake-bootstrap to minimize dependencies. +- depends_build-replace \ +- path:bin/cmake:cmake port:cmake-bootstrap +- configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake + worksrcdir openmp-${version}/final/runtime + version 3.8.1 + checksums \ @@ -79,25 +126,43 @@ } depends_build-append port:perl5 -@@ -127,15 +133,9 @@ +@@ -104,18 +95,6 @@ + # According to documentation builds with clang >= 3.3 + compiler.blacklist-append {clang < 500} *gcc* + +-# https://trac.macports.org/ticket/68490# +-# Use clang-11-bootstrap on OSX10.11 and older +-if {${os.major} <= 15} { +- configure.compiler.add_deps no +- depends_build-append port:clang-11-bootstrap +- depends_skip_archcheck-append clang-11-bootstrap +- pre-configure { +- configure.cc ${prefix}/libexec/clang-11-bootstrap/bin/clang +- configure.cxx ${prefix}/libexec/clang-11-bootstrap/bin/clang++ +- } +-} +- + if {${os.major} <= 17} { + default_variants +universal + } +@@ -133,14 +112,8 @@ # With this, cmake sets the correct library name in the dylibs for the # final destination we move them to configure.args-append -DCMAKE_INSTALL_RPATH=${prefix}/lib/libomp \ - -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp -+ -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp \ -+ -DLIBOMP_OMPT_SUPPORT=FALSE - +- -if {${os.major} <= 10} { - set hnames {omp.h} - configure.args-append -DLIBOMP_OMPT_SUPPORT=FALSE -} else { - set hnames {omp-tools.h omp.h ompt.h} -} -- ++ -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp \ ++ -DLIBOMP_OMPT_SUPPORT=FALSE + variant top_level description \ "Install (links to) omp.h and libs into ${prefix}/(include|lib)" {} - -@@ -143,30 +143,22 @@ +@@ -149,30 +122,22 @@ # Patch tool for build with CMAKE_INSTALL_PREFIX reinplace "/bulk.*compatibility/s/s\+/s+.*/" \ ${rtpath}tools/check-depends.pl @@ -132,7 +197,7 @@ foreach p {libiomp5.dylib libomp.dylib libgomp.dylib} { system -W ${instdest}/lib/ \ "ln -s libomp/${p}" -@@ -174,8 +166,8 @@ +@@ -180,8 +145,8 @@ } set fpath ${worksrcpath}/${rtpath} diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile b/tools/MacPorts/multimedia/ffmpeg/Portfile index bd53a007b..e71491f41 100644 --- a/tools/MacPorts/multimedia/ffmpeg/Portfile +++ b/tools/MacPorts/multimedia/ffmpeg/Portfile @@ -121,6 +121,12 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff # Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135 patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.diff +# Patch for building docs with texinfo >= 7 +# https://trac.macports.org/ticket/68747 +# https://trac.ffmpeg.org/ticket/10636 +# Fixed via upstream commit: f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 +patchfiles-append patch-texinfo-7.diff + # enable auto configure of asm optimizations # requires Xcode 3.1 or better on Leopard minimum_xcodeversions {9 3.1} diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig index 4582698a0..0de8bcc2e 100644 --- a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig +++ b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig @@ -119,6 +119,12 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff # Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135 patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.diff +# Patch for building docs with texinfo >= 7 +# https://trac.macports.org/ticket/68747 +# https://trac.ffmpeg.org/ticket/10636 +# Fixed via upstream commit: f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 +patchfiles-append patch-texinfo-7.diff + # enable auto configure of asm optimizations # requires Xcode 3.1 or better on Leopard minimum_xcodeversions {9 3.1} diff --git a/tools/MacPorts/multimedia/ffmpeg/files/patch-texinfo-7.diff b/tools/MacPorts/multimedia/ffmpeg/files/patch-texinfo-7.diff new file mode 100644 index 000000000..8b8652ca2 --- /dev/null +++ b/tools/MacPorts/multimedia/ffmpeg/files/patch-texinfo-7.diff @@ -0,0 +1,207 @@ +Backported from the below upstream commit. + +From f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 Mon Sep 17 00:00:00 2001 +From: Frank Plowman +Date: Wed, 8 Nov 2023 07:55:18 +0000 +Subject: [PATCH 1/1] doc/html: support texinfo 7.0 + +Resolves trac ticket #10636 (http://trac.ffmpeg.org/ticket/10636). + +Texinfo 7.0, released in November 2022, changed the names of various +functions. Compiling docs with Texinfo 7.0 resulted in warnings and +improperly formatted documentation. More old names appear to have +been removed in Texinfo 7.1, released October 2023, which causes docs +compilation to fail. + +This commit addresses the issue by adding logic to switch between the old +and new function names depending on the Texinfo version. Texinfo 6.8 +produces identical documentation before and after the patch. + +CC +https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1938238.html +https://bugs.gentoo.org/916104 + +Signed-off-by: Frank Plowman +--- + doc/t2h.pm | 106 ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 85 insertions(+), 21 deletions(-) + +diff --git a/doc/t2h.pm b/doc/t2h.pm +index d07d974286..b7485e1f1e 100644 +--- doc/t2h.pm 2023-04-12 14:01:50 ++++ doc/t2h.pm 2023-11-21 13:32:35 +@@ -20,8 +20,45 @@ + # License along with FFmpeg; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ++# Texinfo 7.0 changed the syntax of various functions. ++# Provide a shim for older versions. ++sub ff_set_from_init_file($$) { ++ my $key = shift; ++ my $value = shift; ++ if (exists &{'texinfo_set_from_init_file'}) { ++ texinfo_set_from_init_file($key, $value); ++ } else { ++ set_from_init_file($key, $value); ++ } ++} ++ ++sub ff_get_conf($) { ++ my $key = shift; ++ if (exists &{'texinfo_get_conf'}) { ++ texinfo_get_conf($key); ++ } else { ++ get_conf($key); ++ } ++} ++ ++sub get_formatting_function($$) { ++ my $obj = shift; ++ my $func = shift; ++ ++ my $sub = $obj->can('formatting_function'); ++ if ($sub) { ++ return $obj->formatting_function($func); ++ } else { ++ return $obj->{$func}; ++ } ++} ++ ++# determine texinfo version ++my $program_version_num = version->declare(ff_get_conf('PACKAGE_VERSION'))->numify; ++my $program_version_6_8 = $program_version_num >= 6.008000; ++ + # no navigation elements +-set_from_init_file('HEADERS', 0); ++ff_set_from_init_file('HEADERS', 0); + + sub ffmpeg_heading_command($$$$$) + { +@@ -55,7 +92,7 @@ sub ffmpeg_heading_command($$$$$) + $element = $command->{'parent'}; + } + if ($element) { +- $result .= &{$self->{'format_element_header'}}($self, $cmdname, ++ $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname, + $command, $element); + } + +@@ -112,7 +149,11 @@ sub ffmpeg_heading_command($$$$$) + $cmdname + = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level]; + } +- $result .= &{$self->{'format_heading_text'}}( ++ # format_heading_text expects an array of headings for texinfo >= 7.0 ++ if ($program_version_num >= 7.000000) { ++ $heading = [$heading]; ++ } ++ $result .= &{get_formatting_function($self,'format_heading_text')}( + $self, $cmdname, $heading, + $heading_level + + $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command); +@@ -127,14 +168,14 @@ foreach my $command (keys(%Texinfo::Common::sectioning + } + + # print the TOC where @contents is used +-set_from_init_file('INLINE_CONTENTS', 1); ++ff_set_from_init_file('INLINE_CONTENTS', 1); + + # make chapters

+-set_from_init_file('CHAPTER_HEADER_LEVEL', 2); ++ff_set_from_init_file('CHAPTER_HEADER_LEVEL', 2); + + # Do not add
+-set_from_init_file('DEFAULT_RULE', ''); +-set_from_init_file('BIG_RULE', ''); ++ff_set_from_init_file('DEFAULT_RULE', ''); ++ff_set_from_init_file('BIG_RULE', ''); + + # Customized file beginning + sub ffmpeg_begin_file($$$) +@@ -151,7 +192,18 @@ sub ffmpeg_begin_file($$$) + my ($title, $description, $encoding, $date, $css_lines, + $doctype, $bodytext, $copying_comment, $after_body_open, + $extra_head, $program_and_version, $program_homepage, +- $program, $generator) = $self->_file_header_informations($command); ++ $program, $generator); ++ if ($program_version_num >= 7.000000) { ++ ($title, $description, $encoding, $date, $css_lines, ++ $doctype, $bodytext, $copying_comment, $after_body_open, ++ $extra_head, $program_and_version, $program_homepage, ++ $program, $generator) = $self->_file_header_information($command); ++ } else { ++ ($title, $description, $encoding, $date, $css_lines, ++ $doctype, $bodytext, $copying_comment, $after_body_open, ++ $extra_head, $program_and_version, $program_homepage, ++ $program, $generator) = $self->_file_header_informations($command); ++ } + + my $links = $self->_get_links ($filename, $element); + +@@ -207,7 +259,7 @@ sub ffmpeg_end_file($) + sub ffmpeg_end_file($) + { + my $self = shift; +- my $program_string = &{$self->{'format_program_string'}}($self); ++ my $program_string = &{get_formatting_function($self,'format_program_string')}($self); + my $program_text = < + $program_string +@@ -224,7 +276,7 @@ texinfo_register_formatting_function('end_file', \&ffm + + # Dummy title command + # Ignore title. Title is handled through ffmpeg_begin_file(). +-set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1); ++ff_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1); + sub ffmpeg_title($$$$) + { + return ''; +@@ -242,8 +294,14 @@ sub ffmpeg_float($$$$$) + my $args = shift; + my $content = shift; + +- my ($caption, $prepended) = Texinfo::Common::float_name_caption($self, +- $command); ++ my ($caption, $prepended); ++ if ($program_version_num >= 7.000000) { ++ ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self, ++ $command); ++ } else { ++ ($caption, $prepended) = Texinfo::Common::float_name_caption($self, ++ $command); ++ } + my $caption_text = ''; + my $prepended_text; + my $prepended_save = ''; +@@ -315,8 +373,13 @@ sub ffmpeg_float($$$$$) + $caption->{'args'}->[0], 'float caption'); + } + if ($prepended_text.$caption_text ne '') { +- $prepended_text = $self->_attribute_class('div','float-caption'). '>' +- . $prepended_text; ++ if ($program_version_num >= 7.000000) { ++ $prepended_text = $self->html_attribute_class('div',['float-caption']). '>' ++ . $prepended_text; ++ } else { ++ $prepended_text = $self->_attribute_class('div','float-caption'). '>' ++ . $prepended_text; ++ } + $caption_text .= ''; + } + my $html_class = ''; +@@ -329,8 +392,13 @@ sub ffmpeg_float($$$$$) + $prepended_text = ''; + $caption_text = ''; + } +- return $self->_attribute_class('div', $html_class). '>' . "\n" . +- $prepended_text . $caption_text . $content . ''; ++ if ($program_version_num >= 7.000000) { ++ return $self->html_attribute_class('div', [$html_class]). '>' . "\n" . ++ $prepended_text . $caption_text . $content . ''; ++ } else { ++ return $self->_attribute_class('div', $html_class). '>' . "\n" . ++ $prepended_text . $caption_text . $content . ''; ++ } + } + + texinfo_register_command_formatting('float', diff --git a/tools/MacPorts/print/ghostscript/Portfile b/tools/MacPorts/print/ghostscript/Portfile index 5056d763e..91c06743a 100644 --- a/tools/MacPorts/print/ghostscript/Portfile +++ b/tools/MacPorts/print/ghostscript/Portfile @@ -4,8 +4,8 @@ PortSystem 1.0 PortGroup muniversal 1.0 name ghostscript -version 10.02.0 -revision 0 +version 10.02.1 +revision 1 categories print license AGPL-3 BSD @@ -34,9 +34,9 @@ distfiles ${distname}.tar.gz:source \ ${mappingresources_commit}.zip:misc checksums ${distname}.tar.gz \ - rmd160 4b09840d7f2c029d807d4bf9f730d2364b87ba74 \ - sha256 15662eb7cc0aba5ef260ba83e40bb062a04c96c78ef717c80e8f983ebab3cce9 \ - size 98136363 \ + rmd160 4a8dd188fe10e5f16f4a7f3c5866e2923e3d7b3c \ + sha256 25399af0ef5bb94f2a13c91dc785c128d14f16744c4c92fa7c86e011c23151d8 \ + size 98194756 \ ghostscript-fonts-other-6.0.tar.gz \ rmd160 ab60dbf71e7d91283a106c3df381cadfe173082f \ sha256 4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \ diff --git a/tools/MacPorts/print/ghostscript/Portfile.orig b/tools/MacPorts/print/ghostscript/Portfile.orig index 4218c76ce..bbc24ae95 100644 --- a/tools/MacPorts/print/ghostscript/Portfile.orig +++ b/tools/MacPorts/print/ghostscript/Portfile.orig @@ -4,8 +4,8 @@ PortSystem 1.0 PortGroup muniversal 1.0 name ghostscript -version 10.02.0 -revision 0 +version 10.02.1 +revision 1 categories print license AGPL-3 BSD @@ -34,9 +34,9 @@ distfiles ${distname}.tar.gz:source \ ${mappingresources_commit}.zip:misc checksums ${distname}.tar.gz \ - rmd160 4b09840d7f2c029d807d4bf9f730d2364b87ba74 \ - sha256 15662eb7cc0aba5ef260ba83e40bb062a04c96c78ef717c80e8f983ebab3cce9 \ - size 98136363 \ + rmd160 4a8dd188fe10e5f16f4a7f3c5866e2923e3d7b3c \ + sha256 25399af0ef5bb94f2a13c91dc785c128d14f16744c4c92fa7c86e011c23151d8 \ + size 98194756 \ ghostscript-fonts-other-6.0.tar.gz \ rmd160 ab60dbf71e7d91283a106c3df381cadfe173082f \ sha256 4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \