<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/30c029e4ace3c1d068a1c137d05f700dc0f651b6">https://github.com/macports/macports-ports/commit/30c029e4ace3c1d068a1c137d05f700dc0f651b6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 30c029e4ace Aseprite: Update to 1.2.27
</span>30c029e4ace is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 30c029e4ace3c1d068a1c137d05f700dc0f651b6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 19 01:08:59 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.2.27
</span>---
graphics/Aseprite/Portfile | 56 +++++++++++++-----------
graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch | 14 +++---
2 files changed, 38 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/Portfile b/graphics/Aseprite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00f013afe78..82d43854e88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,12 +16,12 @@ maintainers {ryandesign @ryandesign} openmaintainer
</span> # https://github.com/aseprite/aseprite/issues/2266#issuecomment-586600478
license Restrictive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup aseprite aseprite 1.2.25 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.2.27 v
</span> revision 0
# Aseprite doesn't specify which commit of depot_tools we should use, so I'm
# using the latest commit at the time this version of Aseprite was released.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set depot_tools_commit 5664586374b9a80af397354523e93b9ef9333f16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depot_tools_commit efd29f6f5c4ce52cec970b00348a064e608512a7
</span>
# Latest commit in skia's aseprite-m81 branch at the time this version of
# Aseprite was released (see INSTALL.md).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ distname ${name}-v${version}-Source
</span> use_zip yes
checksums ${distfiles} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c9f0501d7358e8205b58bc4d7b38ff0fdb531848 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24487484 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ca317666ff2a3de14ede49a6f193c736d9cfd619 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 541a5c561fe7481cfb6aec80ecc9a8435d8387325ba30c9e3116c3c76ef539d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24507948 \
</span> skia-3043aa83d14f2251f22c068816ceb6759ea3fb61.tar.gz \
rmd160 6b896f8f0fc374256a22713c9b244fbc01dc3c9f \
sha256 368813ce058806a267a3bf157f4b0133fb58ae531c2c38247d6e6a191f3280ff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,16 +57,24 @@ description animated sprite editor & pixel art tool
</span> long_description ${name} is an image editor for creating animated \
sprites and other pixel art.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # TODO: Don't use git to fetch depot_tools or skia's dependencies.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append port:git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract-append port:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set git_dep port:git
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch-append bin:git:git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract-append bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set git_dep bin:git:git
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_fetch-append ${git_dep}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_extract-append ${git_dep} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:bin/pkg-config:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span>
depends_lib-append port:bzip2 \
port:cmark \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +85,7 @@ depends_lib-append port:bzip2 \
</span> port:harfbuzz \
port:harfbuzz-icu \
port:icu \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span> path:lib/pkgconfig/pixman-1.pc:libpixman \
port:libpng \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,11 +147,14 @@ post-extract {
</span> move {*}[glob ${workpath}/[file tail ${submodule}]-*] ${worksrcpath}/${submodule}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depot_tools runs "python3".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.python} ${workpath}/depot_tools/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Fetch skia's dependencies.
# TODO: Fetch these as distfiles instead, maybe using a strategy similar
# to the one used by the MoltenVK port. Many of them aren't even needed
# since we're using MacPorts deps rather than bundled versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/skia "python tools/git-sync-deps"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/skia "${configure.python} tools/git-sync-deps"
</span> }
patch.dir ${workpath}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,22 +182,17 @@ set archflags [get_canonical_archflags]
</span> configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Claiming to be an official build and using -frtti because it is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # suggested here:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/aseprite/skia#skia-on-macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Not using system libjpeg-turbo because MacPorts defaults to jpeg, not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libjpeg-turbo, and they conflict, and skia requires libjpeg-turbo.
</span> switch ${build_arch} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- arm64 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set skia_cpu ${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> x86_64 {
set skia_cpu x64
}
default {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set skia_cpu unsupported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set skia_cpu ${build_arch}
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Claiming to be an official build and using -frtti because it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # suggested here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/aseprite/skia#skia-on-macos
</span> lappend skia_cflags {*}${configure.cflags} \
{*}${archflags}
lappend skia_cxxflags {*}${configure.cxxflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +211,6 @@ pre-configure {
</span> skia_pdf_subset_harfbuzz=true \
skia_use_freetype=true \
skia_use_harfbuzz=true \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_use_system_libjpeg_turbo=false \
</span> target_cpu="${skia_cpu}"
if {${configure.ccache}} {
lappend skia_configure_args \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,16 +224,15 @@ pre-configure {
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Unknown why we have to manually specify the libraries that libskia.a uses.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specify the libraries that libskia.a uses to avoid undefined symbols.
</span> lappend skia_libraries ${workpath}/skia/out/Release/libskia.a \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/libjpeg.dylib \
</span> ${prefix}/lib/libpng.dylib \
${prefix}/lib/libwebp.dylib \
${prefix}/lib/libwebpdemux.dylib \
${prefix}/lib/libwebpmux.dylib \
${prefix}/lib/libz.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't use shared jpeg because MacPorts jpeg is library version 90 which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# conflicts with jpeg-turbo library version 62 that skia uses.
</span> configure.args -DENABLE_BZip2=ON \
-DENABLE_LIBXML2=ON \
-DENABLE_LZMA=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,6 +247,7 @@ configure.args -DENABLE_BZip2=ON \
</span> -DUSE_SHARED_FREETYPE=YES \
-DUSE_SHARED_GIFLIB=YES \
-DUSE_SHARED_HARFBUZZ=YES \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SHARED_JPEGLIB=YES \
</span> -DUSE_SHARED_LIBPNG=YES \
-DUSE_SHARED_LIBWEBP=YES \
-DUSE_SHARED_PIXMAN=YES \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch b/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fe87a499ae5..b93e8fe514a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,9 @@ Bring back the USE_SHARED_LIBWEBP option.
</span> https://github.com/aseprite/aseprite/issues/1699
https://github.com/orivej/aseprite/commit/6e3f74107c40029584c524d7458f5c5674c933c3
https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/CMakeLists.txt.orig 2020-06-17 21:42:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2020-09-22 10:17:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,6 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2021-05-17 17:54:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2021-05-17 17:54:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,7 @@
</span> option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c
</span> option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,9 +220,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -223,9 +224,29 @@
</span>
# libwebp
if(WITH_WEBP_SUPPORT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,9 @@ https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c
</span> endif()
# tinyxml
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2020-06-17 21:42:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2020-09-22 10:17:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2021-04-13 16:40:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2021-05-17 17:54:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span> add_subdirectory(giflib)
endif()
</pre><pre style='margin:0'>
</pre>