<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b736e618da812b74a2750eeff17b68370d1f3980">https://github.com/macports/macports-ports/commit/b736e618da812b74a2750eeff17b68370d1f3980</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 b736e618da8 Aseprite: Update to 1.3.2
</span>b736e618da8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b736e618da812b74a2750eeff17b68370d1f3980
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 11 15:19:30 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.3.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66140
</span>---
graphics/Aseprite/Portfile | 74 ++++++++++++----------
graphics/Aseprite/files/DEPS.patch | 38 +++++++++++
.../Aseprite/files/USE_SHARED_LIBARCHIVE.patch | 67 ++++++++++++++++++++
graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch | 56 ++++++----------
graphics/Aseprite/files/git-sync-deps.patch | 18 ++++++
5 files changed, 184 insertions(+), 69 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 2c212625578..dc36760960b 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;'>@@ -42,12 +42,12 @@ license Restrictive
</span> # Aseprite (official or compiled). About the EULA is that you cannot
# compile Aseprite for commercial purposes (e.g. resell it)."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup aseprite aseprite 1.2.37 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
# Aseprite doesn't specify which commit of depot_tools we should use, so I'm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# using the latest commit at the time this version of Aseprite was released.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set depot_tools_commit f05fcf7051e12e5b561b8811e299096f332157f7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# using the most recent commit before this version of Aseprite was tagged.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depot_tools_commit cccca95d8fca2274aee9c6550e63d6787d648694
</span>
# Latest commit in skia's aseprite-m102 branch at the time this version of
# Aseprite was released (see INSTALL.md).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +59,9 @@ distname ${name}-v${version}-Source
</span> use_zip yes
checksums ${distfiles} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5a290163548d287602631743a47088de99bb06ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 74989ac5e57e4cba9cc16212d81f058c3aff70749d929e2e35eb38688c994c9e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 61977600 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4e881c8007a2e75b10ed31e5ce95f93f2853b3a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0246b18ff77d4c4e813c7f40207bfbd1387813b82d57900cde869dab370a26cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64151421 \
</span> skia-${skia_commit}.tar.gz \
rmd160 b7649f5478916cf79567f2bedd70cf1b361fd723 \
sha256 6924ab75b5ea2b7390d22ad1710b8e6586d6068aec79457362350820bf10aaf3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +75,8 @@ distfiles ${main_distfile}:main \
</span>
extract.only ${main_distfile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites [lindex ${master_sites} 0]:main \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/aseprite/skia/archive/${skia_commit}:skia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.master_sites}:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/${github.author}/skia/archive/${skia_commit}:skia
</span>
description animated sprite editor & pixel art tool
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,6 +111,7 @@ depends_lib-append port:bzip2 \
</span> path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
path:lib/pkgconfig/harfbuzz-icu.pc:harfbuzz-icu \
path:lib/pkgconfig/icu-uc.pc:icu \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span> port:libb2 \
port:libdeflate \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,9 +127,6 @@ depends_lib-append port:bzip2 \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: Use MacPorts libarchive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/aseprite/aseprite/issues/1681
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # TODO: Use MacPorts lua, after updating it to 5.4
# or figure out how to prevent this build from seeing it.
conflicts_build lua lua50
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,6 +161,10 @@ post-fetch {
</span> "
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "The extract, configure, and build phases may each take several minutes to complete."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
system -W ${workpath} \
"tar -xzf [shellescape ${distpath}/${skia_distfile}]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,15 +180,22 @@ post-extract {
</span> # depot_tools runs "python3".
ln -s ${configure.python} ${workpath}/depot_tools/python3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid fetching unnecessary dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "patch -bp0 < [shellescape ${filespath}/DEPS.patch]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid fetching unnecessary data for necessary dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "patch -bp0 < [shellescape ${filespath}/git-sync-deps.patch]"
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # to the one used by the MoltenVK port. Many of them aren't even needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # since we're using MacPorts deps rather than bundled versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to the one formerly used by the MoltenVK port. Many of them aren't even
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needed since we're using MacPorts deps rather than bundled versions.
</span> system -W ${workpath}/skia "${configure.python} tools/git-sync-deps"
}
patch.dir ${workpath}
patchfiles prefix.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_SHARED_LIBARCHIVE.patch \
</span> USE_SHARED_LIBWEBP.patch
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,9 +226,9 @@ pre-configure {
</span> set skia_cpu ${build_arch}
}
}
<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:#e0ffe0;'>+ # Using is_official_build=true and -frtti as suggested here:
</span> # https://github.com/aseprite/skia#skia-on-macos
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is_official_build=true also turns on the use of system libraries.
</span> lappend skia_cflags {*}${configure.cflags} \
{*}${archflags}
lappend skia_cxxflags {*}${configure.cxxflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,6 +287,7 @@ configure.args -DENABLE_BZip2=ON \
</span> -DUSE_SHARED_GIFLIB=YES \
-DUSE_SHARED_HARFBUZZ=YES \
-DUSE_SHARED_JPEGLIB=YES \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SHARED_LIBARCHIVE=YES \
</span> -DUSE_SHARED_LIBPNG=YES \
-DUSE_SHARED_LIBWEBP=YES \
-DUSE_SHARED_PIXMAN=YES \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,19 +307,12 @@ set extension_icon data/icons/ext256.png
</span> destroot {
copy ${worksrcpath}/data ${destroot}${applications_dir}/${app.name}.app/Contents/Resources
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove unneeded files installed by the bundled copies of libarchive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and json11. https://github.com/aseprite/aseprite/issues/1602
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove unneeded files installed by the bundled json11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/aseprite/aseprite/issues/1602
</span> foreach f {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/bsdcat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/bsdcpio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin/bsdtar
</span> include/json11.hpp
lib/libjson11.a
lib/pkgconfig/json11.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/pkgconfig/libarchive.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share/man/man1/bsdcat.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share/man/man1/bsdcpio.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share/man/man1/bsdtar.1
</span> } {
delete ${destroot}${prefix}/${f}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -333,20 +336,27 @@ minimum_xcodeversions {15 8}
</span> # https://aseprite.org/faq/#if-aseprite-source-code-is-available-how-is-that-you-are-selling-it
notes "
${name} is free for personal and commercial use provided you compile it\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-from source, which is what happens when MacPorts installs it. The\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MacPorts project does not distribute binaries of ${name}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+from source and that you do not redistribute the compiled binary. The\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MacPorts project does not distribute binaries of ${name}; instead, it\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiles ${name} from source on your system, which is why it takes some\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+time.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-To show your support for and appreciation of the developers and to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-avoid the need to compile it from source and instead receive an\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-official binary from the developers, please purchase a license:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To support the developers and to show your appreciation, and to avoid\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the need to compile ${name} from source and instead receive an official\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+binary from the developers, please purchase a license:
</span>
${homepage}/#buy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Please read and agree to the end user license agreement:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+By using ${name} you agree to be bound by the terms of the end user\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license agreement which you can read here:
</span>
${github.raw}/${github.tag_prefix}${github.version}/EULA.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-And check the frequently-asked questions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Documentation is available:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${homepage}/docs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+You may also find it helpful to read the frequently-asked questions:
</span>
${homepage}/faq/
"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/DEPS.patch b/graphics/Aseprite/files/DEPS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9ac2dc2cc9f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/DEPS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't download source for libraries we'll use from MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- skia/DEPS.orig 2022-05-24 18:06:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ skia/DEPS 2022-08-21 02:26:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "buildtools" : "https://chromium.googlesource.com/chromium/src/buildtools.git@b138e6ce86ae843c42a1a08f37903207bebcca75",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@8718783526307a3fbb35d4c1ad4e8101262a0d73",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/brotli" : "https://skia.googlesource.com/external/github.com/google/brotli.git@e61745a6b7add50d380cfd7d3883dd6c62fc2c71",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/d3d12allocator" : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,18 +22,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/emsdk" : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@fc645b7626ebf86530dbd82fbece74d457e7ae07",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/freetype" : "https://github.com/aseprite/freetype2.git@f122349b937d7d2b0f8b72f46f60a082ca6006db",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@8d1b000a3edc90c12267b836b4ef3f81c0e53edc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/highway" : "https://chromium.googlesource.com/external/github.com/google/highway.git@424360251cdcfc314cfc528f53c872ecd63af0f0",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@55d35d8387c15bf0cfd71861df67af8cfbda7456",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/libgifcodec" : "https://skia.googlesource.com/libgifcodec@fd59fa92a0c86788dcdd84d091e1ce81eda06a77",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/libjpeg-turbo" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@22f1a22c99e9dde8cd3c72ead333f425c5a7aa77",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/libjxl" : "https://chromium.googlesource.com/external/gitlab.com/wg1/jpeg-xl.git@a205468bc5d3a353fb15dae2398a101dff52f2d3",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@386707c6d19b974ca2e3db7f5c61873813c6fe44",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@20ef03ee351d4ff03fc5ff3ec4804a879d1b9d5c",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/oboe" : "https://chromium.googlesource.com/external/github.com/google/oboe.git@b02a12d1dd821118763debec6b83d00a8a0ee419",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/opengl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry@14b80ebeab022b2c78f84a573f01028c96075553",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@bb217acdca1cc0c16b704669dd6f91a1b509c406",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +41,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/vulkan-tools" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools@fa288188b574d9eee31cd52c5432780b6a46a412",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@600cd96cf47788ee3a74b40a6028b035c9fd6a61",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c876c8f87101c5a75f6014b0f832499afeb65b73",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "../src": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "url": "https://chromium.googlesource.com/chromium/src.git@91a2fd838a6a7ee5c442f5b61945e3cdc6c78649",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch b/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88d6a3b9866
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add option to use shared libarchive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/aseprite/aseprite/issues/1681
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/aseprite/aseprite/pull/2535
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2023-11-28 16:57:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2024-01-11 14:12:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,2 +44,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,6 +209,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${ZLIB_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(USE_SHARED_LIBARCHIVE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(LibArchive REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LibArchive_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LibArchive_LIBRARIES archive_static)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LibArchive_INCLUDE_DIRS $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions(-DLIBARCHIVE_STATIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(${LibArchive_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libpng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(USE_SHARED_LIBPNG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(PNG REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/app/CMakeLists.txt.orig 2023-11-28 16:57:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/app/CMakeLists.txt 2024-01-11 14:12:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,9 +95,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DENABLE_PSD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# libarchive definitions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_definitions(-DLIBARCHIVE_STATIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ######################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # app-lib target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -739,8 +736,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ZLIB_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${FREETYPE_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${HARFBUZZ_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LibArchive_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ json11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- archive_static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tinyexpr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qoi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2023-04-19 15:39:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2023-04-19 20:20:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,6 +126,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(json11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT USE_SHARED_LIBARCHIVE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(libarchive)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(archive_static INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # benchmark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_BENCHMARKS)
</span><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 b49e025ea63..e123a1fa58d 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,57 +2,39 @@ 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 2022-01-30 22:50:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2022-01-30 22:51:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,6 +52,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2023-11-28 16:57:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2024-01-11 14:32:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,2 +45,3 @@
</span> option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off)
option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,9 +230,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,6 +329,10 @@
</span>
# libwebp
if(ENABLE_WEBP)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(WEBP_LIBRARIES webp webpdemux libwebpmux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${WEBP_INCLUDE_DIR})
</span> + if(USE_SHARED_LIBWEBP)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_library(WEBP_LIBRARY NAMES webp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_library(WEBPMUX_LIBRARY NAMES webpmux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(WEBP_INCLUDE_DIR NAMES webp/decode.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(WEBPMUX_INCLUDE_DIR NAMES webp/mux.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(WEBPDEMUX_INCLUDE_DIR NAMES webp/demux.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WEBP_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${WEBP_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${WEBPMUX_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${WEBPDEMUX_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include_directories(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${WEBP_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${WEBPMUX_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${WEBPDEMUX_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(WEBP_LIBRARIES NAMES webp REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path(WEBP_INCLUDE_DIR NAMES webp/decode.h REQUIRED)
</span> + else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WEBP_LIBRARIES webp webpdemux libwebpmux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include_directories(${WEBP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use libwebp from Skia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(LAF_BACKEND STREQUAL "skia")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(WEBP_LIBRARIES webp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,6 +343,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WEBP_LIBRARIES webp webpdemux libwebpmux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> + endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${WEBP_INCLUDE_DIR})
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tinyxml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2022-01-30 22:44:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2022-01-30 22:51:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "aseprite libwebp: ${WEBP_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2022-08-02 16:55:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2022-08-21 02:20:19.000000000 -0500
</span> @@ -33,7 +33,7 @@
add_subdirectory(giflib)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if(ENABLE_WEBP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(ENABLE_WEBP AND NOT USE_SHARED_LIBWEBP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_LIBWEBP)
</span> set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/git-sync-deps.patch b/graphics/Aseprite/files/git-sync-deps.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..815acd3f248
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/git-sync-deps.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fetch only the commit we want from each dependency's repository.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- skia/tools/git-sync-deps.orig 2023-04-19 21:10:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ skia/tools/git-sync-deps 2023-04-19 21:17:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,9 +131,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Raises an exception if any calls to git fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not os.path.isdir(directory):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.makedirs(directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subprocess.check_call(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [git, 'clone', '--quiet', '--no-checkout', repo, directory])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- subprocess.check_call([git, 'checkout', '--quiet', commithash],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [git, '-c', 'init.defaultBranch=main', 'init', '-q'], cwd=directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subprocess.check_call([git, 'remote', 'add', 'origin', repo], cwd=directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subprocess.check_call([git, 'fetch', '--depth', '1', 'origin', commithash], cwd=directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subprocess.check_call([git, '-c', 'advice.detachedHead=false', 'checkout', '-q', 'FETCH_HEAD'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cwd=directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if verbose:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status(directory, commithash, True)
</span></pre><pre style='margin:0'>
</pre>