Gentoo Archives: gentoo-commits

From: Albert Diserholt <albert@×××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/, dev-games/aseprite/files/, dev-games/aseprite-skia/
Date: Sat, 01 Jun 2019 18:49:41
Message-Id: 1559414421.16d08e7337dd7357ba67b0a97a95aa032b99c4e0.albert@gentoo
1 commit: 16d08e7337dd7357ba67b0a97a95aa032b99c4e0
2 Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
3 AuthorDate: Sat Jun 1 18:36:00 2019 +0000
4 Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
5 CommitDate: Sat Jun 1 18:40:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=16d08e73
7
8 Added aseprite-1.2.11
9
10 It needs a custom-built version of Skia, which has been included here.
11
12 Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
13
14 dev-games/aseprite-skia/Manifest | 1 +
15 .../aseprite-skia/aseprite-skia-9999-r71.ebuild | 77 ++++++++++++++++++
16 dev-games/aseprite/Manifest | 3 +
17 dev-games/aseprite/aseprite-1.2.11.ebuild | 91 ++++++++++++++++++++++
18 .../files/aseprite-1.2.11-system_libarchive.patch | 91 ++++++++++++++++++++++
19 5 files changed, 263 insertions(+)
20
21 diff --git a/dev-games/aseprite-skia/Manifest b/dev-games/aseprite-skia/Manifest
22 new file mode 100644
23 index 0000000..83faa2e
24 --- /dev/null
25 +++ b/dev-games/aseprite-skia/Manifest
26 @@ -0,0 +1 @@
27 +EBUILD aseprite-skia-9999-r71.ebuild 1803 BLAKE2B 07b3ad81ed03d8bf06121dec8a65c588832e01c3aa92c2e3768a8ae0300201540b26a12e3b90b8206ba0ceea9e95603c9b8d7140375a4fd66564daa339bba8ec SHA512 eb173b50767178e15f1870f6a3c40087d7b0bce2f491c73326dd51b1dd7e0e8fb0dc4fe4722da3cb7e9fa192b0347b64bb2bc40af8c4cf72d46d04a2ec9f869e
28
29 diff --git a/dev-games/aseprite-skia/aseprite-skia-9999-r71.ebuild b/dev-games/aseprite-skia/aseprite-skia-9999-r71.ebuild
30 new file mode 100644
31 index 0000000..6be9906
32 --- /dev/null
33 +++ b/dev-games/aseprite-skia/aseprite-skia-9999-r71.ebuild
34 @@ -0,0 +1,77 @@
35 +# Copyright 2019 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +PYTHON_COMPAT=( python2_7 )
41 +
42 +inherit python-any-r1 git-r3
43 +
44 +DESCRIPTION="Skia library for Aseprite"
45 +HOMEPAGE="https://skia.org"
46 +
47 +EGIT_REPO_URI="https://github.com/aseprite/skia"
48 +EGIT_BRANCH="aseprite-m${PR/r/}"
49 +
50 +DEPOT_TOOLS_URI="https://chromium.googlesource.com/chromium/tools/depot_tools.git"
51 +DEPOT_TOOLS_COMMIT="master"
52 +
53 +LICENSE="BSD"
54 +SLOT="0"
55 +KEYWORDS=""
56 +IUSE="debug webp"
57 +
58 +DEPEND="${PYTHON_DEPS}"
59 +RDEPEND="
60 + dev-libs/expat
61 + dev-util/ninja
62 + media-libs/libjpeg-turbo
63 + media-libs/libpng
64 + webp? ( media-libs/libwebp )
65 + sys-libs/zlib"
66 +BDEPEND=""
67 +
68 +src_unpack() {
69 + git-r3_src_unpack
70 +
71 + cd "${S}"
72 + python2.7 tools/git-sync-deps || die "Failed to sync dependencies"
73 +
74 + EGIT_BRANCH="$DEPOT_TOOLS_COMMIT"
75 + git-r3_fetch "$DEPOT_TOOLS_URI"
76 + git-r3_checkout "$DEPOT_TOOLS_URI" depot_tools
77 +}
78 +
79 +src_configure() {
80 + local myskiaargs=(
81 + is_debug=$(usex debug true false)
82 + is_official_build=true
83 + skia_use_system_expat=true
84 + skia_use_system_icu=false # Samples won't build
85 + skia_use_system_libjpeg_turbo=true
86 + skia_use_system_libpng=true
87 + skia_use_system_libwebp=$(usex webp true false)
88 + skia_use_system_zlib=true
89 + )
90 +
91 + cd "${S}"
92 + export PATH="$PATH:${S}/depot_tools"
93 + gn gen out/Release --args="${myskiaargs[*]}" || die "Failed to configure skia"
94 +}
95 +
96 +src_compile() {
97 + ninja -C "out/$(usex debug Debug Release)" skia || die "Failed to compile skia"
98 +}
99 +
100 +src_install() {
101 + insinto /var/lib/aseprite-skia/
102 + doins -r include
103 + insinto /var/lib/aseprite-skia/src
104 + doins -r src/gpu
105 + insinto /var/lib/aseprite-skia/third_party
106 + doins -r third_party/skcms
107 +
108 + insinto /var/lib/aseprite-skia/out/$(usex debug Debug Release)
109 + dodir /var/lib/aseprite-skia/out/$(usex debug Debug Release)
110 + newins out/*/libskia.a libskia.a
111 +}
112
113 diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
114 index b362ff0..9272a43 100644
115 --- a/dev-games/aseprite/Manifest
116 +++ b/dev-games/aseprite/Manifest
117 @@ -1,11 +1,14 @@
118 +AUX aseprite-1.2.11-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
119 AUX aseprite-1.2.7.2-system_libarchive.patch 3268 BLAKE2B 1f2b40321cfa6c7f973abf8adf467a49d2259262ed217e956a3002abf3e830fc97fc5414e36465fae8e8327dcf2c9497945961bdda8e7885e9f683027f39e5a6 SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce
120 AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
121 DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
122 +DIST Aseprite-v1.2.11-Source.zip 23751460 BLAKE2B 0ebbcd27dc004dbb42982dccf899786cd635e9c300c4c9d5d3eb28d5c4e33ba366dc52217f5dd78dcfd966531a07be1bd5e1b4b351292af7a43dbb2d96c7e7b5 SHA512 94e538b26d3ea0a6444c0dac92dc07154d26d4fb96f91735982637c13e008885b3e8fda310d73e5f6aa4384fe2f5c9e318587a048ebade1ca6d34f028276edc2
123 DIST Aseprite-v1.2.5-Source.zip 21167203 BLAKE2B e5630b093d0a0df54f9f5704d7a40aaa8f409b1c2a7aad5ad358d1eb735017f82f102c22d543f1945c1e8a74055d4da422aebeb13e03e10ccada0a21721d9576 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877
124 DIST Aseprite-v1.2.6-Source.zip 20560401 BLAKE2B eed9de0b05f40c42396ed92d08bac5badf3f21f206d96de0b55890c3f105258534f841a0af09648884899960eafd5b63623ab40f6e878154bdfa2a454eab830a SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418
125 DIST Aseprite-v1.2.7.2-Source.zip 20599047 BLAKE2B d5150b99aa6343a60921212c4edddd06cc1e90e9f4e487fbc37e66b2475a5a53eedbfc4ac10f72a2843f4f8b67ee5ce42a677d2a72506f999c11c10de84fa478 SHA512 6f10793a82862c862a8b95010f14617d18367a7a24c554530661dd4218d89b50b1c43d10676bf2a66499b1403bc66cc1d557573a1a4850e1ed07353cf7a11286
126 DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
127 EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
128 +EBUILD aseprite-1.2.11.ebuild 1946 BLAKE2B 834aad940270ca648078ea1269d2930e4b520f2bdcbdbcc4003665b51f334cece4c96d022e3baff5f17dd1ea27470c6a87291af64c1bf3af3489bc258ccfeeaa SHA512 3800fd3e40116ad8cf4b6bc945566d7d20ba4ae9c3e017593718ae798e86ed690e204dc28c937fb9c50e077955b6a8984fd6554a38e3ac498f11ffb4c711995f
129 EBUILD aseprite-1.2.5.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
130 EBUILD aseprite-1.2.6.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
131 EBUILD aseprite-1.2.7.2.ebuild 2908 BLAKE2B bf5176a5ccfca118b59eec443c887438c0c639d4d58a1daa03f033469d0470a96fe3e63d23dc79df680521e953cdc444d955e803c19fd0f709e10fb7315cfcdc SHA512 54aae3c01062800b68819a460c922709bc3065b3a85182f51157583920917d35f756ec65672ada20b47a8877d7d2f2f89b64b3a83171bb9a02d0f1e82bd65a2b
132
133 diff --git a/dev-games/aseprite/aseprite-1.2.11.ebuild b/dev-games/aseprite/aseprite-1.2.11.ebuild
134 new file mode 100644
135 index 0000000..0e544a9
136 --- /dev/null
137 +++ b/dev-games/aseprite/aseprite-1.2.11.ebuild
138 @@ -0,0 +1,91 @@
139 +# Copyright 1999-2016 Gentoo Foundation
140 +# Distributed under the terms of the GNU General Public License v2
141 +# $Id$
142 +
143 +EAPI=6
144 +inherit cmake-utils toolchain-funcs
145 +
146 +DESCRIPTION="Animated sprite editor & pixel art tool"
147 +HOMEPAGE="http://www.aseprite.org"
148 +LICENSE="Proprietary"
149 +SLOT="0"
150 +
151 +PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
152 +
153 +if [[ ${PV} = 9999* ]]; then
154 + inherit git-r3
155 + EGIT_REPO_URI="https://github.com/aseprite/aseprite"
156 + EGIT_BRANCH="master"
157 + if [[ ${PV} != 9999* ]]; then
158 + EGIT_COMMIT="v${PV/_/-}"
159 + fi
160 +else
161 + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${PN^}-v${PV//_/-}-Source.zip"
162 + KEYWORDS="~amd64 ~x86"
163 + S="${WORKDIR}"
164 +fi
165 +
166 +IUSE="
167 + debug
168 + memleak
169 + webp"
170 +
171 +RDEPEND="
172 + app-arch/libarchive
173 + app-text/cmark
174 + dev-libs/expat
175 + dev-libs/tinyxml
176 + =dev-games/aseprite-skia-9999-r71[debug=]
177 + media-libs/freetype:2
178 + >=media-libs/giflib-5.0
179 + media-libs/fontconfig
180 + media-libs/libpng:0
181 + webp? ( !!media-libs/libwebp )
182 + net-misc/curl
183 + sys-apps/util-linux
184 + sys-libs/zlib
185 + virtual/jpeg:=
186 + x11-libs/libX11
187 + x11-libs/pixman"
188 +DEPEND="$RDEPEND
189 + app-arch/unzip"
190 +
191 +DOCS=( EULA.txt
192 + docs/ase-file-specs.md
193 + docs/LICENSES.md
194 + README.md )
195 +
196 +src_prepare() {
197 + cmake-utils_src_prepare
198 +}
199 +
200 +src_configure() {
201 + use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
202 +
203 + local mycmakeargs=(
204 + -DENABLE_UPDATER=OFF
205 + -DFULLSCREEN_PLATFORM=ON
206 + -DBUILD_GMOCK=OFF
207 + -DUSE_SHARED_CMARK=ON
208 + -DUSE_SHARED_CURL=ON
209 + -DUSE_SHARED_GIFLIB=ON
210 + -DUSE_SHARED_JPEGLIB=ON
211 + -DUSE_SHARED_ZLIB=ON
212 + -DUSE_SHARED_LIBARCHIVE=ON
213 + -DUSE_SHARED_LIBPNG=ON
214 + -DUSE_SHARED_TINYXML=ON
215 + -DUSE_SHARED_PIXMAN=ON
216 + -DUSE_SHARED_FREETYPE=ON
217 + -DUSE_SHARED_HARFBUZZ=ON
218 + -DWITH_WEBP_SUPPORT="$(usex webp)"
219 + -DENABLE_MEMLEAK="$(usex memleak)"
220 + -DSKIA_DIR="/var/lib/aseprite-skia"
221 + -DSKIA_OUT_DIR="/var/lib/aseprite-skia/out/Release"
222 + )
223 +
224 + cmake-utils_src_configure
225 +}
226 +
227 +pkg_postinst() {
228 + elog "Aseprite is for personal use only. You may not distribute it."
229 +}
230
231 diff --git a/dev-games/aseprite/files/aseprite-1.2.11-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.11-system_libarchive.patch
232 new file mode 100644
233 index 0000000..467b5b1
234 --- /dev/null
235 +++ b/dev-games/aseprite/files/aseprite-1.2.11-system_libarchive.patch
236 @@ -0,0 +1,91 @@
237 +diff --git a/CMakeLists.txt b/CMakeLists.txt
238 +index dae638be8..dd5d17794 100644
239 +--- a/CMakeLists.txt
240 ++++ b/CMakeLists.txt
241 +@@ -64,6 +64,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
242 + option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
243 + option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
244 + option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
245 ++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
246 + option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
247 + option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
248 + option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
249 +@@ -193,6 +194,15 @@ else()
250 + endif()
251 + include_directories(${ZLIB_INCLUDE_DIRS})
252 +
253 ++# libarchive
254 ++if(USE_SHARED_LIBARCHIVE)
255 ++ find_library(ARCHIVE_LIBRARIES NAMES archive)
256 ++ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
257 ++else()
258 ++ add_definitions(-DLIBARCHIVE_STATIC)
259 ++ set(ARCHIVE_LIBRARIES archive_static)
260 ++endif()
261 ++
262 + # libpng
263 + if(USE_SHARED_LIBPNG)
264 + find_package(PNG REQUIRED)
265 +@@ -294,7 +304,7 @@ if(USE_SHARED_CMARK)
266 + else()
267 + add_definitions(-DCMARK_STATIC_DEFINE)
268 + set(CMARK_LIBRARIES libcmark_static)
269 +- include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/cmark)
270 ++ include_directories(${CMARK_DIR})
271 + endif()
272 +
273 + if(REQUIRE_CURL)
274 +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
275 +index a9e80d73c..619acac92 100644
276 +--- a/src/app/CMakeLists.txt
277 ++++ b/src/app/CMakeLists.txt
278 +@@ -82,9 +82,6 @@ if(WITH_WEBP_SUPPORT)
279 + add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
280 + endif()
281 +
282 +-# libarchive definitions
283 +-add_definitions(-DLIBARCHIVE_STATIC)
284 +-
285 + ######################################################################
286 + # app-lib target
287 +
288 +@@ -551,7 +548,7 @@ target_link_libraries(app-lib
289 + ${FREETYPE_LIBRARIES}
290 + ${HARFBUZZ_LIBRARIES}
291 + json11
292 +- archive_static
293 ++ ${ARCHIVE_LIBRARIES}
294 + fmt
295 + tinyexpr)
296 +
297 +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
298 +index 596ffa2e4..977816439 100644
299 +--- a/third_party/CMakeLists.txt
300 ++++ b/third_party/CMakeLists.txt
301 +@@ -113,15 +113,17 @@ endif()
302 + add_subdirectory(json11)
303 +
304 + # libarchive
305 +-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
306 +-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
307 +-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
308 +-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
309 +-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
310 +-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
311 +-add_subdirectory(libarchive)
312 +-target_include_directories(archive_static INTERFACE
313 +- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
314 ++if(NOT USE_SHARED_LIBARCHIVE)
315 ++ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
316 ++ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
317 ++ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
318 ++ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
319 ++ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
320 ++ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
321 ++ add_subdirectory(libarchive)
322 ++ target_include_directories(archive_static INTERFACE
323 ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
324 ++endif()
325 +
326 + # benchmark
327 + if(ENABLE_BENCHMARKS)