Skip to content

Commit e054534

Browse files
devernaydevernay
committed
MacPorts update
1 parent be42f7d commit e054534

36 files changed

+1483
-491
lines changed

‎config-macports.pri

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
boost {
2-
INCLUDEPATH += /opt/local/include
3-
LIBS += -lboost_serialization-mt
2+
BOOST_VERSION = 1.76
3+
INCLUDEPATH += /opt/local/libexec/boost/$$BOOST_VERSION/include
4+
LIBS += -L/opt/local/libexec/boost/$$BOOST_VERSION/lib -lboost_serialization-mt
45
}
56
equals(QT_MAJOR_VERSION, 5) {
67
shiboken: SHIBOKEN=shiboken2-$$PYVER
@@ -17,11 +18,13 @@ equals(QT_MAJOR_VERSION, 5) {
1718
}
1819

1920
macx:openmp {
20-
# clang 12+ is OK to build Natron, but libomp 12+ has a bug on macOS when
21-
# lanching tasks from a background thread, see https://bugs.llvm.org/show_bug.cgi?id=50579
21+
# libomp 12+ has a bug on macOS when lanching tasks from a background thread,
22+
# see tools/MacPorts/lang/libomp/README.md
2223
LIBS += -L/opt/local/lib -L/opt/local/lib/libomp -liomp5
23-
QMAKE_CC = /opt/local/bin/clang-mp-15
24-
QMAKE_CXX = /opt/local/bin/clang++-mp-15
24+
# clang 17 and 18 with -fopenmp links with @rpath/libc++.1.dylib instead
25+
# of /usr/lib/libc++.1.dylib, so let's use clang 16 for now.
26+
QMAKE_CC = /opt/local/bin/clang-mp-16
27+
QMAKE_CXX = /opt/local/bin/clang++-mp-16
2528
# Recent clang cannot compile QtMac.mm
2629
QMAKE_OBJECTIVE_CC = clang
2730
QMAKE_OBJECTIVE_CXX = clang++

‎tools/MacPorts/devel/gnutls/Portfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PortGroup legacysupport 1.0
99
PortGroup muniversal 1.0
1010

1111
name gnutls
12-
version 3.7.10
12+
version 3.7.11
1313
revision 0
1414
categories devel security
1515
# yes, some of the libs are GPL only
@@ -23,27 +23,27 @@ long_description \
2323
Lesser General Public License (LGPL).
2424
homepage http://www.gnutls.org/
2525

26-
checksums rmd160 e221dc4200d30b8644cfe1f2c8d5e7bccac8aca0 \
27-
sha256 b6e4e8bac3a950a3a1b7bdb0904979d4ab420a81e74de8636dd50b467d36f5a9 \
28-
size 6407852
26+
checksums rmd160 b8a3b948b2cfd504f72e04a31fce31a79b4316b1 \
27+
sha256 90e337504031ef7d3077ab1a52ca8bac9b2f72bc454c95365a1cd1e0e81e06e9 \
28+
size 6406420
2929

3030
subport ${name} {
3131
conflicts ${name}-devel
3232

33-
patchfiles patch-lib-system-certs.c.old.diff
33+
patchfiles patch-lib-system-certs.c.old.diff
3434
}
3535

3636
subport ${name}-devel {
3737
conflicts ${name}
3838

39-
version 3.8.4
39+
version 3.8.6
4040
revision 0
4141

42-
checksums rmd160 42eea662a17b646f78f3dd423200c9d17f9e3943 \
43-
sha256 2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b \
44-
size 6487520
42+
checksums rmd160 fa7d5faf5359e6de786eacb369b8c4077b15fd99 \
43+
sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd \
44+
size 6517476
4545

46-
patchfiles patch-lib-system-certs.c.diff
46+
patchfiles patch-lib-system-certs.c.diff
4747
}
4848

4949
if {${build_arch} ne "ppc" || ${build_arch} ne "ppc64"} {

‎tools/MacPorts/devel/gnutls/Portfile.orig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PortGroup legacysupport 1.0
99
PortGroup muniversal 1.0
1010

1111
name gnutls
12-
version 3.7.10
12+
version 3.7.11
1313
revision 0
1414
categories devel security
1515
# yes, some of the libs are GPL only
@@ -23,27 +23,27 @@ long_description \
2323
Lesser General Public License (LGPL).
2424
homepage http://www.gnutls.org/
2525

26-
checksums rmd160 e221dc4200d30b8644cfe1f2c8d5e7bccac8aca0 \
27-
sha256 b6e4e8bac3a950a3a1b7bdb0904979d4ab420a81e74de8636dd50b467d36f5a9 \
28-
size 6407852
26+
checksums rmd160 b8a3b948b2cfd504f72e04a31fce31a79b4316b1 \
27+
sha256 90e337504031ef7d3077ab1a52ca8bac9b2f72bc454c95365a1cd1e0e81e06e9 \
28+
size 6406420
2929

3030
subport ${name} {
3131
conflicts ${name}-devel
3232

33-
patchfiles patch-lib-system-certs.c.old.diff
33+
patchfiles patch-lib-system-certs.c.old.diff
3434
}
3535

3636
subport ${name}-devel {
3737
conflicts ${name}
3838

39-
version 3.8.4
39+
version 3.8.6
4040
revision 0
4141

42-
checksums rmd160 42eea662a17b646f78f3dd423200c9d17f9e3943 \
43-
sha256 2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b \
44-
size 6487520
42+
checksums rmd160 fa7d5faf5359e6de786eacb369b8c4077b15fd99 \
43+
sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd \
44+
size 6517476
4545

46-
patchfiles patch-lib-system-certs.c.diff
46+
patchfiles patch-lib-system-certs.c.diff
4747
}
4848

4949
if {${build_arch} ne "ppc" || ${build_arch} ne "ppc64"} {

‎tools/MacPorts/graphics/ImageMagick/Portfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ legacysupport.newest_darwin_requires_legacy 10
1414
# PHP Warning: Version warning: Imagick was compiled against Image Magick version XXXX but version YYYY is loaded. Imagick will run but may behave surprisingly in Unknown on line 0
1515

1616
name ImageMagick
17-
version 6.9.13-7
17+
version 6.9.13-12
1818
revision 0
19-
checksums rmd160 9025e38a212d8cfe5706f07c4f900a96b708c016 \
20-
sha256 2a521f7992b3dd32469b7b7254a81df8a0045cb0b963372e3ba6404b0a4efeae \
21-
size 9604796
19+
checksums rmd160 b3696f5a09d6a89ee66fd128abb95f83401bca1c \
20+
sha256 cc6189a5999c00f2fb8a0cdd2cddd8207c64bac5146639b8106e56e277c763bf \
21+
size 9617108
2222

2323
categories graphics devel
2424
maintainers {ryandesign @ryandesign}
@@ -27,7 +27,11 @@ use_xz yes
2727

2828
description Tools and libraries to manipulate images in many formats
2929

30-
long_description ImageMagick is a robust collection of tools and \
30+
long_description This is the legacy ImageMagick version 6. For the \
31+
modern ImageMagick version 7, please go to port \
32+
ImageMagick7. \
33+
\
34+
ImageMagick is a robust collection of tools and \
3135
libraries to create, edit and compose bitmap images \
3236
in a wide variety of formats. You can crop, resize, \
3337
rotate, sharpen, color reduce or add effects or text \
@@ -109,6 +113,7 @@ configure.args --enable-shared \
109113
--without-rsvg \
110114
--without-lqr \
111115
--without-pango \
116+
--without-raqm \
112117
--without-x \
113118
--without-zstd \
114119
--with-gs-font-dir=${prefix}/share/fonts/urw-fonts \
@@ -125,6 +130,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
125130
}
126131
}
127132

133+
# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
134+
configure.checks.implicit_function_declaration.whitelist-append strchr
135+
128136
variant natron conflicts x11 requires pango rsvg q32 hdri description {Natron version} {
129137
# libc++-based build
130138
# compiler with proper OpenMP support (GCC >= 4.8, clang >= 4.0)

‎tools/MacPorts/graphics/ImageMagick/Portfile.orig

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ legacysupport.newest_darwin_requires_legacy 10
1313
# PHP Warning: Version warning: Imagick was compiled against Image Magick version XXXX but version YYYY is loaded. Imagick will run but may behave surprisingly in Unknown on line 0
1414

1515
name ImageMagick
16-
version 6.9.13-7
16+
version 6.9.13-12
1717
revision 0
18-
checksums rmd160 9025e38a212d8cfe5706f07c4f900a96b708c016 \
19-
sha256 2a521f7992b3dd32469b7b7254a81df8a0045cb0b963372e3ba6404b0a4efeae \
20-
size 9604796
18+
checksums rmd160 b3696f5a09d6a89ee66fd128abb95f83401bca1c \
19+
sha256 cc6189a5999c00f2fb8a0cdd2cddd8207c64bac5146639b8106e56e277c763bf \
20+
size 9617108
2121

2222
categories graphics devel
2323
maintainers {ryandesign @ryandesign}
@@ -26,7 +26,11 @@ use_xz yes
2626

2727
description Tools and libraries to manipulate images in many formats
2828

29-
long_description ImageMagick is a robust collection of tools and \
29+
long_description This is the legacy ImageMagick version 6. For the \
30+
modern ImageMagick version 7, please go to port \
31+
ImageMagick7. \
32+
\
33+
ImageMagick is a robust collection of tools and \
3034
libraries to create, edit and compose bitmap images \
3135
in a wide variety of formats. You can crop, resize, \
3236
rotate, sharpen, color reduce or add effects or text \
@@ -106,6 +110,7 @@ configure.args --enable-shared \
106110
--without-rsvg \
107111
--without-lqr \
108112
--without-pango \
113+
--without-raqm \
109114
--without-x \
110115
--without-zstd \
111116
--with-gs-font-dir=${prefix}/share/fonts/urw-fonts \
@@ -122,6 +127,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
122127
}
123128
}
124129

130+
# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
131+
configure.checks.implicit_function_declaration.whitelist-append strchr
132+
125133
test.run yes
126134
test.target check
127135
test.env DYLD_LIBRARY_PATH=${worksrcpath}/magick/.libs

‎tools/MacPorts/graphics/ImageMagick/files/Color.cpp.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Avoid using the C++11-specific nullptr.
2+
https://github.com/ImageMagick/ImageMagick6/issues/319
3+
https://github.com/ImageMagick/ImageMagick6/commit/945a51944874548efee9de2370b164cf797ab012
4+
--- Magick++/lib/Color.cpp
5+
+++ Magick++/lib/Color.cpp
6+
@@ -223,7 +223,7 @@ const Magick::Color& Magick::Color::operator=(const std::string &x11color_)
7+
_isValid = false;
8+
_pixelOwn = false;
9+
delete _pixel;
10+
- _pixel = nullptr;
11+
+ _pixel = (PixelPacket *)NULL;
12+
}
13+
ThrowPPException(false);
14+

‎tools/MacPorts/graphics/giflib/Portfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ use_parallel_build yes
4040
set docdir ${prefix}/share/doc/${name}
4141
post-destroot {
4242
xinstall -d ${destroot}${docdir}
43-
xinstall -W ${worksrcpath} COPYING NEWS README TODO history.adoc ${destroot}${docdir}
44-
xinstall -m 644 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1
43+
xinstall -W ${worksrcpath}-m 0644 COPYING NEWS README TODO history.adoc ${destroot}${docdir}
44+
xinstall -m 0444 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1
4545
}
4646

4747
variant doc description {Install HTML documentation} {
4848
depends_build-append port:xmlto
4949
post-destroot {
5050
xinstall -d ${destroot}${docdir}/html
51-
xinstall -m 644 {*}[glob ${worksrcpath}/doc/*.html] ${destroot}${docdir}/html
51+
xinstall -m 0644 {*}[glob ${worksrcpath}/doc/*.html] ${destroot}${docdir}/html
5252
}
5353
}
5454

‎tools/MacPorts/graphics/giflib/Portfile.orig

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# -*- 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
2+
3+
PortSystem 1.0
4+
5+
name giflib
6+
version 4.2.3
7+
revision 1
8+
set major [lindex [split ${version} .] 0]
9+
categories graphics
10+
maintainers {ryandesign @ryandesign} openmaintainer
11+
license MIT
12+
homepage https://sourceforge.net/projects/giflib/
13+
master_sites sourceforge:project/giflib/giflib-${major}.x
14+
use_bzip2 yes
15+
16+
description GIF library using patented LZW algorithm
17+
18+
long_description GIF loading and saving shared library. \
19+
Uses the LZW algorithm.
20+
21+
checksums rmd160 34c30ace20155a61446d1561af44e3ad6329b49a \
22+
sha256 0ac8d56726f77c8bc9648c93bbb4d6185d32b15ba7bdb702415990f96f3cb766 \
23+
size 560968
24+
25+
patchfiles patch-gif_lib.h.diff \
26+
patch-lib-gif_hash.c.diff
27+
28+
configure.args --disable-x11
29+
30+
use_parallel_build yes
31+
32+
set docdir ${prefix}/share/doc/${name}
33+
post-destroot {
34+
xinstall -d ${destroot}${docdir}
35+
xinstall -W ${worksrcpath} -m 0644 AUTHORS BUGS COPYING NEWS README TODO api.txt history.txt ${destroot}${docdir}
36+
xinstall -m 0444 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1
37+
}
38+
39+
variant doc description {Install HTML documentation} {
40+
depends_build-append port:xmlto
41+
post-destroot {
42+
xinstall -d ${destroot}${docdir}/html
43+
xinstall -m 0644 {*}[glob ${worksrcpath}/doc/*.html] ${destroot}${docdir}/html
44+
}
45+
}
46+
47+
if {![variant_isset doc]} {
48+
patchfiles-append patch-no-docs.diff
49+
}
50+
51+
variant x11 description {Include gif2x11 tool for displaying GIF files in an X window} {
52+
depends_lib-append port:xorg-libsm \
53+
port:xorg-libX11
54+
55+
configure.args-delete --disable-x11
56+
}
57+
58+
livecheck.regex /${name}-(${major}\\.\[0-9.\]+)${extract.suffix}

‎tools/MacPorts/graphics/giflib/Portfile.patch

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
--- Portfile.orig 2024-07-19 16:46:49
2+
+++ Portfile 2024-07-19 16:48:39
3+
@@ -1,38 +1,46 @@
4+
# -*- 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
5+
6+
PortSystem 1.0
7+
+PortGroup makefile 1.0
8+
9+
name giflib
10+
-version 4.2.3
11+
-revision 1
12+
+version 5.2.1
13+
set major [lindex [split ${version} .] 0]
14+
categories graphics
15+
maintainers {ryandesign @ryandesign} openmaintainer
16+
license MIT
17+
+platforms darwin
18+
homepage https://sourceforge.net/projects/giflib/
19+
-master_sites sourceforge:project/giflib/giflib-${major}.x
20+
-use_bzip2 yes
21+
+master_sites sourceforge:project/giflib
22+
23+
description GIF library using patented LZW algorithm
24+
25+
long_description GIF loading and saving shared library. \
26+
Uses the LZW algorithm.
27+
28+
-checksums rmd160 34c30ace20155a61446d1561af44e3ad6329b49a \
29+
- sha256 0ac8d56726f77c8bc9648c93bbb4d6185d32b15ba7bdb702415990f96f3cb766 \
30+
- size 560968
31+
+checksums rmd160 bc4be3ddaef877e4fd546b1240fe94dec8ef3e27 \
32+
+ sha256 31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd \
33+
+ size 444187
34+
35+
-patchfiles patch-gif_lib.h.diff \
36+
- patch-lib-gif_hash.c.diff
37+
+patchfiles Makefile.patch
38+
39+
-configure.args --disable-x11
40+
+build.args PREFIX="${prefix}" CC="${configure.cc}" \
41+
+ CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
42+
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
43+
44+
+destroot.args PREFIX="${prefix}"
45+
+
46+
+variant universal {
47+
+ build.args-append "CFLAGS+=\"${configure.universal_cflags}\"" \
48+
+ "LDFLAGS+=\"${configure.universal_ldflags}\""
49+
+}
50+
+
51+
use_parallel_build yes
52+
53+
set docdir ${prefix}/share/doc/${name}
54+
post-destroot {
55+
xinstall -d ${destroot}${docdir}
56+
- xinstall -W ${worksrcpath} -m 0644 AUTHORS BUGS COPYING NEWS README TODO api.txt history.txt ${destroot}${docdir}
57+
+ xinstall -W ${worksrcpath}-m 0644 COPYING NEWS README TODO history.adoc ${destroot}${docdir}
58+
xinstall -m 0444 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1
59+
}
60+
61+
@@ -44,15 +52,4 @@
62+
}
63+
}
64+
65+
-if {![variant_isset doc]} {
66+
- patchfiles-append patch-no-docs.diff
67+
-}
68+
-
69+
-variant x11 description {Include gif2x11 tool for displaying GIF files in an X window} {
70+
- depends_lib-append port:xorg-libsm \
71+
- port:xorg-libX11
72+
-
73+
- configure.args-delete --disable-x11
74+
-}
75+
-
76+
livecheck.regex /${name}-(${major}\\.\[0-9.\]+)${extract.suffix}

0 commit comments

Comments
 (0)