Skip to content

Commit

Permalink
MacPorts update
Browse files Browse the repository at this point in the history
  • Loading branch information
@devernay
devernay committed Sep 20, 2023
1 parent ff1243c commit 0912a53
Show file tree
Hide file tree
Showing 12 changed files with 190 additions and 146 deletions.
2 changes: 1 addition & 1 deletion tools/MacPorts/graphics/ImageMagick/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name ImageMagick
# 6.9.11-61 changes the major version of libMagickCore which will
# require increasing the revision of all ports that link with it.
version 6.9.11-60
revision 10
revision 11
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
size 9167220
Expand Down
2 changes: 1 addition & 1 deletion tools/MacPorts/graphics/ImageMagick/Portfile.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name ImageMagick
# 6.9.11-61 changes the major version of libMagickCore which will
# require increasing the revision of all ports that link with it.
version 6.9.11-60
revision 10
revision 11
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
size 9167220
Expand Down
8 changes: 4 additions & 4 deletions tools/MacPorts/graphics/openimageio/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ long_description OpenImageIO is a library for reading and writing images,
related classes, utilities, and applications.
platforms darwin

github.setup OpenImageIO oiio 2.4.14.0 v
github.setup OpenImageIO oiio 2.4.15.0 v
revision 100
checksums rmd160 f0c51d041627f1867b3de2b322edaef21ba8ca0e \
sha256 92ad4b107394b273397baa1abe90207e1f8ef9fd52ffbfc23b46e3b0005d4439 \
size 47890322
checksums rmd160 31292919a0cb4f9fb4ee92d08add97349280874a \
sha256 b2d76e3880d25d3b005f7c694811a991ccebb6e396965959d194f79c369ff390 \
size 47894535

github.tarball_from archive

Expand Down
4 changes: 2 additions & 2 deletions tools/MacPorts/graphics/openimageio/Portfile.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ if {${os.platform} eq "darwin" && ${os.major} >= 20} {

if {${port_latest}} {
github.setup OpenImageIO oiio 2.4.5.0 v
revision 7
revision 8
checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
size 31938357
} else {
github.setup OpenImageIO oiio 2.1.20.0 v
revision 12
revision 13
checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
size 29115990
Expand Down
52 changes: 27 additions & 25 deletions tools/MacPorts/graphics/openimageio/Portfile.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- Portfile.orig 2023-08-10 19:07:00.000000000 +0200
+++ Portfile 2023-08-10 19:51:16.000000000 +0200
--- Portfile.orig 2023-09-20 19:26:42
+++ Portfile 2023-09-20 21:23:35
@@ -2,7 +2,6 @@

PortSystem 1.0
Expand All @@ -8,7 +8,7 @@
PortGroup cmake 1.1
PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
@@ -15,50 +14,24 @@
@@ -15,51 +14,25 @@
description a library for reading and writing images
long_description OpenImageIO is a library for reading and writing images, and a bunch of \
related classes, utilities, and applications.
Expand All @@ -21,58 +21,59 @@
-} else {
- set port_latest no
-}
-
+github.setup OpenImageIO oiio 2.4.15.0 v
+revision 100
+checksums rmd160 31292919a0cb4f9fb4ee92d08add97349280874a \
+ sha256 b2d76e3880d25d3b005f7c694811a991ccebb6e396965959d194f79c369ff390 \
+ size 47894535

-if {${port_latest}} {
- github.setup OpenImageIO oiio 2.4.5.0 v
- revision 7
- revision 8
- checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
- sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
- size 31938357
-} else {
- github.setup OpenImageIO oiio 2.1.20.0 v
- revision 12
- revision 13
- checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
- sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
- size 29115990
-
- livecheck.type none
-}
+github.setup OpenImageIO oiio 2.4.14.0 v
+revision 100
+checksums rmd160 f0c51d041627f1867b3de2b322edaef21ba8ca0e \
+ sha256 92ad4b107394b273397baa1abe90207e1f8ef9fd52ffbfc23b46e3b0005d4439 \
+ size 47890322

-
github.tarball_from archive

-if {${port_latest}} {
- patchfiles-append patch-enforce-clang14.diff
- patchfiles-append patch-2.4.5-cmake-disable-wall-werror.diff
-
+depends_lib-append port:imath \
+ port:openexr

- depends_lib-append port:imath \
- port:openexr
-} else {
- patchfiles-append patch-FindOpenJpeg.cmake.diff
- patchfiles-append patch-libraw-0.21.0.diff
- patchfiles-append patch-2.1.20-cmake-disable-wall-werror.diff
-
- depends_lib-append port:field3d \
- port:openexr2
+depends_lib-append port:imath \
+ port:openexr

- configure.pkg_config_path-prepend \
- ${prefix}/libexec/openexr2/lib/pkgconfig
-}
+patchfiles-append oiio-2.0.8-invalidatespec.patch
+patchfiles-append oiio-2.0.8-atomic-load.patch
+patchfiles-append oiio-2.3.20-strnlen.patch
+patchfiles-append oiio-2.4.6-sysutil.patch
+patchfiles-append oiio-2.4.6-filesystem.patch

- depends_lib-append port:field3d \
- port:openexr2
-
- configure.pkg_config_path-prepend \
- ${prefix}/libexec/openexr2/lib/pkgconfig
-}
-
# error: multiple overloads of 'address' instantiate to the same signature 'const_pointer (const_reference) const noexcept'
# http://lists.llvm.org/pipermail/llvm-bugs/2013-November/031552.html
@@ -101,11 +74,78 @@
# Seen on OSX 10.9 and older.
@@ -101,12 +74,79 @@
port:squish \
port:${port_libfmt}

Expand Down Expand Up @@ -146,14 +147,15 @@
-# -DUSE_QT=OFF
-qt5.min_version 5.6
+default_variants +opencolorio +openjpeg +freetype
+
+variant natron conflicts ffmpeg qt5 dicom openvdb ptex dicom requires opencolorio openjpeg freetype description {Natron version} {
+ if {${configure.cxx_stdlib} eq "libstdc++"} {
+ }
+}
+
configure.args-append -DUSE_PYTHON=OFF

set pythons_suffixes {27 36 37 38 39 310 311}
@@ -147,26 +187,46 @@
}

Expand Down
15 changes: 10 additions & 5 deletions tools/MacPorts/net/curl/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ PortGroup clang_dependency 1.0
# Increase the revision of p5-www-curl whenever the version of curl gets updated.

name curl
version 8.2.1
checksums rmd160 b8486b2903708f892bdff05a4f9a593c776a3ec6 \
sha256 dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 \
size 2631932
version 8.3.0
checksums rmd160 f5f0aa07f0783cc331fb86c50249037d3524e33f \
sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 \
size 2641764

categories net www
platforms darwin freebsd
Expand Down Expand Up @@ -46,7 +46,12 @@ if {${name} eq ${subport}} {
port:zstd

patchfiles configure.patch
patchfiles-append SCDynamicStoreCopyProxies.patch

# see https://github.com/curl/curl/issues/11893
if {${os.platform} eq "darwin" && ${os.major} >= 23} {
incr revision
patchfiles-append patch-sonoma.patch
}

configure.args --disable-silent-rules \
--enable-ipv6 \
Expand Down
15 changes: 10 additions & 5 deletions tools/MacPorts/net/curl/Portfile.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ PortGroup clang_dependency 1.0
# Increase the revision of p5-www-curl whenever the version of curl gets updated.

name curl
version 8.2.1
checksums rmd160 b8486b2903708f892bdff05a4f9a593c776a3ec6 \
sha256 dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 \
size 2631932
version 8.3.0
checksums rmd160 f5f0aa07f0783cc331fb86c50249037d3524e33f \
sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 \
size 2641764

categories net www
platforms darwin freebsd
Expand Down Expand Up @@ -46,7 +46,12 @@ if {${name} eq ${subport}} {
port:zstd

patchfiles configure.patch
patchfiles-append SCDynamicStoreCopyProxies.patch

# see https://github.com/curl/curl/issues/11893
if {${os.platform} eq "darwin" && ${os.major} >= 23} {
incr revision
patchfiles-append patch-sonoma.patch
}

configure.args --disable-silent-rules \
--enable-ipv6 \
Expand Down
6 changes: 3 additions & 3 deletions tools/MacPorts/net/curl/files/configure.patch
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Prevent curl-config from telling curl's dependents that they have to link with
all of curl's dependencies as well.
--- configure.orig 2023-07-23 16:00:43.000000000 -0500
+++ configure 2023-07-27 00:52:12.000000000 -0500
@@ -14497,7 +14497,7 @@
--- configure.orig 2023-09-13 08:41:45
+++ configure 2023-09-13 08:42:48
@@ -14479,7 +14479,7 @@
else
whole_archive_flag_spec=''
fi
Expand Down
20 changes: 20 additions & 0 deletions tools/MacPorts/net/curl/files/patch-sonoma.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- configure
+++ configure
@@ -21732,7 +21732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
if test "x$build_for_macos" != xno; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework SystemConfiguration"
+ LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework SystemConfiguration"
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -26234,7 +26234,7 @@ printf "%s\n" "#define USE_SECTRANSP 1" >>confdefs.h
ssl_msg="Secure Transport"
test secure-transport != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
SECURETRANSPORT_ENABLED=1
- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Security"
+ LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework Security"
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
Loading

0 comments on commit 0912a53

Please sign in to comment.