Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ImageMagick to 6.9.13-7 #23307

Merged
merged 2 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/R-magick/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PortGroup R 1.0

# GitHub version lags behind.
R.setup cran ropensci magick 2.8.3
revision 0
revision 1
categories-append graphics
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license MIT
Expand Down
3 changes: 1 addition & 2 deletions databases/psiconv/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ PortSystem 1.0

name psiconv
version 0.9.9
revision 4
revision 5
categories databases
platforms darwin
license GPL-2
maintainers nomaintainer

Expand Down
2 changes: 1 addition & 1 deletion devel/libtuxcap/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PortGroup cmake 1.0

name libtuxcap
version 1.4.0
revision 7
revision 8
checksums rmd160 43d236b65fd6bb28b3ceaa6ba3193ecbcc5e6675 \
sha256 dae27bad276bffce6eba8114cd0e3edc0db710306f627b984464c4f0ec1fab2f \
size 4622159
Expand Down
2 changes: 1 addition & 1 deletion devel/virtuoso-5/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ openssl.branch 1.0
name virtuoso-5
set myname virtuoso
version 5.0.15
revision 0
revision 1
categories devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL
Expand Down
3 changes: 1 addition & 2 deletions devel/virtuoso-6/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ openssl.branch 1.0
name virtuoso-6
set myname virtuoso
version 6.1.8
revision 8
revision 9
categories devel
maintainers {snc @nerdling} openmaintainer
license GPL
description a high-performance object-relational SQL database
long_description Virtuoso is an enterprise-grade server that delivers a platform \
for Data Access, Integration and Management.
platforms darwin
homepage http://${myname}.openlinksw.com/dataspace/dav/wiki/Main/
master_sites sourceforge:project/${myname}/${myname}/${version}
distname ${myname}-opensource-${version}
Expand Down
3 changes: 1 addition & 2 deletions devel/virtuoso-7/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ PortGroup openssl 1.0
name virtuoso-7
set myname virtuoso
version 7.2.10
revision 0
revision 1
categories devel
maintainers {snc @nerdling} openmaintainer
license GPL
description a high-performance object-relational SQL database
long_description Virtuoso is an enterprise-grade server that delivers a platform \
for Data Access, Integration and Management.
platforms darwin
homepage http://${myname}.openlinksw.com/dataspace/dav/wiki/Main/
master_sites sourceforge:project/${myname}/${myname}/${version}
distname ${myname}-opensource-${version}
Expand Down
14 changes: 5 additions & 9 deletions graphics/ImageMagick/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,16 @@ PortGroup conflicts_build 1.0
# 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

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 13
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
size 9167220
version 6.9.13-7
revision 0
checksums rmd160 9025e38a212d8cfe5706f07c4f900a96b708c016 \
sha256 2a521f7992b3dd32469b7b7254a81df8a0045cb0b963372e3ba6404b0a4efeae \
size 9604796

categories graphics devel
maintainers {ryandesign @ryandesign}
license Apache-2
use_xz yes
platforms darwin
use_parallel_build yes

description Tools and libraries to manipulate images in many formats

Expand Down
3 changes: 1 addition & 2 deletions graphics/ale/Portfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# -*- 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

Check warning on line 1 in graphics/ale/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint ale: Warning: missing recommended checksum type: rmd160 Warning: missing recommended checksum type: sha256 Warning: checksum type is insecure on its own: md5

Check warning on line 1 in graphics/ale/Portfile

View workflow job for this annotation

GitHub Actions / macos-12

port lint ale: Warning: missing recommended checksum type: rmd160 Warning: missing recommended checksum type: sha256 Warning: checksum type is insecure on its own: md5

Check warning on line 1 in graphics/ale/Portfile

View workflow job for this annotation

GitHub Actions / macos-11

port lint ale: Warning: missing recommended checksum type: rmd160 Warning: missing recommended checksum type: sha256 Warning: checksum type is insecure on its own: md5

Check warning on line 1 in graphics/ale/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint ale: Warning: missing recommended checksum type: rmd160 Warning: missing recommended checksum type: sha256 Warning: checksum type is insecure on its own: md5

PortSystem 1.0

name ale
version 0.8.7
revision 5
revision 6
categories graphics
platforms darwin
maintainers nomaintainer
license GPL-2+

Expand Down
3 changes: 1 addition & 2 deletions graphics/autotrace/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ PortGroup github 1.0

github.setup autotrace autotrace 20200219.65 travis-
version 0.40.0-${github.version}
revision 0
revision 1
checksums rmd160 cbb9bb78ac51ab24835043cac02d4aef99db3d95 \
sha256 74ca2555aff1a968290f13602a90f836872e08d37ecaf80c5296ad223f6cd69a \
size 7880004

categories graphics
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
license GPL-2+

Expand Down
2 changes: 1 addition & 1 deletion graphics/converseen/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup github 1.0
PortGroup qt5 1.0

github.setup Faster3ck converseen 0.12.2.1 v
revision 0
revision 1
categories graphics
license GPL-3
maintainers {mps @Schamschula} openmaintainer
Expand Down
3 changes: 1 addition & 2 deletions graphics/dmtx-utils/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ PortSystem 1.0
PortGroup github 1.0

github.setup dmtx dmtx-utils 0.7.6 v
revision 1
revision 2
categories graphics
platforms darwin
maintainers nomaintainer
license LGPL-2.1

Expand Down
4 changes: 2 additions & 2 deletions graphics/inkscape-devel/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set ver_date 2023-07-21
set ver_hash 0e150ed6c4
set ver_gal_item 42328
version ${ver_num}
revision 3
revision 4
epoch 2

categories graphics gnome
Expand All @@ -24,7 +24,7 @@ maintainers {mascguy @mascguy} openmaintainer
description This is the current development pre-release version of Inkscape.
long_description Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
that uses SVG as its native file format. \
${description}
{*}${description}
homepage https://inkscape.org/

master_sites https://inkscape.org/gallery/item/${ver_gal_item}
Expand Down
4 changes: 2 additions & 2 deletions graphics/inkscape/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set ver_date 2023-07-21
set ver_hash 0e150ed6c4
set ver_gal_item 42328
version ${ver_num}
revision 6
revision 7
epoch 0

categories graphics gnome
Expand All @@ -24,7 +24,7 @@ maintainers {mascguy @mascguy} openmaintainer
description This is the current stable release version of Inkscape.
long_description Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
that uses SVG as its native file format. \
${description}
{*}${description}
homepage https://inkscape.org/

master_sites https://inkscape.org/gallery/item/${ver_gal_item}
Expand Down
2 changes: 1 addition & 1 deletion graphics/oofcanvas/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0

name oofcanvas
version 1.1.1
revision 1
revision 2

license public-domain
categories graphics
Expand Down
2 changes: 1 addition & 1 deletion graphics/photoqt/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name photoqt
# https://trac.macports.org/ticket/69366
# https://github.com/luspi/photoqt/issues/22
github.setup luspi photoqt 3.4 v
revision 2
revision 3
categories graphics
license GPL-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
Expand Down
3 changes: 1 addition & 2 deletions graphics/pstoedit/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ legacysupport.redirect_bins pstoedit

name pstoedit
version 4.00
revision 1
revision 2
categories graphics
platforms darwin
maintainers nomaintainer
license GPL-2+

Expand Down
4 changes: 2 additions & 2 deletions graphics/synfig/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ if {${subport} in [list ${name} ${name}studio]} {
}

if {${subport} eq ${name}} {
revision 3
revision 4
checksums rmd160 35f55a26bdc7bce9a4675ed5ac259edb52d254ab \
sha256 cd9882a091433e22e484e47d7bfe542aaefd3f62bfd746d306be4ce964756f06 \
size 5177728

description vector-based 2-D animation package

long_description Synfig is a ${description}. It is designed to be \
long_description Synfig is a {*}${description}. It is designed to be \
capable of producing feature-film-quality animation. \
It eliminates the need for tweening, preventing the \
need to hand-draw each frame. Synfig features spatial \
Expand Down
2 changes: 1 addition & 1 deletion graphics/vips/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup gobject_introspection 1.0
PortGroup meson 1.0

github.setup libvips libvips 8.15.1 v
revision 2
revision 3
name vips
distname vips-${version}
description VIPS is an image processing library.
Expand Down
5 changes: 2 additions & 3 deletions graphics/zbar/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup active_variants 1.1

github.setup mchehab zbar 0.23.92
github.tarball_from archive
revision 0
revision 1

checksums rmd160 043e4904f567261148aa2223502c0ba2fc740ef1 \
sha256 dffc16695cb6e42fa318a4946fd42866c0f5ab735f7eaf450b108d1c3a19b4ba \
Expand All @@ -17,11 +17,10 @@ maintainers {chello.at:knapoc @Knapoc} openmaintainer

description ZBar is an open source software suite for reading bar codes from \
various sources
long_description ${description}, such as video streams, image files \
long_description {*}${description}, such as video streams, image files \
and raw intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, \
Code 128, Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code.

platforms darwin
license LGPL-2.1+

depends_build-append port:libtool \
Expand Down
3 changes: 1 addition & 2 deletions multimedia/dvdauthor/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ PortSystem 1.0

name dvdauthor
version 0.7.2
revision 3
revision 4
categories multimedia
platforms darwin
maintainers {perry.ch:maurice @robbyn}
license GPL-2+

Expand Down
2 changes: 1 addition & 1 deletion multimedia/dvdrip/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup perl5 1.0
name dvdrip
perl5.branches 5.34
perl5.setup ${name} 0.98.11
revision 7
revision 8
categories multimedia
maintainers nomaintainer
license {Artistic-1 GPL}
Expand Down
4 changes: 2 additions & 2 deletions multimedia/libopenshot/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ PortGroup cmake 1.1
PortGroup github 1.0

github.setup OpenShot libopenshot 0.3.2 v
revision 1
github.tarball_from archive
checksums rmd160 56febba77be0cc7f837ac26f211c9a6808d3f499 \
sha256 58765cfc8aec199814346e97ce31a5618a261260b380670a6fb2bf6f68733638 \
Expand All @@ -16,11 +17,10 @@ license GPL-3+
# qt-qtmultimedia, qt-svg, qt-qtwebkit all have OpenSSLException
# does not link with or use anything else that depends on openssl
license_noconflict openssl openssl10 libpaper
platforms darwin
maintainers {ctreleaven @ctreleaven} openmaintainer

description Library for creating and editing videos
long_description ${description}. Includes python bindings but not ruby.
long_description {*}${description}. Includes python bindings but not ruby.

# qt5.min_version ?? # Project does not indicate
qt5.depends_component \
Expand Down
4 changes: 1 addition & 3 deletions multimedia/transcode/Portfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# -*- 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

Check warning on line 1 in multimedia/transcode/Portfile

View workflow job for this annotation

GitHub Actions / macos-13

port lint transcode: Warning: Line 85 contains tab but modeline says tabs should be expanded

Check warning on line 1 in multimedia/transcode/Portfile

View workflow job for this annotation

GitHub Actions / macos-12

port lint transcode: Warning: Line 85 contains tab but modeline says tabs should be expanded

Check warning on line 1 in multimedia/transcode/Portfile

View workflow job for this annotation

GitHub Actions / macos-11

port lint transcode: Warning: Line 85 contains tab but modeline says tabs should be expanded

Check warning on line 1 in multimedia/transcode/Portfile

View workflow job for this annotation

GitHub Actions / macos-14

port lint transcode: Warning: Line 85 contains tab but modeline says tabs should be expanded

PortSystem 1.0
PortGroup muniversal 1.0

name transcode
version 1.1.7
revision 28
revision 29
epoch 1
license GPL-2+
categories multimedia
Expand Down Expand Up @@ -58,8 +58,6 @@
path:include/turbojpeg.h:libjpeg-turbo \
port:lame

platforms darwin

patch.pre_args -p1
patch.args -b -V numbered
patchfiles \
Expand Down
2 changes: 1 addition & 1 deletion multimedia/xine-lib/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PortSystem 1.0

name xine-lib
version 1.2.13
revision 2
revision 3
checksums rmd160 2b1045e3dfe475c92a442f3506ee8b570b73da32 \
sha256 5f10d6d718a4a51c17ed1b32b031d4f9b80b061e8276535b2be31e5ac4b75e6f \
size 5004196
Expand Down
11 changes: 5 additions & 6 deletions perl/p5-perlmagick/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@ PortGroup perl5 1.0

epoch 1
perl5.branches 5.28 5.30 5.32 5.34
perl5.setup PerlMagick 6.9.11-60
perl5.setup PerlMagick 6.9.13-7
revision 0
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
size 9167220
checksums rmd160 9025e38a212d8cfe5706f07c4f900a96b708c016 \
sha256 2a521f7992b3dd32469b7b7254a81df8a0045cb0b963372e3ba6404b0a4efeae \
size 9604796

set my_name ImageMagick
maintainers {ryandesign @ryandesign}
description Perl extension for calling ImageMagick's libMagick methods
long_description ${description}
long_description {*}${description}
license Apache-2
platforms darwin
use_xz yes

# We use the ImageMagick distribution version of PerlMagick to
Expand Down
18 changes: 9 additions & 9 deletions perl/p5-perlmagick/files/no-usr-include-ImageMagick.patch
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
Don't look in /usr/include/ImageMagick.
--- PerlMagick/Makefile.PL.in.orig 2019-11-29 12:39:22.000000000 -0600
+++ PerlMagick/Makefile.PL.in 2019-12-01 05:51:53.000000000 -0600
--- PerlMagick/Makefile.PL.in.orig 2024-02-26 01:29:03
+++ PerlMagick/Makefile.PL.in 2024-04-01 12:43:17
@@ -161,7 +161,7 @@
}

# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../ -I@top_srcdir@ @CPPFLAGS@';
my $LIBS_magick = '-L../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
my $LIBS_magick = '-L../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
--- PerlMagick/default/Makefile.PL.in.orig 2019-11-29 12:39:22.000000000 -0600
+++ PerlMagick/default/Makefile.PL.in 2019-12-01 05:52:00.000000000 -0600
--- PerlMagick/default/Makefile.PL.in.orig 2024-02-26 01:29:03
+++ PerlMagick/default/Makefile.PL.in 2024-04-01 12:43:54
@@ -161,7 +161,7 @@
}

# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../.. -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../.. -I@top_srcdir@ @CPPFLAGS@';
my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
--- PerlMagick/quantum/Makefile.PL.in.orig 2019-11-29 12:39:22.000000000 -0600
+++ PerlMagick/quantum/Makefile.PL.in 2019-12-01 05:51:42.000000000 -0600
--- PerlMagick/quantum/Makefile.PL.in.orig 2024-02-26 01:29:03
+++ PerlMagick/quantum/Makefile.PL.in 2024-04-01 12:44:09
@@ -161,7 +161,7 @@
}

# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../../ -I@top_srcdir@ @CPPFLAGS@';
my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";