From: "Albert Diserholt" <albert@diserholt.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/, dev-games/aseprite/files/
Date: Wed, 19 Jun 2019 09:31:05 +0000 (UTC) [thread overview]
Message-ID: <1560936641.ffbffc2e9fb80e8123c266f1b0e277375990b6de.albert@gentoo> (raw)
commit: ffbffc2e9fb80e8123c266f1b0e277375990b6de
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Wed Jun 19 09:26:42 2019 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Wed Jun 19 09:30:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=ffbffc2e
Added aseprite-1.2.12(.1)
Removed some old versions.
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 14 +--
...eprite-1.2.11.ebuild => aseprite-1.2.12.ebuild} | 2 +-
dev-games/aseprite/aseprite-1.2.5.ebuild | 109 ---------------------
dev-games/aseprite/aseprite-1.2.6.ebuild | 109 ---------------------
dev-games/aseprite/aseprite-1.2.7.2.ebuild | 109 ---------------------
.../aseprite/files/aseprite-1.2.12-draw.patch | 37 +++++++
...tch => aseprite-1.2.12-system_libarchive.patch} | 0
.../files/aseprite-1.2.7.2-system_libarchive.patch | 87 ----------------
8 files changed, 42 insertions(+), 425 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 9272a43..1b491ec 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,16 +1,10 @@
-AUX aseprite-1.2.11-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
-AUX aseprite-1.2.7.2-system_libarchive.patch 3268 BLAKE2B 1f2b40321cfa6c7f973abf8adf467a49d2259262ed217e956a3002abf3e830fc97fc5414e36465fae8e8327dcf2c9497945961bdda8e7885e9f683027f39e5a6 SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce
+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.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.11-Source.zip 23751460 BLAKE2B 0ebbcd27dc004dbb42982dccf899786cd635e9c300c4c9d5d3eb28d5c4e33ba366dc52217f5dd78dcfd966531a07be1bd5e1b4b351292af7a43dbb2d96c7e7b5 SHA512 94e538b26d3ea0a6444c0dac92dc07154d26d4fb96f91735982637c13e008885b3e8fda310d73e5f6aa4384fe2f5c9e318587a048ebade1ca6d34f028276edc2
-DIST Aseprite-v1.2.5-Source.zip 21167203 BLAKE2B e5630b093d0a0df54f9f5704d7a40aaa8f409b1c2a7aad5ad358d1eb735017f82f102c22d543f1945c1e8a74055d4da422aebeb13e03e10ccada0a21721d9576 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877
-DIST Aseprite-v1.2.6-Source.zip 20560401 BLAKE2B eed9de0b05f40c42396ed92d08bac5badf3f21f206d96de0b55890c3f105258534f841a0af09648884899960eafd5b63623ab40f6e878154bdfa2a454eab830a SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418
-DIST Aseprite-v1.2.7.2-Source.zip 20599047 BLAKE2B d5150b99aa6343a60921212c4edddd06cc1e90e9f4e487fbc37e66b2475a5a53eedbfc4ac10f72a2843f4f8b67ee5ce42a677d2a72506f999c11c10de84fa478 SHA512 6f10793a82862c862a8b95010f14617d18367a7a24c554530661dd4218d89b50b1c43d10676bf2a66499b1403bc66cc1d557573a1a4850e1ed07353cf7a11286
+DIST Aseprite-v1.2.12-Source.zip 23776131 BLAKE2B 19dc023d4a0444af48dd646e7398c3756f0e5bb7f43eeea887bb23ab53a95972c7d4a81663e672e9ad1f1a21599944dbb1e21ee68e6bbbf06d7cd9f925d66a44 SHA512 57fd85c48e4e0975304e85d5f334bc477d41f546fab0fa363807685de3289cc8f3ed2c9d33dd4729b2c56c60665c75d1d2011d0dd0968c2d033f84772bcbde53
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.11.ebuild 1946 BLAKE2B 834aad940270ca648078ea1269d2930e4b520f2bdcbdbcc4003665b51f334cece4c96d022e3baff5f17dd1ea27470c6a87291af64c1bf3af3489bc258ccfeeaa SHA512 3800fd3e40116ad8cf4b6bc945566d7d20ba4ae9c3e017593718ae798e86ed690e204dc28c937fb9c50e077955b6a8984fd6554a38e3ac498f11ffb4c711995f
-EBUILD aseprite-1.2.5.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
-EBUILD aseprite-1.2.6.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
-EBUILD aseprite-1.2.7.2.ebuild 2908 BLAKE2B bf5176a5ccfca118b59eec443c887438c0c639d4d58a1daa03f033469d0470a96fe3e63d23dc79df680521e953cdc444d955e803c19fd0f709e10fb7315cfcdc SHA512 54aae3c01062800b68819a460c922709bc3065b3a85182f51157583920917d35f756ec65672ada20b47a8877d7d2f2f89b64b3a83171bb9a02d0f1e82bd65a2b
+EBUILD aseprite-1.2.12.ebuild 1976 BLAKE2B e3e309c857e22a926b0132ba8892a8d36457578c1f96af1a7ebc14fdcfefe6b2cc6175801db82457914fa363102f19e0fa166f1624d437906206664cb129b973 SHA512 3ca347cfb6f8674d38fa29e5e3d63a652d0811fc0d5f6af4d5011ef360ad61ab8377eec411fe8d544d6480b93aa948be6d28635281cdc8e84a5f23e2bf3e9d34
EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
EBUILD aseprite-9999.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
diff --git a/dev-games/aseprite/aseprite-1.2.11.ebuild b/dev-games/aseprite/aseprite-1.2.12.ebuild
similarity index 95%
rename from dev-games/aseprite/aseprite-1.2.11.ebuild
rename to dev-games/aseprite/aseprite-1.2.12.ebuild
index 0e544a9..f9e6c0c 100644
--- a/dev-games/aseprite/aseprite-1.2.11.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.aseprite.org"
LICENSE="Proprietary"
SLOT="0"
-PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
+PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" "${FILESDIR}/${P}-draw.patch" )
if [[ ${PV} = 9999* ]]; then
inherit git-r3
diff --git a/dev-games/aseprite/aseprite-1.2.5.ebuild b/dev-games/aseprite/aseprite-1.2.5.ebuild
deleted file mode 100644
index 1a74919..0000000
--- a/dev-games/aseprite/aseprite-1.2.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="http://www.aseprite.org"
-LICENSE="Proprietary"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-system_libarchive.patch" )
-
-if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/aseprite/aseprite"
- EGIT_BRANCH="master"
- if [[ ${PV} != 9999* ]]; then
- EGIT_COMMIT="v${PV/_/-}"
- fi
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}"
-fi
-
-IUSE="
- debug
- memleak
- webp
- system-allegro
- +system-curl
- +system-giflib
- +system-jpeg
- +system-libpng
- +system-libwebp
- +system-pixman
- +system-tinyxml
- +system-zlib"
-
-RDEPEND="
- app-arch/libarchive
- app-text/cmark
- system-tinyxml? ( dev-libs/tinyxml )
- system-allegro? ( media-libs/allegro:0[X,png] )
- system-giflib? ( >=media-libs/giflib-5.0 )
- system-libpng? ( media-libs/libpng:0 )
- webp? ( system-libwebp? ( media-libs/libwebp ) )
- system-curl? ( net-misc/curl )
- system-zlib? ( sys-libs/zlib )
- system-jpeg? ( virtual/jpeg:= )
- x11-libs/libX11
- x11-libs/libXxf86dga
- system-pixman? ( x11-libs/pixman )"
-DEPEND="$RDEPEND
- app-arch/unzip"
- #dev-cpp/gtest
-
-DOCS=( EULA.txt
- docs/ase-file-specs.md
- docs/LICENSES.md
- README.md )
-
-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() {
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
-
- local mycmakeargs=(
- -DCURL_STATICLIB=OFF
- -DENABLE_UPDATER=OFF
- -DFULLSCREEN_PLATFORM=ON
- -DENABLE_TESTS=OFF
- -DBUILD_GMOCK=OFF
- $(use system-pixman && echo \
- -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
- -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
- -DUSE_SHARED_CMARK=ON
- -DUSE_SHARED_CURL="$(usex system-curl)"
- -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
- -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
- -DUSE_SHARED_LIBARCHIVE=ON
- -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
- -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
- -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
- -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
- -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
- -DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
- -DWITH_WEBP_SUPPORT="$(usex webp)"
- -DENABLE_MEMLEAK="$(usex memleak)"
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "Aseprite is for personal use only. You may not distribute it."
-}
diff --git a/dev-games/aseprite/aseprite-1.2.6.ebuild b/dev-games/aseprite/aseprite-1.2.6.ebuild
deleted file mode 100644
index 1a74919..0000000
--- a/dev-games/aseprite/aseprite-1.2.6.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="http://www.aseprite.org"
-LICENSE="Proprietary"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-system_libarchive.patch" )
-
-if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/aseprite/aseprite"
- EGIT_BRANCH="master"
- if [[ ${PV} != 9999* ]]; then
- EGIT_COMMIT="v${PV/_/-}"
- fi
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}"
-fi
-
-IUSE="
- debug
- memleak
- webp
- system-allegro
- +system-curl
- +system-giflib
- +system-jpeg
- +system-libpng
- +system-libwebp
- +system-pixman
- +system-tinyxml
- +system-zlib"
-
-RDEPEND="
- app-arch/libarchive
- app-text/cmark
- system-tinyxml? ( dev-libs/tinyxml )
- system-allegro? ( media-libs/allegro:0[X,png] )
- system-giflib? ( >=media-libs/giflib-5.0 )
- system-libpng? ( media-libs/libpng:0 )
- webp? ( system-libwebp? ( media-libs/libwebp ) )
- system-curl? ( net-misc/curl )
- system-zlib? ( sys-libs/zlib )
- system-jpeg? ( virtual/jpeg:= )
- x11-libs/libX11
- x11-libs/libXxf86dga
- system-pixman? ( x11-libs/pixman )"
-DEPEND="$RDEPEND
- app-arch/unzip"
- #dev-cpp/gtest
-
-DOCS=( EULA.txt
- docs/ase-file-specs.md
- docs/LICENSES.md
- README.md )
-
-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() {
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
-
- local mycmakeargs=(
- -DCURL_STATICLIB=OFF
- -DENABLE_UPDATER=OFF
- -DFULLSCREEN_PLATFORM=ON
- -DENABLE_TESTS=OFF
- -DBUILD_GMOCK=OFF
- $(use system-pixman && echo \
- -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
- -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
- -DUSE_SHARED_CMARK=ON
- -DUSE_SHARED_CURL="$(usex system-curl)"
- -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
- -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
- -DUSE_SHARED_LIBARCHIVE=ON
- -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
- -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
- -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
- -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
- -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
- -DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
- -DWITH_WEBP_SUPPORT="$(usex webp)"
- -DENABLE_MEMLEAK="$(usex memleak)"
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "Aseprite is for personal use only. You may not distribute it."
-}
diff --git a/dev-games/aseprite/aseprite-1.2.7.2.ebuild b/dev-games/aseprite/aseprite-1.2.7.2.ebuild
deleted file mode 100644
index 1fb7642..0000000
--- a/dev-games/aseprite/aseprite-1.2.7.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="http://www.aseprite.org"
-LICENSE="Proprietary"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
-
-if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/aseprite/aseprite"
- EGIT_BRANCH="master"
- if [[ ${PV} != 9999* ]]; then
- EGIT_COMMIT="v${PV/_/-}"
- fi
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}"
-fi
-
-IUSE="
- debug
- memleak
- webp
- system-allegro
- +system-curl
- +system-giflib
- +system-jpeg
- +system-libpng
- +system-libwebp
- +system-pixman
- +system-tinyxml
- +system-zlib"
-
-RDEPEND="
- app-arch/libarchive
- app-text/cmark
- system-tinyxml? ( dev-libs/tinyxml )
- system-allegro? ( media-libs/allegro:0[X,png] )
- system-giflib? ( >=media-libs/giflib-5.0 )
- system-libpng? ( media-libs/libpng:0 )
- webp? ( system-libwebp? ( media-libs/libwebp ) )
- system-curl? ( net-misc/curl )
- system-zlib? ( sys-libs/zlib )
- system-jpeg? ( virtual/jpeg:= )
- x11-libs/libX11
- x11-libs/libXxf86dga
- system-pixman? ( x11-libs/pixman )"
-DEPEND="$RDEPEND
- app-arch/unzip"
- #dev-cpp/gtest
-
-DOCS=( EULA.txt
- docs/ase-file-specs.md
- docs/LICENSES.md
- README.md )
-
-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() {
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
-
- local mycmakeargs=(
- -DCURL_STATICLIB=OFF
- -DENABLE_UPDATER=OFF
- -DFULLSCREEN_PLATFORM=ON
- -DENABLE_TESTS=OFF
- -DBUILD_GMOCK=OFF
- $(use system-pixman && echo \
- -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
- -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
- -DUSE_SHARED_CMARK=ON
- -DUSE_SHARED_CURL="$(usex system-curl)"
- -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
- -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
- -DUSE_SHARED_LIBARCHIVE=ON
- -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
- -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
- -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
- -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
- -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
- -DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
- -DWITH_WEBP_SUPPORT="$(usex webp)"
- -DENABLE_MEMLEAK="$(usex memleak)"
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "Aseprite is for personal use only. You may not distribute it."
-}
diff --git a/dev-games/aseprite/files/aseprite-1.2.12-draw.patch b/dev-games/aseprite/files/aseprite-1.2.12-draw.patch
new file mode 100644
index 0000000..44b4bef
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.12-draw.patch
@@ -0,0 +1,37 @@
+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.11-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.11-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch
deleted file mode 100644
index 8959c10..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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_LIBWEBP "Use your installed copy of libwebp" 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_BINARY_DIR}/third_party/cmark)
-+ include_directories(${CMARK_DIR})
- endif()
-
- if(USE_SHARED_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)
-
- if(ENABLE_SCRIPTING)
-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,13 +113,15 @@ 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)")
--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)")
-+ add_subdirectory(libarchive)
-+ target_include_directories(archive_static INTERFACE
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
-+endif()
-
- # benchmark
- if(ENABLE_BENCHMARKS)
next reply other threads:[~2019-06-19 9:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 9:31 Albert Diserholt [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-29 14:21 [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/, dev-games/aseprite/files/ Albert Diserholt
2021-07-17 16:17 Albert Diserholt
2020-08-29 8:53 Albert Diserholt
2020-06-01 6:52 Albert Diserholt
2019-07-13 10:11 Albert Diserholt
2018-08-03 5:46 Albert Diserholt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560936641.ffbffc2e9fb80e8123c266f1b0e277375990b6de.albert@gentoo \
--to=albert@diserholt.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox