Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/
Date: Fri, 03 Aug 2018 05:46:39
Message-Id: 1533236661.08aceb9fb20bf4cbf6d44ebbf44522fc920fb348.albert@gentoo
1 commit: 08aceb9fb20bf4cbf6d44ebbf44522fc920fb348
2 Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
3 AuthorDate: Thu Aug 2 17:47:30 2018 +0000
4 Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
5 CommitDate: Thu Aug 2 19:04:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=08aceb9f
7
8 Added new versions of aseprite.
9
10 Cleaned up a lot of system-* use flags, since they shouldn't
11 make a big difference, and the Gentoo way is to compile shared
12 libraries.
13
14 dev-games/aseprite/Manifest | 21 ++++---
15 ...seprite-9999.ebuild => aseprite-1.2.7.2.ebuild} | 24 ++++----
16 ...{aseprite-9999.ebuild => aseprite-1.2.9.ebuild} | 66 +++++++++-------------
17 dev-games/aseprite/aseprite-9999.ebuild | 66 +++++++++-------------
18 ...ch => aseprite-1.2.7.2-system_libarchive.patch} | 0
19 ...atch => aseprite-1.2.9-system_libarchive.patch} | 12 ++--
20 6 files changed, 87 insertions(+), 102 deletions(-)
21
22 diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
23 index 836d24b..b362ff0 100644
24 --- a/dev-games/aseprite/Manifest
25 +++ b/dev-games/aseprite/Manifest
26 @@ -1,8 +1,13 @@
27 -AUX aseprite-system_libarchive.patch 3268 SHA256 c62aae0a7707860600adb5beb2003af53761ebb9a981c96725f7cc74c3a3195d SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce WHIRLPOOL 64bd00a17eed5037975518794f7d9e0c998d7411a635565076384d591a8f932baa80bee66790c3803726747ad12d570171dcc71ba426b8227537149943cd4c66
28 -DIST Aseprite-v1.1.13-Source.zip 12809688 SHA256 f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 WHIRLPOOL 18af949c5a0d7f2b866e8c9a45fcf3fb623722c44537abbf8b3e79501e6f898b9e037e7afc83170b9383a567ff5889ab2013b1624a06a45c074220b68a51b736
29 -DIST Aseprite-v1.2.5-Source.zip 21167203 SHA256 3b976e3cae78f1457f401f93eb02bf73afde7c820470349fe19ef055b6599bb2 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877 WHIRLPOOL e53dc459b8e9bf131c37427a320b16465f879ccdc3dbf555db326cff0507184d53f9167952dcec9d68b34d9f41df88e1770a30886ec1b7b64cf61b72a20518fd
30 -DIST Aseprite-v1.2.6-Source.zip 20560401 SHA256 e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972 SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418 WHIRLPOOL b413a5c9ba20e2989fd7f7dd94cd1dc56c9118a2affd0a67b81158ef44b9f9dfddd3fe457720cf2b9194d3e713cf2d68b74ca19cdbbe7f6b6b09df885d0778d4
31 -EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
32 -EBUILD aseprite-1.2.5.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
33 -EBUILD aseprite-1.2.6.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
34 -EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
35 +AUX aseprite-1.2.7.2-system_libarchive.patch 3268 BLAKE2B 1f2b40321cfa6c7f973abf8adf467a49d2259262ed217e956a3002abf3e830fc97fc5414e36465fae8e8327dcf2c9497945961bdda8e7885e9f683027f39e5a6 SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce
36 +AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
37 +DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
38 +DIST Aseprite-v1.2.5-Source.zip 21167203 BLAKE2B e5630b093d0a0df54f9f5704d7a40aaa8f409b1c2a7aad5ad358d1eb735017f82f102c22d543f1945c1e8a74055d4da422aebeb13e03e10ccada0a21721d9576 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877
39 +DIST Aseprite-v1.2.6-Source.zip 20560401 BLAKE2B eed9de0b05f40c42396ed92d08bac5badf3f21f206d96de0b55890c3f105258534f841a0af09648884899960eafd5b63623ab40f6e878154bdfa2a454eab830a SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418
40 +DIST Aseprite-v1.2.7.2-Source.zip 20599047 BLAKE2B d5150b99aa6343a60921212c4edddd06cc1e90e9f4e487fbc37e66b2475a5a53eedbfc4ac10f72a2843f4f8b67ee5ce42a677d2a72506f999c11c10de84fa478 SHA512 6f10793a82862c862a8b95010f14617d18367a7a24c554530661dd4218d89b50b1c43d10676bf2a66499b1403bc66cc1d557573a1a4850e1ed07353cf7a11286
41 +DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
42 +EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
43 +EBUILD aseprite-1.2.5.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
44 +EBUILD aseprite-1.2.6.ebuild 2909 BLAKE2B 9f4c4fba6634a9f26764eb36af00b03dafaa9039ee44fc6b5a988cd58fad22b83346fa16bd379b21480ca105f5d72c06749c1fce258d0ef16d5eb18b22fd6173 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1
45 +EBUILD aseprite-1.2.7.2.ebuild 2908 BLAKE2B bf5176a5ccfca118b59eec443c887438c0c639d4d58a1daa03f033469d0470a96fe3e63d23dc79df680521e953cdc444d955e803c19fd0f709e10fb7315cfcdc SHA512 54aae3c01062800b68819a460c922709bc3065b3a85182f51157583920917d35f756ec65672ada20b47a8877d7d2f2f89b64b3a83171bb9a02d0f1e82bd65a2b
46 +EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
47 +EBUILD aseprite-9999.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
48
49 diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-1.2.7.2.ebuild
50 similarity index 86%
51 copy from dev-games/aseprite/aseprite-9999.ebuild
52 copy to dev-games/aseprite/aseprite-1.2.7.2.ebuild
53 index 2041b70..1fb7642 100644
54 --- a/dev-games/aseprite/aseprite-9999.ebuild
55 +++ b/dev-games/aseprite/aseprite-1.2.7.2.ebuild
56 @@ -10,6 +10,8 @@ HOMEPAGE="http://www.aseprite.org"
57 LICENSE="Proprietary"
58 SLOT="0"
59
60 +PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
61 +
62 if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
63 inherit git-r3
64 EGIT_REPO_URI="https://github.com/aseprite/aseprite"
65 @@ -29,7 +31,6 @@ IUSE="
66 webp
67 system-allegro
68 +system-curl
69 - +system-freetype
70 +system-giflib
71 +system-jpeg
72 +system-libpng
73 @@ -39,9 +40,10 @@ IUSE="
74 +system-zlib"
75
76 RDEPEND="
77 + app-arch/libarchive
78 + app-text/cmark
79 system-tinyxml? ( dev-libs/tinyxml )
80 system-allegro? ( media-libs/allegro:0[X,png] )
81 - system-freetype? ( media-libs/freetype:2 )
82 system-giflib? ( >=media-libs/giflib-5.0 )
83 system-libpng? ( media-libs/libpng:0 )
84 webp? ( system-libwebp? ( media-libs/libwebp ) )
85 @@ -72,7 +74,7 @@ src_prepare() {
86 }
87
88 src_configure() {
89 - use debug && CMAKE_BUILD_TYPE=Debug
90 + use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
91
92 local mycmakeargs=(
93 -DCURL_STATICLIB=OFF
94 @@ -83,21 +85,19 @@ src_configure() {
95 $(use system-pixman && echo \
96 -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
97 -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
98 - $(use system-freetype && echo \
99 - -DFREETYPE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
100 - -DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
101 - -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
102 + -DUSE_SHARED_CMARK=ON
103 -DUSE_SHARED_CURL="$(usex system-curl)"
104 - -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
105 -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
106 -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
107 - -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
108 + -DUSE_SHARED_LIBARCHIVE=ON
109 -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
110 - -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
111 + -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
112 + -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
113 -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
114 - -DUSE_SHARED_ZLIB="$(usex system-zlib)"
115 + -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
116 + -DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
117 + -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
118 -DWITH_WEBP_SUPPORT="$(usex webp)"
119 - -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
120 -DENABLE_MEMLEAK="$(usex memleak)"
121 )
122
123
124 diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-1.2.9.ebuild
125 similarity index 50%
126 copy from dev-games/aseprite/aseprite-9999.ebuild
127 copy to dev-games/aseprite/aseprite-1.2.9.ebuild
128 index 2041b70..92c9b8b 100644
129 --- a/dev-games/aseprite/aseprite-9999.ebuild
130 +++ b/dev-games/aseprite/aseprite-1.2.9.ebuild
131 @@ -10,6 +10,8 @@ HOMEPAGE="http://www.aseprite.org"
132 LICENSE="Proprietary"
133 SLOT="0"
134
135 +PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
136 +
137 if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
138 inherit git-r3
139 EGIT_REPO_URI="https://github.com/aseprite/aseprite"
140 @@ -27,33 +29,25 @@ IUSE="
141 debug
142 memleak
143 webp
144 - system-allegro
145 - +system-curl
146 - +system-freetype
147 - +system-giflib
148 - +system-jpeg
149 - +system-libpng
150 - +system-libwebp
151 - +system-pixman
152 - +system-tinyxml
153 - +system-zlib"
154 + system-allegro"
155
156 RDEPEND="
157 - system-tinyxml? ( dev-libs/tinyxml )
158 + app-arch/libarchive
159 + app-text/cmark
160 + dev-libs/tinyxml
161 system-allegro? ( media-libs/allegro:0[X,png] )
162 - system-freetype? ( media-libs/freetype:2 )
163 - system-giflib? ( >=media-libs/giflib-5.0 )
164 - system-libpng? ( media-libs/libpng:0 )
165 - webp? ( system-libwebp? ( media-libs/libwebp ) )
166 - system-curl? ( net-misc/curl )
167 - system-zlib? ( sys-libs/zlib )
168 - system-jpeg? ( virtual/jpeg:= )
169 + media-libs/freetype:2
170 + >=media-libs/giflib-5.0
171 + media-libs/libpng:0
172 + webp? ( !!media-libs/libwebp )
173 + net-misc/curl
174 + sys-libs/zlib
175 + virtual/jpeg:=
176 x11-libs/libX11
177 x11-libs/libXxf86dga
178 - system-pixman? ( x11-libs/pixman )"
179 + x11-libs/pixman"
180 DEPEND="$RDEPEND
181 app-arch/unzip"
182 - #dev-cpp/gtest
183
184 DOCS=( EULA.txt
185 docs/ase-file-specs.md
186 @@ -72,32 +66,26 @@ src_prepare() {
187 }
188
189 src_configure() {
190 - use debug && CMAKE_BUILD_TYPE=Debug
191 + use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
192
193 local mycmakeargs=(
194 - -DCURL_STATICLIB=OFF
195 -DENABLE_UPDATER=OFF
196 -DFULLSCREEN_PLATFORM=ON
197 - -DENABLE_TESTS=OFF
198 -DBUILD_GMOCK=OFF
199 - $(use system-pixman && echo \
200 - -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
201 - -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
202 - $(use system-freetype && echo \
203 - -DFREETYPE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
204 - -DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
205 + -DUSE_SHARED_CMARK=ON
206 + -DUSE_SHARED_CURL=ON
207 + -DUSE_SHARED_GIFLIB=ON
208 + -DUSE_SHARED_JPEGLIB=ON
209 + -DUSE_SHARED_ZLIB=ON
210 + -DUSE_SHARED_LIBARCHIVE=ON
211 + -DUSE_SHARED_LIBPNG=ON
212 + -DUSE_SHARED_LIBLOADPNG=OFF # Does not exist in the main tree
213 + -DUSE_SHARED_TINYXML=ON
214 + -DUSE_SHARED_PIXMAN=ON
215 + -DUSE_SHARED_FREETYPE=ON
216 + -DUSE_SHARED_HARFBUZZ=ON
217 -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
218 - -DUSE_SHARED_CURL="$(usex system-curl)"
219 - -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
220 - -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
221 - -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
222 - -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
223 - -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
224 - -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
225 - -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
226 - -DUSE_SHARED_ZLIB="$(usex system-zlib)"
227 -DWITH_WEBP_SUPPORT="$(usex webp)"
228 - -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
229 -DENABLE_MEMLEAK="$(usex memleak)"
230 )
231
232
233 diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
234 index 2041b70..92c9b8b 100644
235 --- a/dev-games/aseprite/aseprite-9999.ebuild
236 +++ b/dev-games/aseprite/aseprite-9999.ebuild
237 @@ -10,6 +10,8 @@ HOMEPAGE="http://www.aseprite.org"
238 LICENSE="Proprietary"
239 SLOT="0"
240
241 +PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
242 +
243 if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
244 inherit git-r3
245 EGIT_REPO_URI="https://github.com/aseprite/aseprite"
246 @@ -27,33 +29,25 @@ IUSE="
247 debug
248 memleak
249 webp
250 - system-allegro
251 - +system-curl
252 - +system-freetype
253 - +system-giflib
254 - +system-jpeg
255 - +system-libpng
256 - +system-libwebp
257 - +system-pixman
258 - +system-tinyxml
259 - +system-zlib"
260 + system-allegro"
261
262 RDEPEND="
263 - system-tinyxml? ( dev-libs/tinyxml )
264 + app-arch/libarchive
265 + app-text/cmark
266 + dev-libs/tinyxml
267 system-allegro? ( media-libs/allegro:0[X,png] )
268 - system-freetype? ( media-libs/freetype:2 )
269 - system-giflib? ( >=media-libs/giflib-5.0 )
270 - system-libpng? ( media-libs/libpng:0 )
271 - webp? ( system-libwebp? ( media-libs/libwebp ) )
272 - system-curl? ( net-misc/curl )
273 - system-zlib? ( sys-libs/zlib )
274 - system-jpeg? ( virtual/jpeg:= )
275 + media-libs/freetype:2
276 + >=media-libs/giflib-5.0
277 + media-libs/libpng:0
278 + webp? ( !!media-libs/libwebp )
279 + net-misc/curl
280 + sys-libs/zlib
281 + virtual/jpeg:=
282 x11-libs/libX11
283 x11-libs/libXxf86dga
284 - system-pixman? ( x11-libs/pixman )"
285 + x11-libs/pixman"
286 DEPEND="$RDEPEND
287 app-arch/unzip"
288 - #dev-cpp/gtest
289
290 DOCS=( EULA.txt
291 docs/ase-file-specs.md
292 @@ -72,32 +66,26 @@ src_prepare() {
293 }
294
295 src_configure() {
296 - use debug && CMAKE_BUILD_TYPE=Debug
297 + use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
298
299 local mycmakeargs=(
300 - -DCURL_STATICLIB=OFF
301 -DENABLE_UPDATER=OFF
302 -DFULLSCREEN_PLATFORM=ON
303 - -DENABLE_TESTS=OFF
304 -DBUILD_GMOCK=OFF
305 - $(use system-pixman && echo \
306 - -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
307 - -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
308 - $(use system-freetype && echo \
309 - -DFREETYPE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
310 - -DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
311 + -DUSE_SHARED_CMARK=ON
312 + -DUSE_SHARED_CURL=ON
313 + -DUSE_SHARED_GIFLIB=ON
314 + -DUSE_SHARED_JPEGLIB=ON
315 + -DUSE_SHARED_ZLIB=ON
316 + -DUSE_SHARED_LIBARCHIVE=ON
317 + -DUSE_SHARED_LIBPNG=ON
318 + -DUSE_SHARED_LIBLOADPNG=OFF # Does not exist in the main tree
319 + -DUSE_SHARED_TINYXML=ON
320 + -DUSE_SHARED_PIXMAN=ON
321 + -DUSE_SHARED_FREETYPE=ON
322 + -DUSE_SHARED_HARFBUZZ=ON
323 -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
324 - -DUSE_SHARED_CURL="$(usex system-curl)"
325 - -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
326 - -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
327 - -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
328 - -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
329 - -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
330 - -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
331 - -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
332 - -DUSE_SHARED_ZLIB="$(usex system-zlib)"
333 -DWITH_WEBP_SUPPORT="$(usex webp)"
334 - -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
335 -DENABLE_MEMLEAK="$(usex memleak)"
336 )
337
338
339 diff --git a/dev-games/aseprite/files/aseprite-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch
340 similarity index 100%
341 copy from dev-games/aseprite/files/aseprite-system_libarchive.patch
342 copy to dev-games/aseprite/files/aseprite-1.2.7.2-system_libarchive.patch
343
344 diff --git a/dev-games/aseprite/files/aseprite-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch
345 similarity index 86%
346 rename from dev-games/aseprite/files/aseprite-system_libarchive.patch
347 rename to dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch
348 index 8959c10..c531a1d 100644
349 --- a/dev-games/aseprite/files/aseprite-system_libarchive.patch
350 +++ b/dev-games/aseprite/files/aseprite-1.2.9-system_libarchive.patch
351 @@ -9,7 +9,7 @@ index dae638be8..dd5d17794 100644
352 +option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
353 option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
354 option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
355 - option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off)
356 + option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
357 @@ -193,6 +194,15 @@ else()
358 endif()
359 include_directories(${ZLIB_INCLUDE_DIRS})
360 @@ -55,14 +55,14 @@ index a9e80d73c..619acac92 100644
361 json11
362 - archive_static
363 + ${ARCHIVE_LIBRARIES}
364 - fmt)
365 + fmt
366 + tinyexpr)
367
368 - if(ENABLE_SCRIPTING)
369 diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
370 index 596ffa2e4..977816439 100644
371 --- a/third_party/CMakeLists.txt
372 +++ b/third_party/CMakeLists.txt
373 -@@ -113,13 +113,15 @@ endif()
374 +@@ -113,15 +113,17 @@ endif()
375 add_subdirectory(json11)
376
377 # libarchive
378 @@ -70,6 +70,8 @@ index 596ffa2e4..977816439 100644
379 -set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
380 -set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
381 -set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
382 +-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
383 +-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
384 -add_subdirectory(libarchive)
385 -target_include_directories(archive_static INTERFACE
386 - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
387 @@ -78,6 +80,8 @@ index 596ffa2e4..977816439 100644
388 + set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
389 + set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
390 + set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
391 ++ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
392 ++ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
393 + add_subdirectory(libarchive)
394 + target_include_directories(archive_static INTERFACE
395 + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
Report Message
Find on MARC Find on Google Groups