Skip to content

Commit

Permalink
macports update
Browse files Browse the repository at this point in the history
  • Loading branch information
@devernay
devernay committed Jun 4, 2021
1 parent e32a209 commit 438edb3
Show file tree
Hide file tree
Showing 12 changed files with 179 additions and 244 deletions.
41 changes: 25 additions & 16 deletions tools/MacPorts/devel/gnutls/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,28 @@ PortGroup legacysupport 1.0
PortGroup muniversal 1.0

name gnutls
version 3.6.15
version 3.6.16
revision 0
set branch [join [lrange [split ${version} .] 0 1] .]
set major [join [lrange [split ${version} .] 0 2] .]
categories devel security
# yes, some of the libs are GPL only
license LGPL-2.1+ GPL-3+
maintainers {mps @Schamschula} openmaintainer
description GNU Transport Layer Security Library
homepage http://www.gnutls.org/
platforms darwin

description GNU Transport Layer Security Library
long_description \
GnuTLS is a portable ANSI C based library which implements the TLS 1.2, \
TLS 1.1, TLS 1.0, SSL 3.0, and Datagram TLS protocols. The library does \
not include any patented algorithms \
and is available under the GNU Lesser General Public License (LGPL).

GnuTLS is a portable ANSI C based library which implements the TLS 1.2, \
TLS 1.1, TLS 1.0, SSL 3.0, and Datagram TLS protocols. The library does \
not include any patented algorithms and is available under the GNU \
Lesser General Public License (LGPL).
homepage http://www.gnutls.org/
master_sites https://www.gnupg.org/ftp/gcrypt/gnutls/v${branch}/ \
https://mirrors.dotsrc.org/gcrypt/gnutls/v${branch}/

checksums rmd160 870c338ae8c2b6acd7000eb7daa287082ab04609 \
sha256 0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558 \
size 6081656
checksums rmd160 d6bc8751c569db6033234c810b45eb661f77b4b4 \
sha256 1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 \
size 5639992

use_xz yes

Expand Down Expand Up @@ -80,13 +78,13 @@ compiler.thread_local_storage yes
compiler.blacklist-append {clang < 1000} {macports-clang-3.[0-9]} {macports-clang-[4-6].0}

if {${os.platform} eq "darwin" && ${os.major} < 10 && [string match *clang* ${configure.compiler}] } {
depends_build-append port:cctools
configure.env-append NM=${prefix}/bin/nm
configure.args-append lt_cv_path_NM=${prefix}/bin/nm
depends_build-append port:cctools
configure.env-append NM=${prefix}/bin/nm
configure.args-append lt_cv_path_NM=${prefix}/bin/nm
}

platform darwin 8 {
depends_build-append port:texinfo
depends_build-append port:texinfo
configure.cppflags-append -D__WORDSIZE=32
}

Expand All @@ -96,6 +94,17 @@ variant dane description {Build libdane using unbound libraries} {
configure.args-delete --disable-libdane
}

if {${os.platform} eq "darwin" && ${os.major} > 19 && ${os.arch} eq "arm"} {
depends_build-append port:libtool

use_autoreconf yes
autoreconf.args --install --verbose --force

pre-configure {
xinstall -m 644 -W ${prefix}/share/libtool/build-aux config.guess config.sub ${worksrcpath}
}
}

# as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
# the following may be superfluous

Expand Down
41 changes: 25 additions & 16 deletions tools/MacPorts/devel/gnutls/Portfile.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,28 @@ PortGroup legacysupport 1.0
PortGroup muniversal 1.0

name gnutls
version 3.6.15
version 3.6.16
revision 0
set branch [join [lrange [split ${version} .] 0 1] .]
set major [join [lrange [split ${version} .] 0 2] .]
categories devel security
# yes, some of the libs are GPL only
license LGPL-2.1+ GPL-3+
maintainers {mps @Schamschula} openmaintainer
description GNU Transport Layer Security Library
homepage http://www.gnutls.org/
platforms darwin

description GNU Transport Layer Security Library
long_description \
GnuTLS is a portable ANSI C based library which implements the TLS 1.2, \
TLS 1.1, TLS 1.0, SSL 3.0, and Datagram TLS protocols. The library does \
not include any patented algorithms \
and is available under the GNU Lesser General Public License (LGPL).

GnuTLS is a portable ANSI C based library which implements the TLS 1.2, \
TLS 1.1, TLS 1.0, SSL 3.0, and Datagram TLS protocols. The library does \
not include any patented algorithms and is available under the GNU \
Lesser General Public License (LGPL).
homepage http://www.gnutls.org/
master_sites https://www.gnupg.org/ftp/gcrypt/gnutls/v${branch}/ \
https://mirrors.dotsrc.org/gcrypt/gnutls/v${branch}/

checksums rmd160 870c338ae8c2b6acd7000eb7daa287082ab04609 \
sha256 0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558 \
size 6081656
checksums rmd160 d6bc8751c569db6033234c810b45eb661f77b4b4 \
sha256 1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 \
size 5639992

use_xz yes

Expand Down Expand Up @@ -80,13 +78,13 @@ compiler.thread_local_storage yes
compiler.blacklist-append {clang < 1000} {macports-clang-3.[0-9]} {macports-clang-[4-6].0}

if {${os.platform} eq "darwin" && ${os.major} < 10 && [string match *clang* ${configure.compiler}] } {
depends_build-append port:cctools
configure.env-append NM=${prefix}/bin/nm
configure.args-append lt_cv_path_NM=${prefix}/bin/nm
depends_build-append port:cctools
configure.env-append NM=${prefix}/bin/nm
configure.args-append lt_cv_path_NM=${prefix}/bin/nm
}

platform darwin 8 {
depends_build-append port:texinfo
depends_build-append port:texinfo
configure.cppflags-append -D__WORDSIZE=32
}

Expand All @@ -96,6 +94,17 @@ variant dane description {Build libdane using unbound libraries} {
configure.args-delete --disable-libdane
}

if {${os.platform} eq "darwin" && ${os.major} > 19 && ${os.arch} eq "arm"} {
depends_build-append port:libtool

use_autoreconf yes
autoreconf.args --install --verbose --force

pre-configure {
xinstall -m 644 -W ${prefix}/share/libtool/build-aux config.guess config.sub ${worksrcpath}
}
}

# as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
# the following may be superfluous

Expand Down
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 0
revision 1
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 0
revision 1
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
size 9167220
Expand Down
95 changes: 38 additions & 57 deletions tools/MacPorts/multimedia/ffmpeg/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ conflicts ffmpeg-devel
# Please increase the revision of mpv whenever ffmpeg's version is updated.
epoch 1
version 4.4
revision 0
revision 1
license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
Expand Down Expand Up @@ -95,11 +95,6 @@ depends_lib port:lame \

patchfiles patch-libavcodec-audiotoolboxenc.c.diff

# work around vec_xl intrinsic does not exist on older PowerPC processors
# https://trac.ffmpeg.org/ticket/8750
patchfiles-append patch-ffmpeg-powerpc-yuv2rgb-altivec-fix.diff

#
# enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
#
Expand Down Expand Up @@ -277,6 +272,14 @@ platform powerpc {
if {[catch {sysctl hw.vectorunit} result] || $result == 0} {
configure.args-append --disable-altivec
}

# might be needed for any gcc build...
#Undefined symbols:
# "___atomic_fetch_sub_8", referenced from:
# _fifo_thread_dispatch_message.part.4 in fifo.o
configure.ldflags-append -latomic


}

platform darwin 8 {
Expand Down Expand Up @@ -472,66 +475,44 @@ variant nonfree description {enable nonfree code, libraries and binaries will no

if {[variant_isset nonfree]} {
notes "
*******
******* This build of ${name} includes nonfree code as follows:
*******
******* libfdk-aac
*******
******* The following libraries and binaries may not be redistributed:
*******
******* ffmpeg
******* libavcodec
******* libavdevice
******* libavfilter
******* libavformat
******* libavutil
*******
******* To remove this restriction remove the variant +nonfree
*******
This build of ${name} includes nonfree code as follows:
libfdk-aac
The following libraries and binaries may not be redistributed:
ffmpeg
libavcodec
libavdevice
libavfilter
libavformat
libavutil
To remove this restriction remove the variant +nonfree
"
} elseif {[variant_isset gpl3]} {
notes "
*******
******* This build of ${name} includes GPLed code and
******* is therefore licensed under GPL v3 or later.
*******
******* The following modules are GPLed:
*******
******* postproc
******* libsambaclient
******* libx264
******* libx265
******* libxvid
*******
******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
******* To remove nonfree and GPLed code leaving only LGPL code remove the
******* +gpl2 and +gpl3 variants.
*******
This build of ${name} includes GPLed code and is therefore licensed under GPL v3 or later.
The following modules are GPLed:
postproc
libsambaclient
libx264
libx265
libxvid
To include all nonfree, GPLed and LGPL code use variant +nonfree.
To remove nonfree and GPLed code leaving only LGPL code remove the +gpl2 and +gpl3 variants.
"
} elseif {[variant_isset gpl2]} {
notes "
*******
******* This build of ${name} includes GPLed code and
******* is therefore licensed under GPL v2 or later.
*******
******* The following modules are GPLed:
*******
******* postproc
******* libx264
******* libx265
******* libxvid
*******
******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
******* To remove nonfree and GPLed code leaving only LGPL code remove the
******* +gpl2 variant.
*******
This build of ${name} includes GPLed code and is therefore licensed under GPL v2 or later.
The following modules are GPLed:
postproc
libx264
libx265
libxvid
To include all nonfree, GPLed and LGPL code use variant +nonfree.
To remove nonfree and GPLed code leaving only LGPL code remove the +gpl2 variant.
"
} else {
notes "
*******
******* This build of ${name} includes no GPLed or nonfree
******* code and is therefore licensed under LGPL v2.1 or later.
*******
This build of ${name} includes no GPLed or nonfree code\
and is therefore licensed under LGPL v2.1 or later.
"
}

Expand Down

0 comments on commit 438edb3

Please sign in to comment.