dev-games/aseprite-1.2.14

Signed-off-by: Albert Diserholt <albert@diserholt.com>

6 files changed, 106 insertions, 60 deletions

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 146e06d..c292878 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,13 +1,13 @@
-AUX aseprite-1.2.12-draw.patch 1536 BLAKE2B bb029bf30e265d9eedba9d66b6e8c6a8f7cebe73c9dd9e7e0ddf3f6a03a285facd8509796a86fe502c9fface66a0e135bf6f22bfc673ef64aec0955c7874cf33 SHA512 56a62b9fde18e7e9df82e8051f3f00a807949c473380e1231ced1632921111bfb83e2683b276a76a074ae02ba842b21021283856c65325b4450cfae4b9b12725
-AUX aseprite-1.2.12-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
 AUX aseprite-1.2.13-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
+AUX aseprite-1.2.14-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
 AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
+AUX aseprite-9999-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
 DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.12-Source.zip 23776131 BLAKE2B 19dc023d4a0444af48dd646e7398c3756f0e5bb7f43eeea887bb23ab53a95972c7d4a81663e672e9ad1f1a21599944dbb1e21ee68e6bbbf06d7cd9f925d66a44 SHA512 57fd85c48e4e0975304e85d5f334bc477d41f546fab0fa363807685de3289cc8f3ed2c9d33dd4729b2c56c60665c75d1d2011d0dd0968c2d033f84772bcbde53
 DIST Aseprite-v1.2.13-Source.zip 23778598 BLAKE2B 328f45159d78fca5f4f814a53cedd5066e64ad9d5e7d1af4b51fffda546c564eaec7c5df7c71b46809f3418ad1d3acb342ca7a546f8c293c821523907cc5399b SHA512 31f05f7155b783f5bc9a9d13d2fb2262b08111b7f66d257305c237046f6c6ae69c39f93f546f0ca3ecdbe14723cad4e0682898e59ce0be2bb1465b83f769a4db
+DIST Aseprite-v1.2.14-Source.zip 23797447 BLAKE2B b4e87a359a829d551b43ce05215f33b6ef6e46db56cd98f5d06f5a01c62efdbe57a75c21c273b5b0e09c8da90d78ef2e2060b7285793a5bd2dd78098b0afbe38 SHA512 d984ac9123744b93ce4dd151491518485f8abce44d8b478416c0f30adb4cd8ec0d8f0e59fc7269528b5e38e115ab012239eb1f0e3427c9ce5e65ac66ddc2115c
 DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
 EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.12.ebuild 1976 BLAKE2B e3e309c857e22a926b0132ba8892a8d36457578c1f96af1a7ebc14fdcfefe6b2cc6175801db82457914fa363102f19e0fa166f1624d437906206664cb129b973 SHA512 3ca347cfb6f8674d38fa29e5e3d63a652d0811fc0d5f6af4d5011ef360ad61ab8377eec411fe8d544d6480b93aa948be6d28635281cdc8e84a5f23e2bf3e9d34
 EBUILD aseprite-1.2.13.ebuild 1946 BLAKE2B 834aad940270ca648078ea1269d2930e4b520f2bdcbdbcc4003665b51f334cece4c96d022e3baff5f17dd1ea27470c6a87291af64c1bf3af3489bc258ccfeeaa SHA512 3800fd3e40116ad8cf4b6bc945566d7d20ba4ae9c3e017593718ae798e86ed690e204dc28c937fb9c50e077955b6a8984fd6554a38e3ac498f11ffb4c711995f
+EBUILD aseprite-1.2.14.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
 EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
-EBUILD aseprite-9999.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
+EBUILD aseprite-9999.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
diff --git a/dev-games/aseprite/aseprite-1.2.12.ebuild b/dev-games/aseprite/aseprite-1.2.14.ebuild
index f9e6c0c..9eff062 100644
--- a/dev-games/aseprite/aseprite-1.2.12.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.14.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.aseprite.org"
 LICENSE="Proprietary"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" "${FILESDIR}/${P}-draw.patch" )
+PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
@@ -65,7 +65,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_UPDATER=OFF
 		-DFULLSCREEN_PLATFORM=ON
-		-DBUILD_GMOCK=OFF
 		-DUSE_SHARED_CMARK=ON
 		-DUSE_SHARED_CURL=ON
 		-DUSE_SHARED_GIFLIB=ON
diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
index 92c9b8b..9eff062 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 
 PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
 
-if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
+if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aseprite/aseprite"
 	EGIT_BRANCH="master"
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
 		EGIT_COMMIT="v${PV/_/-}"
 	fi
 else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${PN^}-v${PV//_/-}-Source.zip"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}"
 fi
@@ -28,23 +28,24 @@ fi
 IUSE="
 	debug
 	memleak
-	webp
-	system-allegro"
+	webp"
 
 RDEPEND="
 	app-arch/libarchive
 	app-text/cmark
+	dev-libs/expat
 	dev-libs/tinyxml
-	system-allegro? ( media-libs/allegro:0[X,png] )
+	=dev-games/aseprite-skia-9999-r71[debug=]
 	media-libs/freetype:2
 	>=media-libs/giflib-5.0
+	media-libs/fontconfig
 	media-libs/libpng:0
 	webp? ( !!media-libs/libwebp )
 	net-misc/curl
+	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/jpeg:=
 	x11-libs/libX11
-	x11-libs/libXxf86dga
 	x11-libs/pixman"
 DEPEND="$RDEPEND
 	app-arch/unzip"
@@ -56,13 +57,6 @@ DOCS=( EULA.txt
 
 src_prepare() {
 	cmake-utils_src_prepare
-
-	if use system-allegro; then
-		ewarn "system-allegro is enabled. It has know issues which are solved"
-		ewarn "in the bundled version:"
-		ewarn " * You will not be able to resize the window."
-		ewarn " * You will have problems adding HSV colours on non-English systems."
-	fi
 }
 
 src_configure() {
@@ -71,7 +65,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_UPDATER=OFF
 		-DFULLSCREEN_PLATFORM=ON
-		-DBUILD_GMOCK=OFF
 		-DUSE_SHARED_CMARK=ON
 		-DUSE_SHARED_CURL=ON
 		-DUSE_SHARED_GIFLIB=ON
@@ -79,14 +72,14 @@ src_configure() {
 		-DUSE_SHARED_ZLIB=ON
 		-DUSE_SHARED_LIBARCHIVE=ON
 		-DUSE_SHARED_LIBPNG=ON
-		-DUSE_SHARED_LIBLOADPNG=OFF # Does not exist in the main tree
 		-DUSE_SHARED_TINYXML=ON
 		-DUSE_SHARED_PIXMAN=ON
 		-DUSE_SHARED_FREETYPE=ON
 		-DUSE_SHARED_HARFBUZZ=ON
-		-DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
 		-DWITH_WEBP_SUPPORT="$(usex webp)"
 		-DENABLE_MEMLEAK="$(usex memleak)"
+		-DSKIA_DIR="/var/lib/aseprite-skia"
+		-DSKIA_OUT_DIR="/var/lib/aseprite-skia/out/Release"
 	)
 
 	cmake-utils_src_configure
diff --git a/dev-games/aseprite/files/aseprite-1.2.12-draw.patch b/dev-games/aseprite/files/aseprite-1.2.12-draw.patch
deleted file mode 100644
index 44b4bef..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.12-draw.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-v1.2.12.1 patch
-
-From 86ffa37fdd2b3267f5ccbdc29b592b208f15052d Mon Sep 17 00:00:00 2001
-From: David Capello <david@igarastudio.com>
-Date: Tue, 11 Jun 2019 10:42:41 -0300
-Subject: [PATCH] Fix rendering bug with new engine and zoom out (canvas is not
- updated correctly)
-
----
- src/app/ui/editor/editor.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
-index dc8715315..0bdaf4b3b 100644
---- a/src/app/ui/editor/editor.cpp
-+++ b/src/app/ui/editor/editor.cpp
-@@ -668,6 +668,20 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& sprite
-     }
- 
-     if (tmp->nativeHandle()) {
-+      if (newEngine) {
-+        // Without doing something on the "tmp" surface before (like
-+        // just drawing a pixel), we get a strange behavior where
-+        // pixels are not updated correctly on the editor (e.g. when
-+        // zoom < 100%). I didn't have enough time to investigate this
-+        // issue yet, but this is a partial fix/hack.
-+        //
-+        // TODO review why do we need to do this, it looks like some
-+        //      internal state of a SkCanvas or SkBitmap thing is
-+        //      updated after this, because convert_image_to_surface()
-+        //      will overwrite these pixels anyway.
-+        tmp->drawRect(gfx::rgba(0, 0, 0, 255), gfx::Rect(0, 0, 1, 1));
-+      }
-+
-       convert_image_to_surface(rendered.get(), m_sprite->palette(m_frame),
-                                tmp, 0, 0, 0, 0, rc2.w, rc2.h);
- 
diff --git a/dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.14-system_libarchive.patch
index 467b5b1..467b5b1 100644
--- a/dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.14-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch b/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch
new file mode 100644
index 0000000..467b5b1
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch
@@ -0,0 +1,91 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dae638be8..dd5d17794 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,6 +64,7 @@ option(USE_SHARED_CURL    "Use your installed copy of curl" off)
+ option(USE_SHARED_GIFLIB  "Use your installed copy of giflib" off)
+ 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_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
+ option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
+ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+@@ -193,6 +194,15 @@ else()
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})
+ 
++# libarchive
++if(USE_SHARED_LIBARCHIVE)
++  find_library(ARCHIVE_LIBRARIES NAMES archive)
++  find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
++else()
++  add_definitions(-DLIBARCHIVE_STATIC)
++  set(ARCHIVE_LIBRARIES archive_static)
++endif()
++
+ # libpng
+ if(USE_SHARED_LIBPNG)
+   find_package(PNG REQUIRED)
+@@ -294,7 +304,7 @@ if(USE_SHARED_CMARK)
+ else()
+   add_definitions(-DCMARK_STATIC_DEFINE)
+   set(CMARK_LIBRARIES libcmark_static)
+-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/cmark)
++  include_directories(${CMARK_DIR})
+ endif()
+ 
+ if(REQUIRE_CURL)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index a9e80d73c..619acac92 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -82,9 +82,6 @@ if(WITH_WEBP_SUPPORT)
+   add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
+ endif()
+ 
+-# libarchive definitions
+-add_definitions(-DLIBARCHIVE_STATIC)
+-
+ ######################################################################
+ # app-lib target
+ 
+@@ -551,7 +548,7 @@ target_link_libraries(app-lib
+   ${FREETYPE_LIBRARIES}
+   ${HARFBUZZ_LIBRARIES}
+   json11
+-  archive_static
++  ${ARCHIVE_LIBRARIES}
+   fmt
+   tinyexpr)
+ 
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 596ffa2e4..977816439 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -113,15 +113,17 @@ endif()
+ add_subdirectory(json11)
+ 
+ # libarchive
+-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
+-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
+-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
+-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
+-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
+-add_subdirectory(libarchive)
+-target_include_directories(archive_static INTERFACE
+-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++if(NOT USE_SHARED_LIBARCHIVE)
++  set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
++  set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
++  set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
++  set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
++  set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
++  set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
++  add_subdirectory(libarchive)
++  target_include_directories(archive_static INTERFACE
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++endif()
+ 
+ # benchmark
+ if(ENABLE_BENCHMARKS)