update MacPorts

NatronGitHub · Oct 31, 2023 · 526e05e · 526e05e
1 parent 525a5d5
commit 526e05e
Show file tree

Hide file tree

Showing 14 changed files with 169 additions and 130 deletions.
diff --git a/tools/MacPorts/graphics/libraw/Portfile.orig b/tools/MacPorts/graphics/libraw/Portfile.orig
@@ -29,6 +29,7 @@ depends_lib         port:jasper \
                     port:lcms2
 
 use_autoreconf      yes
+autoreconf.args     -fvi
 
 # libraw_datastream.h:125:8: error: no template named 'unique_ptr' in namespace 'std'
 compiler.cxx_standard 2011

diff --git a/tools/MacPorts/graphics/libraw/Portfile.patch b/tools/MacPorts/graphics/libraw/Portfile.patch
@@ -1,18 +1,18 @@
---- Portfile.orig	2023-01-28 18:14:47.000000000 -0800
-+++ Portfile	2023-01-28 18:14:55.000000000 -0800
-@@ -3,47 +3,67 @@
+--- Portfile.orig	2023-10-31 09:50:57
++++ Portfile	2023-07-04 02:43:05
+@@ -3,50 +3,69 @@
  PortSystem          1.0
 
  name                libraw
 -version             0.21.1
 -revision            0
--
--checksums           rmd160  be36d8709eb2e8578f07b63ea8632eb6ed1d7775 \
--                    sha256  630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd \
--                    size    1638461
 +version             0.18.13
 +set demosaicversion 0.18.8
 
+-checksums           rmd160  be36d8709eb2e8578f07b63ea8632eb6ed1d7775 \
+-                    sha256  630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd \
+-                    size    1638461
+-
  description         Library for RAW image manipulation
  long_description    A library for reading RAW files obtained from digital photo \
                      cameras (CRW/CR2, NEF, RAF, DNG, and others).
@@ -50,6 +50,7 @@
                      port:lcms2
 
 -use_autoreconf      yes
+-autoreconf.args     -fvi
 -
 -# libraw_datastream.h:125:8: error: no template named 'unique_ptr' in namespace 'std'
 -compiler.cxx_standard 2011
@@ -70,8 +71,8 @@
 +        reinplace -E {s|-lstdc|-lc|g} ${destroot}${prefix}/lib/pkgconfig/libraw.pc
 +        reinplace -E {s|-lstdc|-lc|g} ${destroot}${prefix}/lib/pkgconfig/libraw_r.pc
 +    }
-+}
-+
+ }
+ 
 +variant gpl2 description {Enable GPL demosaic pack, license will be GPL-2+} {
 +    distfiles-append \
 +        LibRaw-demosaic-pack-GPL2-${demosaicversion}${extract.suffix} \
@@ -84,6 +85,8 @@
 +        LibRaw-demosaic-pack-GPL3-${demosaicversion}${extract.suffix}
 +
 +    license                 GPL-3+
- }
- 
++}
++
  livecheck.type      regex
+ livecheck.url       ${homepage}/download/
+ livecheck.regex     "LibRaw-(\\d+(?:\\.\\d+)*)${extract.suffix}"
diff --git a/tools/MacPorts/lang/libomp/Portfile b/tools/MacPorts/lang/libomp/Portfile
@@ -29,21 +29,30 @@ epoch                   1
 subport                 libomp-devel {}
 
 if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
+
+    version             17.0.3
+    revision            0
+
     if { ${subport} eq "libomp-devel" } {
-       version          11.1.0
-       checksums        rmd160  8869b60844901466aed4e462ae8dac831bf519c3 \
-                        sha256  d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \
-                        size    971628
-        livecheck.regex {"llvmorg-([0-9.rc-]+)".*}
+        # Marked obsolete 10/25/2022
+        PortGroup       obsolete 1.0
+        replaced_by     libomp
     } else {
-       version          11.1.0
-       checksums        rmd160  8869b60844901466aed4e462ae8dac831bf519c3 \
-                        sha256  d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \
-                        size    971628
         livecheck.regex {"llvmorg-([0-9.]+)".*}
     }
 
-    revision            0
+    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
 
     if {${os.major} <= 12} {
         # kmp_alloc.c includes <atomic> but libc++ is not the default on
@@ -95,6 +104,18 @@ cmake.out_of_source     yes
 # 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} {
+    compiler.blacklist-append clang *gcc*
+    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
 }

diff --git a/tools/MacPorts/lang/libomp/Portfile.orig b/tools/MacPorts/lang/libomp/Portfile.orig
@@ -30,7 +30,7 @@ subport                 libomp-devel {}
 
 if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
 
-    version             16.0.6
+    version             17.0.3
     revision            0
 
     if { ${subport} eq "libomp-devel" } {
@@ -46,13 +46,13 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
 
     checksums \
         openmp-${version}.src.tar.xz \
-        rmd160  de7bc41e8207077aee79e3ff45c782f489f8f383 \
-        sha256  a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \
-        size    1278072 \
+                    rmd160  a79350f38202f4e9819373a433b1b19cef631eb2 \
+                    sha256  e04172c067f256d06cd8112abb49bc65f4e1d986a4b49b36cd837dfee3cdd274 \
+                    size    1273276 \
         cmake-${version}.src.tar.xz \
-        rmd160  94ead500d749de031894e9a14c51ed17951c8fd7 \
-        sha256  39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \
-        size    9008
+                    rmd160  2f419efae4d3f8c9d87943cf1873031468a19bd7 \
+                    sha256  54fc534f0da09088adbaa6c3bfc9899a500153b96e60c2fb9322a7aa37b1027a \
+                    size    8712
 
     if {${os.major} <= 12} {
         # kmp_alloc.c includes <atomic> but libc++ is not the default on
@@ -98,6 +98,18 @@ cmake.out_of_source     yes
 # 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} {
+    compiler.blacklist-append clang *gcc*
+    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
 }

diff --git a/tools/MacPorts/lang/libomp/Portfile.patch b/tools/MacPorts/lang/libomp/Portfile.patch
@@ -1,5 +1,5 @@
---- Portfile.orig	2023-07-03 17:37:19.000000000 -0700
-+++ Portfile	2023-04-04 12:02:53.000000000 -0700
+--- Portfile.orig	2023-10-31 09:50:26
++++ Portfile	2023-10-31 09:50:26
 @@ -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,48 +18,7 @@
                          components required to build an executing OpenMP\
                          program that are outside the compiler itself. \
                          This port works with MacPorts' clang-3.7+ (optionally \
-@@ -29,30 +29,21 @@
- subport                 libomp-devel {}
-
- if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
--
--    version             16.0.6
--    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  de7bc41e8207077aee79e3ff45c782f489f8f383 \
--        sha256  a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \
--        size    1278072 \
--        cmake-${version}.src.tar.xz \
--        rmd160  94ead500d749de031894e9a14c51ed17951c8fd7 \
--        sha256  39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \
--        size    9008
-+    revision            0
-
-     if {${os.major} <= 12} {
-         # kmp_alloc.c includes <atomic> but libc++ is not the default on
-@@ -62,34 +53,40 @@
+@@ -62,34 +62,40 @@
 
      # Build requires std::atomic
      configure.cxxflags-append -std=c++11
@@ -120,24 +79,25 @@
  }
 
  depends_build-append    port:perl5
-@@ -115,14 +112,8 @@
+@@ -127,15 +133,9 @@
  # 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)" {}
-@@ -131,30 +122,22 @@
+
+@@ -143,30 +143,22 @@
      # Patch tool for build with CMAKE_INSTALL_PREFIX
      reinplace "/bulk.*compatibility/s/s\+/s+.*/" \
          ${rtpath}tools/check-depends.pl
@@ -172,7 +132,7 @@
          foreach p {libiomp5.dylib libomp.dylib libgomp.dylib} {
              system -W ${instdest}/lib/ \
                "ln -s libomp/${p}"
-@@ -162,8 +145,8 @@
+@@ -174,8 +166,8 @@
      }
 
      set fpath ${worksrcpath}/${rtpath}

diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile b/tools/MacPorts/multimedia/ffmpeg/Portfile
@@ -19,7 +19,7 @@ conflicts           ffmpeg-devel
 
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 version             4.4.4
-revision            2
+revision            3
 epoch               1
 
 license             LGPL-2.1+
@@ -314,6 +314,15 @@ platform darwin {
             error "Variant rav1e not supported for macOS 10.5 and earlier, or PPC"
         }
     }
+
+    # due to the new linker (which was introduced in Xcode 15: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes),
+    # this port requires '-ld_classic' to build successfully with the toolchains from Xcode 15 or Command Line Tools 15.
+    #
+    # TODO: This is a temporary solution, the classic linker will be removed in a future release by Apple.
+    if { ( [vercmp ${xcodeversion} 15 ] >= 0 ) || ( [vercmp ${xcodecltversion} 15 ] >= 0 ) } {
+        configure.ldflags-append \
+                    -Wl,-ld_classic
+    }
 }
 
 platform powerpc {

diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig
@@ -19,7 +19,7 @@ conflicts           ffmpeg-devel
 
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 version             4.4.4
-revision            2
+revision            3
 epoch               1
 
 license             LGPL-2.1+
@@ -302,6 +302,15 @@ platform darwin {
             error "Variant rav1e not supported for macOS 10.5 and earlier, or PPC"
         }
     }
+
+    # due to the new linker (which was introduced in Xcode 15: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes),
+    # this port requires '-ld_classic' to build successfully with the toolchains from Xcode 15 or Command Line Tools 15.
+    #
+    # TODO: This is a temporary solution, the classic linker will be removed in a future release by Apple.
+    if { ( [vercmp ${xcodeversion} 15 ] >= 0 ) || ( [vercmp ${xcodecltversion} 15 ] >= 0 ) } {
+        configure.ldflags-append \
+                    -Wl,-ld_classic
+    }
 }
 
 platform powerpc {

diff --git a/tools/MacPorts/multimedia/libvpx/Portfile b/tools/MacPorts/multimedia/libvpx/Portfile
@@ -7,8 +7,8 @@ PortGroup           muniversal 1.0
 name                libvpx
 conflicts           libvpx-devel
 set my_name         libvpx
-version             1.13.0
-revision            1
+version             1.13.1
+revision            0
 
 categories          multimedia
 license             Permissive

diff --git a/tools/MacPorts/multimedia/libvpx/Portfile.orig b/tools/MacPorts/multimedia/libvpx/Portfile.orig
@@ -7,8 +7,8 @@ PortGroup           muniversal 1.0
 name                libvpx
 conflicts           libvpx-devel
 set my_name         libvpx
-version             1.13.0
-revision            1
+version             1.13.1
+revision            0
 
 categories          multimedia
 license             Permissive