1 |
commit: df4065d9ca033d33d78d49bbbdd159f5b2d9bde4 |
2 |
Author: Albert Diserholt <albert <AT> diserholt <DOT> com> |
3 |
AuthorDate: Tue Aug 2 05:40:23 2022 +0000 |
4 |
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com> |
5 |
CommitDate: Tue Aug 2 05:41:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=df4065d9 |
7 |
|
8 |
Remove old aseprite ebuilds |
9 |
|
10 |
They are now shipped in the official repository. |
11 |
|
12 |
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com> |
13 |
|
14 |
dev-games/aseprite-skia/Manifest | 2 - |
15 |
.../aseprite-skia/aseprite-skia-9999-r102.ebuild | 89 --------------- |
16 |
.../aseprite-skia/aseprite-skia-9999-r96.ebuild | 89 --------------- |
17 |
dev-games/aseprite/Manifest | 22 ---- |
18 |
dev-games/aseprite/aseprite-1.1.13.ebuild | 109 ------------------- |
19 |
dev-games/aseprite/aseprite-1.2.21.ebuild | 100 ----------------- |
20 |
dev-games/aseprite/aseprite-1.2.30.ebuild | 120 --------------------- |
21 |
dev-games/aseprite/aseprite-1.2.34.1.ebuild | 112 ------------------- |
22 |
dev-games/aseprite/aseprite-1.2.35.ebuild | 112 ------------------- |
23 |
.../files/aseprite-1.2.21-system_libarchive.patch | 84 --------------- |
24 |
.../files/aseprite-1.2.21-system_libwebp.patch | 41 ------- |
25 |
.../files/aseprite-1.2.30-system_libarchive.patch | 90 ---------------- |
26 |
.../files/aseprite-1.2.30-system_libwebp.patch | 41 ------- |
27 |
.../files/aseprite-1.2.34.1-system_harfbuzz.patch | 23 ---- |
28 |
.../aseprite-1.2.34.1-system_libarchive.patch | 93 ---------------- |
29 |
.../files/aseprite-1.2.34.1-system_libwebp.patch | 44 -------- |
30 |
.../files/aseprite-1.2.35-system_harfbuzz.patch | 23 ---- |
31 |
.../files/aseprite-1.2.35-system_libarchive.patch | 97 ----------------- |
32 |
.../files/aseprite-1.2.35-system_libwebp.patch | 44 -------- |
33 |
19 files changed, 1335 deletions(-) |
34 |
|
35 |
diff --git a/dev-games/aseprite-skia/Manifest b/dev-games/aseprite-skia/Manifest |
36 |
deleted file mode 100644 |
37 |
index 06b7869..0000000 |
38 |
--- a/dev-games/aseprite-skia/Manifest |
39 |
+++ /dev/null |
40 |
@@ -1,2 +0,0 @@ |
41 |
-EBUILD aseprite-skia-9999-r102.ebuild 2147 BLAKE2B 933fbcf7185e0f8cc4da4ec727c11e901dbc999806c0ff6b36b10f1eaffb15b23e8b13ef94d27c8cad95f17c50fd8387ee27b8ff2fb5c5a435176a32fb0fd188 SHA512 0dabaa53975d6b857837a1072e7a057088d6b327fc789b2421f6b2b305d13740193ae9dff708239577b708600789c5d73fd2bd68c00edc2b3301e05ee0e2ef06 |
42 |
-EBUILD aseprite-skia-9999-r96.ebuild 2147 BLAKE2B 933fbcf7185e0f8cc4da4ec727c11e901dbc999806c0ff6b36b10f1eaffb15b23e8b13ef94d27c8cad95f17c50fd8387ee27b8ff2fb5c5a435176a32fb0fd188 SHA512 0dabaa53975d6b857837a1072e7a057088d6b327fc789b2421f6b2b305d13740193ae9dff708239577b708600789c5d73fd2bd68c00edc2b3301e05ee0e2ef06 |
43 |
|
44 |
diff --git a/dev-games/aseprite-skia/aseprite-skia-9999-r102.ebuild b/dev-games/aseprite-skia/aseprite-skia-9999-r102.ebuild |
45 |
deleted file mode 100644 |
46 |
index a55cc11..0000000 |
47 |
--- a/dev-games/aseprite-skia/aseprite-skia-9999-r102.ebuild |
48 |
+++ /dev/null |
49 |
@@ -1,89 +0,0 @@ |
50 |
-# Copyright 2022 Gentoo Authors |
51 |
-# Distributed under the terms of the GNU General Public License v2 |
52 |
- |
53 |
-EAPI=7 |
54 |
- |
55 |
-PYTHON_COMPAT=( python3_{9,10} ) |
56 |
- |
57 |
-inherit python-any-r1 git-r3 ninja-utils |
58 |
- |
59 |
-DESCRIPTION="Skia library for Aseprite" |
60 |
-HOMEPAGE="https://skia.org" |
61 |
- |
62 |
-EGIT_REPO_URI="https://github.com/aseprite/skia" |
63 |
-EGIT_BRANCH="aseprite-m${PR/r/}" |
64 |
- |
65 |
-DEPOT_TOOLS_URI="https://chromium.googlesource.com/chromium/tools/depot_tools.git" |
66 |
-DEPOT_TOOLS_COMMIT="main" |
67 |
- |
68 |
-LICENSE="BSD" |
69 |
-SLOT="0" |
70 |
-KEYWORDS="" |
71 |
-IUSE="debug" |
72 |
- |
73 |
-RDEPEND=" |
74 |
- dev-libs/expat |
75 |
- media-libs/harfbuzz |
76 |
- media-libs/libjpeg-turbo |
77 |
- media-libs/libpng |
78 |
- media-libs/libwebp |
79 |
- media-libs/freetype:2 |
80 |
- sys-libs/zlib" |
81 |
-BDEPEND=" |
82 |
- ${PYTHON_DEPS} |
83 |
- dev-util/ninja" |
84 |
- |
85 |
-src_unpack() { |
86 |
- git-r3_src_unpack |
87 |
- |
88 |
- sed -ri '/third_party\/externals\/(expat|icu|libjpeg|libpng|libwebp|zlib|harfbuzz|freetype)/d' "${S}/DEPS" |
89 |
- |
90 |
- cd "${S}" |
91 |
- ./tools/git-sync-deps || die "Failed to sync dependencies" |
92 |
- |
93 |
- EGIT_BRANCH="$DEPOT_TOOLS_COMMIT" |
94 |
- git-r3_fetch "$DEPOT_TOOLS_URI" |
95 |
- git-r3_checkout "$DEPOT_TOOLS_URI" depot_tools |
96 |
-} |
97 |
- |
98 |
-src_configure() { |
99 |
- local myskiaargs=( |
100 |
- is_debug=$(usex debug true false) |
101 |
- is_official_build=true |
102 |
- skia_use_system_expat=true |
103 |
- skia_use_system_icu=true |
104 |
- skia_use_system_libjpeg_turbo=true |
105 |
- skia_use_system_libpng=true |
106 |
- skia_use_system_libwebp=true |
107 |
- skia_use_system_zlib=true |
108 |
- skia_use_sfntly=false |
109 |
- skia_use_freetype=true |
110 |
- skia_use_harfbuzz=true |
111 |
- skia_pdf_subset_harfbuzz=true |
112 |
- skia_use_system_freetype2=true |
113 |
- skia_use_system_harfbuzz=true |
114 |
- ) |
115 |
- |
116 |
- cd "${S}" |
117 |
- export PATH="$PATH:${S}/depot_tools" |
118 |
- gn gen out/$(usex debug Debug Release) --args="${myskiaargs[*]}" || die "Failed to configure skia" |
119 |
-} |
120 |
- |
121 |
-src_compile() { |
122 |
- eninja -C "out/$(usex debug Debug Release)" skia modules || die "Failed to compile skia" |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- insinto /var/lib/aseprite-skia/ |
127 |
- doins -r include |
128 |
- doins -r modules |
129 |
- insinto /var/lib/aseprite-skia/src |
130 |
- doins -r src/gpu |
131 |
- doins -r src/core |
132 |
- insinto /var/lib/aseprite-skia/third_party |
133 |
- doins -r third_party/skcms |
134 |
- |
135 |
- insinto /var/lib/aseprite-skia/out/$(usex debug Debug Release) |
136 |
- dodir /var/lib/aseprite-skia/out/$(usex debug Debug Release) |
137 |
- doins out/$(usex debug Debug Release)/lib*.a |
138 |
-} |
139 |
|
140 |
diff --git a/dev-games/aseprite-skia/aseprite-skia-9999-r96.ebuild b/dev-games/aseprite-skia/aseprite-skia-9999-r96.ebuild |
141 |
deleted file mode 100644 |
142 |
index a55cc11..0000000 |
143 |
--- a/dev-games/aseprite-skia/aseprite-skia-9999-r96.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,89 +0,0 @@ |
146 |
-# Copyright 2022 Gentoo Authors |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=7 |
150 |
- |
151 |
-PYTHON_COMPAT=( python3_{9,10} ) |
152 |
- |
153 |
-inherit python-any-r1 git-r3 ninja-utils |
154 |
- |
155 |
-DESCRIPTION="Skia library for Aseprite" |
156 |
-HOMEPAGE="https://skia.org" |
157 |
- |
158 |
-EGIT_REPO_URI="https://github.com/aseprite/skia" |
159 |
-EGIT_BRANCH="aseprite-m${PR/r/}" |
160 |
- |
161 |
-DEPOT_TOOLS_URI="https://chromium.googlesource.com/chromium/tools/depot_tools.git" |
162 |
-DEPOT_TOOLS_COMMIT="main" |
163 |
- |
164 |
-LICENSE="BSD" |
165 |
-SLOT="0" |
166 |
-KEYWORDS="" |
167 |
-IUSE="debug" |
168 |
- |
169 |
-RDEPEND=" |
170 |
- dev-libs/expat |
171 |
- media-libs/harfbuzz |
172 |
- media-libs/libjpeg-turbo |
173 |
- media-libs/libpng |
174 |
- media-libs/libwebp |
175 |
- media-libs/freetype:2 |
176 |
- sys-libs/zlib" |
177 |
-BDEPEND=" |
178 |
- ${PYTHON_DEPS} |
179 |
- dev-util/ninja" |
180 |
- |
181 |
-src_unpack() { |
182 |
- git-r3_src_unpack |
183 |
- |
184 |
- sed -ri '/third_party\/externals\/(expat|icu|libjpeg|libpng|libwebp|zlib|harfbuzz|freetype)/d' "${S}/DEPS" |
185 |
- |
186 |
- cd "${S}" |
187 |
- ./tools/git-sync-deps || die "Failed to sync dependencies" |
188 |
- |
189 |
- EGIT_BRANCH="$DEPOT_TOOLS_COMMIT" |
190 |
- git-r3_fetch "$DEPOT_TOOLS_URI" |
191 |
- git-r3_checkout "$DEPOT_TOOLS_URI" depot_tools |
192 |
-} |
193 |
- |
194 |
-src_configure() { |
195 |
- local myskiaargs=( |
196 |
- is_debug=$(usex debug true false) |
197 |
- is_official_build=true |
198 |
- skia_use_system_expat=true |
199 |
- skia_use_system_icu=true |
200 |
- skia_use_system_libjpeg_turbo=true |
201 |
- skia_use_system_libpng=true |
202 |
- skia_use_system_libwebp=true |
203 |
- skia_use_system_zlib=true |
204 |
- skia_use_sfntly=false |
205 |
- skia_use_freetype=true |
206 |
- skia_use_harfbuzz=true |
207 |
- skia_pdf_subset_harfbuzz=true |
208 |
- skia_use_system_freetype2=true |
209 |
- skia_use_system_harfbuzz=true |
210 |
- ) |
211 |
- |
212 |
- cd "${S}" |
213 |
- export PATH="$PATH:${S}/depot_tools" |
214 |
- gn gen out/$(usex debug Debug Release) --args="${myskiaargs[*]}" || die "Failed to configure skia" |
215 |
-} |
216 |
- |
217 |
-src_compile() { |
218 |
- eninja -C "out/$(usex debug Debug Release)" skia modules || die "Failed to compile skia" |
219 |
-} |
220 |
- |
221 |
-src_install() { |
222 |
- insinto /var/lib/aseprite-skia/ |
223 |
- doins -r include |
224 |
- doins -r modules |
225 |
- insinto /var/lib/aseprite-skia/src |
226 |
- doins -r src/gpu |
227 |
- doins -r src/core |
228 |
- insinto /var/lib/aseprite-skia/third_party |
229 |
- doins -r third_party/skcms |
230 |
- |
231 |
- insinto /var/lib/aseprite-skia/out/$(usex debug Debug Release) |
232 |
- dodir /var/lib/aseprite-skia/out/$(usex debug Debug Release) |
233 |
- doins out/$(usex debug Debug Release)/lib*.a |
234 |
-} |
235 |
|
236 |
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest |
237 |
deleted file mode 100644 |
238 |
index fa218d6..0000000 |
239 |
--- a/dev-games/aseprite/Manifest |
240 |
+++ /dev/null |
241 |
@@ -1,22 +0,0 @@ |
242 |
-AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab |
243 |
-AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb |
244 |
-AUX aseprite-1.2.30-system_libarchive.patch 3897 BLAKE2B 40afbda3676a2db0ab755b0f748876ec72e980dd758fbe40b15286ff877530d6d44fda503c6fd54f076ac67b6042e5d37a6ae48f40f812ff0251d2a5e6b2b7ee SHA512 f4607555cec237f9889995ff679ac65f94fc230f0d8e1d71ab181b2e25664cb03a218794dcff2b8e7b591658e5160771e1ca7752ca96a0d9a7f607cb00d79496 |
245 |
-AUX aseprite-1.2.30-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb |
246 |
-AUX aseprite-1.2.34.1-system_harfbuzz.patch 580 BLAKE2B 76874db3b8d1b164dfe46926ebd30dd7f782081104a000ff2c74733f4283aa20710072ddee0cae3022af4d9cf8d5ebd90c5db93dae8f46c05d5b08c2b1efcb3a SHA512 fa36b354e5d42beb7c846a89edbda2d2b6071047eddc1c522a1115fa58b9ccf83a680ff0318cc022feebdda3c98818677c748e10d18c81c0b728b819aca52fc1 |
247 |
-AUX aseprite-1.2.34.1-system_libarchive.patch 4375 BLAKE2B 15d0956e267d3ab756fd5c1c1799718dd484c501b501a9683b3f3709aded515ece3f0fd2eb87afc3a70e53015cf77d8b9a36505f83d0d8823aca64b3b35e2207 SHA512 ff07fa565fff198e59a4e2667c731d1b7f60886d6ebd34b3d3d513acf51f59f666b6b2743c2e27cf67bc0986936eb11524f2d42b7f629cbfd3930dd6d8218a55 |
248 |
-AUX aseprite-1.2.34.1-system_libwebp.patch 1871 BLAKE2B 399933e038f6eefa71e95c3256b3ba9f9ac93cc230cf9e6c04f76af5ed77e085f929b1edc5d8a3ce8d69b4f84a384877c9e0745721b9c074c7f56e385b093f44 SHA512 7fb7b7e3a9a5d97e7dcb1668b3aecba33b1903e36ddeaea2d6d5e1c0a39bafc7164345c162133cf198edbbaee5aff81ee19836b660e1fd6af175425d90201f2e |
249 |
-AUX aseprite-1.2.35-system_harfbuzz.patch 580 BLAKE2B 76874db3b8d1b164dfe46926ebd30dd7f782081104a000ff2c74733f4283aa20710072ddee0cae3022af4d9cf8d5ebd90c5db93dae8f46c05d5b08c2b1efcb3a SHA512 fa36b354e5d42beb7c846a89edbda2d2b6071047eddc1c522a1115fa58b9ccf83a680ff0318cc022feebdda3c98818677c748e10d18c81c0b728b819aca52fc1 |
250 |
-AUX aseprite-1.2.35-system_libarchive.patch 4731 BLAKE2B 4328fa75d65ed2eec2d55335f00dffba8e9b5d1b88ac1233684fef57aba0aa9d965ef9d9081567842f70fc5f34170cae708cf919c709410f984d59d5882658bb SHA512 a1b0b36eada13cc73b2739d5af9701322e94c71b3052e9ed017097664a8fd7bda06171ac2add3608f8902b2f16f553984c01547e34f05825c9bec2564a3a60bf |
251 |
-AUX aseprite-1.2.35-system_libwebp.patch 1871 BLAKE2B 399933e038f6eefa71e95c3256b3ba9f9ac93cc230cf9e6c04f76af5ed77e085f929b1edc5d8a3ce8d69b4f84a384877c9e0745721b9c074c7f56e385b093f44 SHA512 7fb7b7e3a9a5d97e7dcb1668b3aecba33b1903e36ddeaea2d6d5e1c0a39bafc7164345c162133cf198edbbaee5aff81ee19836b660e1fd6af175425d90201f2e |
252 |
-DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 |
253 |
-DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee |
254 |
-DIST Aseprite-v1.2.30-Source.zip 30057883 BLAKE2B fc3a0923c963ae4adf0afc4f2bc9949a5f86123250eb0600ada35e711da35363b7719cbfe0296f1b6faf90e948b58318a56918f926eb3361baf576a81c16280b SHA512 c8534cc093a22078b44c3ae265625292e228e44bca894fbeb137759259862cc8956027a04d6982fdf1b6af2d8cd349842e1fc128827064e000de03e851e6620f |
255 |
-DIST Aseprite-v1.2.34.1-Source.zip 56240404 BLAKE2B 14a7867955f34332584ff137efbb77605ffda6d01e6902e40fa34a6ba6453a29b0de9e8c121232b5e65c3c8c266f2540a1cf98eaeaba486233b8bc2d67404b36 SHA512 43a7eeb542f621d2b4dc236b803a7fe3816d08a26c4b4974ba98c30d921da6f481234542bad715ffacd3efd175e404deda0e20611819c565bc41d2e60da2047a |
256 |
-DIST Aseprite-v1.2.35-Source.zip 61972632 BLAKE2B f9e24d04a19756f65041cb9c96a4142fe5078a4f6d8b48f69e79501822ff8a5070f350cf9016e5500fec5aeb82d4d8eb2c8d8b42a73fd8bc73aecab185d002fe SHA512 2577a683516adc9c601300da15e9099d6fa698fec32f4b62ce95c46412c1dd26b0538cc23996e0a1060ac4a4de47c2538124c4a01ade375f3b4efcbc99fbbdc8 |
257 |
-DIST aseprite-skia-m81-b607b32047-amd64.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce |
258 |
-DIST aseprite-skia-m81-b607b32047-x86.zip 33398654 BLAKE2B b312f09d54e81b1b77c8100443ae1464bbe22edb9ce21fdb17a1b0f56dff728665070ad5b895f70420c0671fac973267271eb864b240fc8a070ca9f2e676b363 SHA512 37a093fb9ab9f6c766f406fa62a610921108b118d2a324cf1e0d6f3b635992034f222ba3eb9a023dc968312e53ede29b6fa18628cfd484eddd52bcfe8383823c |
259 |
-EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 |
260 |
-EBUILD aseprite-1.2.21.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72 |
261 |
-EBUILD aseprite-1.2.30.ebuild 2769 BLAKE2B e930dc6f025e428a194d3543fabedc963177cb625dd8354a38f70f5b6d8b8d4c3212a1e3b31771415fa2a3d26953e55db51770fd6f1291aa18b04162dfdb17e5 SHA512 9ee2454b560b5479bc4a55477d50bea3dd6c86175e5a6b816cc95527709b44a4a0e1afdd27d95c5a130e05816afa44b3005445669c7cd9bf1dc7aee391a03c4b |
262 |
-EBUILD aseprite-1.2.34.1.ebuild 2529 BLAKE2B 6894a72da565dce8243921de92546db8d448e440f2a9814624a6bdbbaff0cebc32e2c9b455f41fe84c4d003c2dc65e4d73d9e1da100d09424693ba9d1aa2d327 SHA512 e6b88031a9ccf1cbb5dcb0e54bae86a7483c18245bede5798939832bdca6fab22be604691432e44abdfaa484d782b3c05c10d75686ba9e15f46fd37e00c71716 |
263 |
-EBUILD aseprite-1.2.35.ebuild 2530 BLAKE2B fd1c54467a1a54aa69e6b8983f22e1aff91e0c9c81fa41c8bfa574919feb8c62b6b710b8f260c337c6db272725e30c922087b109fbe89a5f8bb49e650983c7da SHA512 d17f5f52b1ebc2d33f8ff2de456cab3083dcd3682f55bc62eb5648bb2815baad59e020f8e5d7f417571324e5352b4f40d5b69cdd4e79462a462f1a9d61faf94b |
264 |
|
265 |
diff --git a/dev-games/aseprite/aseprite-1.1.13.ebuild b/dev-games/aseprite/aseprite-1.1.13.ebuild |
266 |
deleted file mode 100644 |
267 |
index 2041b70..0000000 |
268 |
--- a/dev-games/aseprite/aseprite-1.1.13.ebuild |
269 |
+++ /dev/null |
270 |
@@ -1,109 +0,0 @@ |
271 |
-# Copyright 1999-2016 Gentoo Foundation |
272 |
-# Distributed under the terms of the GNU General Public License v2 |
273 |
-# $Id$ |
274 |
- |
275 |
-EAPI=6 |
276 |
-inherit cmake-utils toolchain-funcs |
277 |
- |
278 |
-DESCRIPTION="Animated sprite editor & pixel art tool" |
279 |
-HOMEPAGE="http://www.aseprite.org" |
280 |
-LICENSE="Proprietary" |
281 |
-SLOT="0" |
282 |
- |
283 |
-if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then |
284 |
- inherit git-r3 |
285 |
- EGIT_REPO_URI="https://github.com/aseprite/aseprite" |
286 |
- EGIT_BRANCH="master" |
287 |
- if [[ ${PV} != 9999* ]]; then |
288 |
- EGIT_COMMIT="v${PV/_/-}" |
289 |
- fi |
290 |
-else |
291 |
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip" |
292 |
- KEYWORDS="~amd64 ~x86" |
293 |
- S="${WORKDIR}" |
294 |
-fi |
295 |
- |
296 |
-IUSE=" |
297 |
- debug |
298 |
- memleak |
299 |
- webp |
300 |
- system-allegro |
301 |
- +system-curl |
302 |
- +system-freetype |
303 |
- +system-giflib |
304 |
- +system-jpeg |
305 |
- +system-libpng |
306 |
- +system-libwebp |
307 |
- +system-pixman |
308 |
- +system-tinyxml |
309 |
- +system-zlib" |
310 |
- |
311 |
-RDEPEND=" |
312 |
- system-tinyxml? ( dev-libs/tinyxml ) |
313 |
- system-allegro? ( media-libs/allegro:0[X,png] ) |
314 |
- system-freetype? ( media-libs/freetype:2 ) |
315 |
- system-giflib? ( >=media-libs/giflib-5.0 ) |
316 |
- system-libpng? ( media-libs/libpng:0 ) |
317 |
- webp? ( system-libwebp? ( media-libs/libwebp ) ) |
318 |
- system-curl? ( net-misc/curl ) |
319 |
- system-zlib? ( sys-libs/zlib ) |
320 |
- system-jpeg? ( virtual/jpeg:= ) |
321 |
- x11-libs/libX11 |
322 |
- x11-libs/libXxf86dga |
323 |
- system-pixman? ( x11-libs/pixman )" |
324 |
-DEPEND="$RDEPEND |
325 |
- app-arch/unzip" |
326 |
- #dev-cpp/gtest |
327 |
- |
328 |
-DOCS=( EULA.txt |
329 |
- docs/ase-file-specs.md |
330 |
- docs/LICENSES.md |
331 |
- README.md ) |
332 |
- |
333 |
-src_prepare() { |
334 |
- cmake-utils_src_prepare |
335 |
- |
336 |
- if use system-allegro; then |
337 |
- ewarn "system-allegro is enabled. It has know issues which are solved" |
338 |
- ewarn "in the bundled version:" |
339 |
- ewarn " * You will not be able to resize the window." |
340 |
- ewarn " * You will have problems adding HSV colours on non-English systems." |
341 |
- fi |
342 |
-} |
343 |
- |
344 |
-src_configure() { |
345 |
- use debug && CMAKE_BUILD_TYPE=Debug |
346 |
- |
347 |
- local mycmakeargs=( |
348 |
- -DCURL_STATICLIB=OFF |
349 |
- -DENABLE_UPDATER=OFF |
350 |
- -DFULLSCREEN_PLATFORM=ON |
351 |
- -DENABLE_TESTS=OFF |
352 |
- -DBUILD_GMOCK=OFF |
353 |
- $(use system-pixman && echo \ |
354 |
- -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \ |
355 |
- -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so") |
356 |
- $(use system-freetype && echo \ |
357 |
- -DFREETYPE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \ |
358 |
- -DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so") |
359 |
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)" |
360 |
- -DUSE_SHARED_CURL="$(usex system-curl)" |
361 |
- -DUSE_SHARED_FREETYPE="$(usex system-freetype)" |
362 |
- -DUSE_SHARED_GIFLIB="$(usex system-giflib)" |
363 |
- -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)" |
364 |
- -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)" |
365 |
- -DUSE_SHARED_LIBPNG="$(usex system-libpng)" |
366 |
- -DUSE_SHARED_PIXMAN="$(usex system-pixman)" |
367 |
- -DUSE_SHARED_TINYXML="$(usex system-tinyxml)" |
368 |
- -DUSE_SHARED_ZLIB="$(usex system-zlib)" |
369 |
- -DWITH_WEBP_SUPPORT="$(usex webp)" |
370 |
- -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)" |
371 |
- -DENABLE_MEMLEAK="$(usex memleak)" |
372 |
- ) |
373 |
- |
374 |
- cmake-utils_src_configure |
375 |
-} |
376 |
- |
377 |
-pkg_postinst() { |
378 |
- elog "Aseprite is for personal use only. You may not distribute it." |
379 |
-} |
380 |
|
381 |
diff --git a/dev-games/aseprite/aseprite-1.2.21.ebuild b/dev-games/aseprite/aseprite-1.2.21.ebuild |
382 |
deleted file mode 100644 |
383 |
index 71183c6..0000000 |
384 |
--- a/dev-games/aseprite/aseprite-1.2.21.ebuild |
385 |
+++ /dev/null |
386 |
@@ -1,100 +0,0 @@ |
387 |
-# Copyright 1999-2020 Gentoo Foundation |
388 |
-# Distributed under the terms of the GNU General Public License v2 |
389 |
-# $Id$ |
390 |
- |
391 |
-EAPI=7 |
392 |
-inherit cmake-utils toolchain-funcs |
393 |
- |
394 |
-DESCRIPTION="Animated sprite editor & pixel art tool" |
395 |
-HOMEPAGE="http://www.aseprite.org" |
396 |
-LICENSE="Proprietary" |
397 |
-SLOT="0" |
398 |
- |
399 |
-PATCHES=( |
400 |
- "${FILESDIR}/${P}-system_libarchive.patch" |
401 |
- "${FILESDIR}/${P}-system_libwebp.patch" |
402 |
-) |
403 |
- |
404 |
-SKIA_VERSION="m81-b607b32047" |
405 |
-SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download" |
406 |
-SKIA_URI=" |
407 |
- amd64? ( |
408 |
- ${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x64.zip -> ${PN}-skia-${SKIA_VERSION}-amd64.zip |
409 |
- ) |
410 |
- x86? ( |
411 |
- ${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x86.zip -> ${PN}-skia-${SKIA_VERSION}-x86.zip |
412 |
- )" |
413 |
- |
414 |
-ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip" |
415 |
-ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}" |
416 |
- |
417 |
-SRC_URI="${ASEPRITE_URI} ${SKIA_URI}" |
418 |
-KEYWORDS="~amd64 ~x86" |
419 |
- |
420 |
-IUSE=" |
421 |
- debug |
422 |
- memleak |
423 |
- webp" |
424 |
- |
425 |
-RDEPEND=" |
426 |
- app-arch/libarchive |
427 |
- app-text/cmark |
428 |
- dev-libs/expat |
429 |
- dev-libs/tinyxml |
430 |
- media-libs/freetype:2 |
431 |
- >=media-libs/giflib-5.0 |
432 |
- media-libs/fontconfig |
433 |
- media-libs/libpng:0 |
434 |
- webp? ( media-libs/libwebp ) |
435 |
- net-misc/curl |
436 |
- sys-apps/util-linux |
437 |
- sys-libs/zlib |
438 |
- virtual/jpeg:= |
439 |
- x11-libs/libX11 |
440 |
- x11-libs/pixman" |
441 |
- |
442 |
-DOCS=( EULA.txt |
443 |
- docs/ase-file-specs.md |
444 |
- docs/LICENSES.md |
445 |
- README.md ) |
446 |
- |
447 |
-src_unpack() { |
448 |
- mkdir -p "${P}/skia" |
449 |
- cd "${P}" |
450 |
- unpack "${ASEPRITE_FILE}" |
451 |
- ( cd skia && unpack "${PN}-skia-${SKIA_VERSION}-${ARCH}.zip" ) |
452 |
-} |
453 |
- |
454 |
-src_prepare() { |
455 |
- cmake-utils_src_prepare |
456 |
-} |
457 |
- |
458 |
-src_configure() { |
459 |
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release |
460 |
- |
461 |
- local mycmakeargs=( |
462 |
- -DENABLE_UPDATER=OFF |
463 |
- -DFULLSCREEN_PLATFORM=ON |
464 |
- -DUSE_SHARED_CMARK=ON |
465 |
- -DUSE_SHARED_CURL=ON |
466 |
- -DUSE_SHARED_GIFLIB=ON |
467 |
- -DUSE_SHARED_JPEGLIB=ON |
468 |
- -DUSE_SHARED_ZLIB=ON |
469 |
- -DUSE_SHARED_LIBARCHIVE=ON |
470 |
- -DUSE_SHARED_LIBPNG=ON |
471 |
- -DUSE_SHARED_TINYXML=ON |
472 |
- -DUSE_SHARED_PIXMAN=ON |
473 |
- -DUSE_SHARED_FREETYPE=ON |
474 |
- -DUSE_SHARED_HARFBUZZ=ON |
475 |
- -DUSE_SHARED_WEBP=ON |
476 |
- -DWITH_WEBP_SUPPORT="$(usex webp)" |
477 |
- -DENABLE_MEMLEAK="$(usex memleak)" |
478 |
- -DSKIA_DIR="${S}/skia" |
479 |
- ) |
480 |
- |
481 |
- cmake-utils_src_configure |
482 |
-} |
483 |
- |
484 |
-pkg_postinst() { |
485 |
- ewarn "Aseprite is for personal use only. You may not distribute it." |
486 |
-} |
487 |
|
488 |
diff --git a/dev-games/aseprite/aseprite-1.2.30.ebuild b/dev-games/aseprite/aseprite-1.2.30.ebuild |
489 |
deleted file mode 100644 |
490 |
index d3fad3e..0000000 |
491 |
--- a/dev-games/aseprite/aseprite-1.2.30.ebuild |
492 |
+++ /dev/null |
493 |
@@ -1,120 +0,0 @@ |
494 |
-# Copyright 1999-2021 Gentoo Authors |
495 |
-# Distributed under the terms of the GNU General Public License v2 |
496 |
-# $Id$ |
497 |
- |
498 |
-EAPI=7 |
499 |
-inherit cmake-utils toolchain-funcs xdg-utils |
500 |
- |
501 |
-DESCRIPTION="Animated sprite editor & pixel art tool" |
502 |
-HOMEPAGE="http://www.aseprite.org" |
503 |
-LICENSE="Proprietary" |
504 |
-SLOT="0" |
505 |
- |
506 |
-PATCHES=( |
507 |
- "${FILESDIR}/${P}-system_libarchive.patch" |
508 |
- "${FILESDIR}/${P}-system_libwebp.patch" |
509 |
-) |
510 |
- |
511 |
-SKIA_VERSION="m81-b607b32047" |
512 |
-SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download" |
513 |
-SKIA_URI=" |
514 |
- amd64? ( |
515 |
- ${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x64.zip -> ${PN}-skia-${SKIA_VERSION}-amd64.zip |
516 |
- ) |
517 |
- x86? ( |
518 |
- ${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x86.zip -> ${PN}-skia-${SKIA_VERSION}-x86.zip |
519 |
- )" |
520 |
- |
521 |
-ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip" |
522 |
-ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}" |
523 |
- |
524 |
-SRC_URI="${ASEPRITE_URI} ${SKIA_URI}" |
525 |
-KEYWORDS="~amd64 ~x86" |
526 |
- |
527 |
-IUSE=" |
528 |
- debug |
529 |
- memleak |
530 |
- webp |
531 |
- kde |
532 |
-" |
533 |
- |
534 |
-RDEPEND=" |
535 |
- app-arch/libarchive |
536 |
- app-text/cmark |
537 |
- dev-libs/expat |
538 |
- dev-libs/tinyxml |
539 |
- media-libs/freetype:2 |
540 |
- >=media-libs/giflib-5.0 |
541 |
- media-libs/fontconfig |
542 |
- media-libs/libpng:0 |
543 |
- webp? ( media-libs/libwebp ) |
544 |
- net-misc/curl |
545 |
- sys-apps/util-linux |
546 |
- sys-libs/zlib |
547 |
- virtual/jpeg:= |
548 |
- x11-libs/libX11 |
549 |
- x11-libs/libXcursor |
550 |
- x11-libs/pixman |
551 |
- kde? ( |
552 |
- kde-apps/thumbnailers |
553 |
- )" |
554 |
- |
555 |
-DOCS=( EULA.txt |
556 |
- docs/ase-file-specs.md |
557 |
- docs/LICENSES.md |
558 |
- README.md ) |
559 |
- |
560 |
-src_unpack() { |
561 |
- mkdir -p "${P}/skia" |
562 |
- cd "${P}" |
563 |
- unpack "${ASEPRITE_FILE}" |
564 |
- ( cd skia && unpack "${PN}-skia-${SKIA_VERSION}-${ARCH}.zip" ) |
565 |
-} |
566 |
- |
567 |
-src_prepare() { |
568 |
- cmake-utils_src_prepare |
569 |
- |
570 |
- sed -i "s:Icon=aseprite:Icon=${EPREFIX}/usr/share/aseprite/data/icons/ase256.png:" "${S}/src/desktop/linux/aseprite.desktop" || die |
571 |
- sed -i "s:#!/usr/bin/sh:#!/bin/env sh:" "${S}/src/desktop/linux/aseprite-thumbnailer" || die |
572 |
-} |
573 |
- |
574 |
-src_configure() { |
575 |
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release |
576 |
- |
577 |
- local mycmakeargs=( |
578 |
- -DENABLE_UPDATER=OFF |
579 |
- -DENABLE_CCACHE="$(has ccache "${FEATURES}" && echo 'ON' || echo 'OFF')" |
580 |
- -DFULLSCREEN_PLATFORM=ON |
581 |
- -DUSE_SHARED_CMARK=ON |
582 |
- -DUSE_SHARED_CURL=ON |
583 |
- -DUSE_SHARED_GIFLIB=ON |
584 |
- -DUSE_SHARED_JPEGLIB=ON |
585 |
- -DUSE_SHARED_ZLIB=ON |
586 |
- -DUSE_SHARED_LIBARCHIVE=ON |
587 |
- -DUSE_SHARED_LIBPNG=ON |
588 |
- -DUSE_SHARED_TINYXML=ON |
589 |
- -DUSE_SHARED_PIXMAN=ON |
590 |
- -DUSE_SHARED_FREETYPE=ON |
591 |
- -DUSE_SHARED_HARFBUZZ=ON |
592 |
- -DUSE_SHARED_WEBP=ON |
593 |
- -DWITH_DESKTOP_INTEGRATION=ON |
594 |
- -DWITH_QT_THUMBNAILER="$(usex kde)" |
595 |
- -DWITH_WEBP_SUPPORT="$(usex webp)" |
596 |
- -DENABLE_MEMLEAK="$(usex memleak)" |
597 |
- -DSKIA_DIR="${S}/skia" |
598 |
- ) |
599 |
- |
600 |
- cmake-utils_src_configure |
601 |
-} |
602 |
- |
603 |
-pkg_postinst() { |
604 |
- ewarn "Aseprite is for personal use only. You may not distribute it." |
605 |
- |
606 |
- xdg_desktop_database_update |
607 |
- xdg_mimeinfo_database_update |
608 |
-} |
609 |
- |
610 |
-pkg_postrm() { |
611 |
- xdg_desktop_database_update |
612 |
- xdg_mimeinfo_database_update |
613 |
-} |
614 |
|
615 |
diff --git a/dev-games/aseprite/aseprite-1.2.34.1.ebuild b/dev-games/aseprite/aseprite-1.2.34.1.ebuild |
616 |
deleted file mode 100644 |
617 |
index 96d4a58..0000000 |
618 |
--- a/dev-games/aseprite/aseprite-1.2.34.1.ebuild |
619 |
+++ /dev/null |
620 |
@@ -1,112 +0,0 @@ |
621 |
-# Copyright 1999-2021 Gentoo Authors |
622 |
-# Distributed under the terms of the GNU General Public License v2 |
623 |
-# $Id$ |
624 |
- |
625 |
-EAPI=7 |
626 |
-inherit cmake-utils toolchain-funcs xdg-utils |
627 |
- |
628 |
-DESCRIPTION="Animated sprite editor & pixel art tool" |
629 |
-HOMEPAGE="http://www.aseprite.org" |
630 |
-LICENSE="Proprietary" |
631 |
-SLOT="0" |
632 |
- |
633 |
-PATCHES=( |
634 |
- "${FILESDIR}/${P}-system_harfbuzz.patch" |
635 |
- "${FILESDIR}/${P}-system_libarchive.patch" |
636 |
- "${FILESDIR}/${P}-system_libwebp.patch" |
637 |
-) |
638 |
- |
639 |
-ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip" |
640 |
-ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}" |
641 |
- |
642 |
-SRC_URI="${ASEPRITE_URI}" |
643 |
-KEYWORDS="~amd64 ~x86" |
644 |
-S="${WORKDIR}" |
645 |
- |
646 |
-IUSE=" |
647 |
- debug |
648 |
- memleak |
649 |
- webp |
650 |
- kde |
651 |
-" |
652 |
- |
653 |
-RDEPEND=" |
654 |
- app-arch/libarchive |
655 |
- app-text/cmark |
656 |
- dev-libs/expat |
657 |
- dev-libs/tinyxml |
658 |
- =dev-games/aseprite-skia-9999-r96 |
659 |
- media-libs/freetype:2 |
660 |
- >=media-libs/giflib-5.0 |
661 |
- media-libs/fontconfig |
662 |
- media-libs/libpng:0 |
663 |
- webp? ( media-libs/libwebp ) |
664 |
- net-misc/curl |
665 |
- sys-apps/util-linux |
666 |
- sys-libs/zlib |
667 |
- virtual/jpeg:= |
668 |
- virtual/opengl |
669 |
- x11-libs/libX11 |
670 |
- x11-libs/libXcursor |
671 |
- x11-libs/pixman |
672 |
- kde? ( |
673 |
- kde-apps/thumbnailers |
674 |
- )" |
675 |
- |
676 |
-DOCS=( |
677 |
- EULA.txt |
678 |
- docs/ase-file-specs.md |
679 |
- docs/LICENSES.md |
680 |
- README.md) |
681 |
- |
682 |
-src_prepare() { |
683 |
- cmake-utils_src_prepare |
684 |
- |
685 |
- sed -i "s:Icon=aseprite:Icon=${EPREFIX}/usr/share/aseprite/data/icons/ase256.png:" "${S}/src/desktop/linux/aseprite.desktop" || die |
686 |
- sed -i "s:#!/usr/bin/sh:#!/bin/env sh:" "${S}/src/desktop/linux/aseprite-thumbnailer" || die |
687 |
-} |
688 |
- |
689 |
-src_configure() { |
690 |
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release |
691 |
- |
692 |
- local mycmakeargs=( |
693 |
- -DENABLE_UPDATER=OFF |
694 |
- -DENABLE_CCACHE="$(has ccache "${FEATURES}" && echo 'ON' || echo 'OFF')" |
695 |
- -DFULLSCREEN_PLATFORM=ON |
696 |
- -DUSE_SHARED_CMARK=ON |
697 |
- -DUSE_SHARED_CURL=ON |
698 |
- -DUSE_SHARED_GIFLIB=ON |
699 |
- -DUSE_SHARED_JPEGLIB=ON |
700 |
- -DUSE_SHARED_ZLIB=ON |
701 |
- -DUSE_SHARED_LIBARCHIVE=ON |
702 |
- -DUSE_SHARED_LIBPNG=ON |
703 |
- -DUSE_SHARED_TINYXML=ON |
704 |
- -DUSE_SHARED_PIXMAN=ON |
705 |
- -DUSE_SHARED_FREETYPE=ON |
706 |
- -DUSE_SHARED_HARFBUZZ=ON |
707 |
- -DUSE_SHARED_WEBP=ON |
708 |
- -DENABLE_DESKTOP_INTEGRATION=ON |
709 |
- -DENABLE_QT_THUMBNAILER="$(usex kde)" |
710 |
- -DENABLE_WEBP="$(usex webp)" |
711 |
- -DENABLE_MEMLEAK="$(usex memleak)" |
712 |
- -DLAF_BACKEND=skia |
713 |
- -DLAF_WITH_EXAMPLES=OFF |
714 |
- -DLAF_WITH_TESTS=OFF |
715 |
- -DSKIA_DIR="/var/lib/aseprite-skia" |
716 |
- -DSKIA_LIBRARY_DIR="/var/lib/aseprite-skia/out/Release" |
717 |
- ) |
718 |
- |
719 |
- cmake-utils_src_configure |
720 |
-} |
721 |
- |
722 |
-pkg_postinst() { |
723 |
- ewarn "Aseprite is for personal use only. You may not distribute it." |
724 |
- |
725 |
- xdg_desktop_database_update |
726 |
- xdg_mimeinfo_database_update |
727 |
-} |
728 |
- |
729 |
-pkg_postrm() { |
730 |
- xdg_desktop_database_update |
731 |
- xdg_mimeinfo_database_update |
732 |
-} |
733 |
|
734 |
diff --git a/dev-games/aseprite/aseprite-1.2.35.ebuild b/dev-games/aseprite/aseprite-1.2.35.ebuild |
735 |
deleted file mode 100644 |
736 |
index 79d6112..0000000 |
737 |
--- a/dev-games/aseprite/aseprite-1.2.35.ebuild |
738 |
+++ /dev/null |
739 |
@@ -1,112 +0,0 @@ |
740 |
-# Copyright 1999-2021 Gentoo Authors |
741 |
-# Distributed under the terms of the GNU General Public License v2 |
742 |
-# $Id$ |
743 |
- |
744 |
-EAPI=7 |
745 |
-inherit cmake-utils toolchain-funcs xdg-utils |
746 |
- |
747 |
-DESCRIPTION="Animated sprite editor & pixel art tool" |
748 |
-HOMEPAGE="http://www.aseprite.org" |
749 |
-LICENSE="Proprietary" |
750 |
-SLOT="0" |
751 |
- |
752 |
-PATCHES=( |
753 |
- "${FILESDIR}/${P}-system_harfbuzz.patch" |
754 |
- "${FILESDIR}/${P}-system_libarchive.patch" |
755 |
- "${FILESDIR}/${P}-system_libwebp.patch" |
756 |
-) |
757 |
- |
758 |
-ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip" |
759 |
-ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}" |
760 |
- |
761 |
-SRC_URI="${ASEPRITE_URI}" |
762 |
-KEYWORDS="~amd64 ~x86" |
763 |
-S="${WORKDIR}" |
764 |
- |
765 |
-IUSE=" |
766 |
- debug |
767 |
- memleak |
768 |
- webp |
769 |
- kde |
770 |
-" |
771 |
- |
772 |
-RDEPEND=" |
773 |
- app-arch/libarchive |
774 |
- app-text/cmark |
775 |
- dev-libs/expat |
776 |
- dev-libs/tinyxml |
777 |
- =dev-games/aseprite-skia-9999-r102 |
778 |
- media-libs/freetype:2 |
779 |
- >=media-libs/giflib-5.0 |
780 |
- media-libs/fontconfig |
781 |
- media-libs/libpng:0 |
782 |
- webp? ( media-libs/libwebp ) |
783 |
- net-misc/curl |
784 |
- sys-apps/util-linux |
785 |
- sys-libs/zlib |
786 |
- virtual/jpeg:= |
787 |
- virtual/opengl |
788 |
- x11-libs/libX11 |
789 |
- x11-libs/libXcursor |
790 |
- x11-libs/pixman |
791 |
- kde? ( |
792 |
- kde-apps/thumbnailers |
793 |
- )" |
794 |
- |
795 |
-DOCS=( |
796 |
- EULA.txt |
797 |
- docs/ase-file-specs.md |
798 |
- docs/LICENSES.md |
799 |
- README.md) |
800 |
- |
801 |
-src_prepare() { |
802 |
- cmake-utils_src_prepare |
803 |
- |
804 |
- sed -i "s:Icon=aseprite:Icon=${EPREFIX}/usr/share/aseprite/data/icons/ase256.png:" "${S}/src/desktop/linux/aseprite.desktop" || die |
805 |
- sed -i "s:#!/usr/bin/sh:#!/bin/env sh:" "${S}/src/desktop/linux/aseprite-thumbnailer" || die |
806 |
-} |
807 |
- |
808 |
-src_configure() { |
809 |
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release |
810 |
- |
811 |
- local mycmakeargs=( |
812 |
- -DENABLE_UPDATER=OFF |
813 |
- -DENABLE_CCACHE="$(has ccache "${FEATURES}" && echo 'ON' || echo 'OFF')" |
814 |
- -DFULLSCREEN_PLATFORM=ON |
815 |
- -DUSE_SHARED_CMARK=ON |
816 |
- -DUSE_SHARED_CURL=ON |
817 |
- -DUSE_SHARED_GIFLIB=ON |
818 |
- -DUSE_SHARED_JPEGLIB=ON |
819 |
- -DUSE_SHARED_ZLIB=ON |
820 |
- -DUSE_SHARED_LIBARCHIVE=ON |
821 |
- -DUSE_SHARED_LIBPNG=ON |
822 |
- -DUSE_SHARED_TINYXML=ON |
823 |
- -DUSE_SHARED_PIXMAN=ON |
824 |
- -DUSE_SHARED_FREETYPE=ON |
825 |
- -DUSE_SHARED_HARFBUZZ=ON |
826 |
- -DUSE_SHARED_WEBP=ON |
827 |
- -DENABLE_DESKTOP_INTEGRATION=ON |
828 |
- -DENABLE_QT_THUMBNAILER="$(usex kde)" |
829 |
- -DENABLE_WEBP="$(usex webp)" |
830 |
- -DENABLE_MEMLEAK="$(usex memleak)" |
831 |
- -DLAF_BACKEND=skia |
832 |
- -DLAF_WITH_EXAMPLES=OFF |
833 |
- -DLAF_WITH_TESTS=OFF |
834 |
- -DSKIA_DIR="/var/lib/aseprite-skia" |
835 |
- -DSKIA_LIBRARY_DIR="/var/lib/aseprite-skia/out/Release" |
836 |
- ) |
837 |
- |
838 |
- cmake-utils_src_configure |
839 |
-} |
840 |
- |
841 |
-pkg_postinst() { |
842 |
- ewarn "Aseprite is for personal use only. You may not distribute it." |
843 |
- |
844 |
- xdg_desktop_database_update |
845 |
- xdg_mimeinfo_database_update |
846 |
-} |
847 |
- |
848 |
-pkg_postrm() { |
849 |
- xdg_desktop_database_update |
850 |
- xdg_mimeinfo_database_update |
851 |
-} |
852 |
|
853 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.21-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.21-system_libarchive.patch |
854 |
deleted file mode 100644 |
855 |
index c032508..0000000 |
856 |
--- a/dev-games/aseprite/files/aseprite-1.2.21-system_libarchive.patch |
857 |
+++ /dev/null |
858 |
@@ -1,84 +0,0 @@ |
859 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
860 |
-index dae638be8..dd5d17794 100644 |
861 |
---- a/CMakeLists.txt |
862 |
-+++ b/CMakeLists.txt |
863 |
-@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off) |
864 |
- option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) |
865 |
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) |
866 |
- option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) |
867 |
-+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) |
868 |
- option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) |
869 |
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) |
870 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
871 |
-@@ -202,6 +202,15 @@ else() |
872 |
- endif() |
873 |
- include_directories(${ZLIB_INCLUDE_DIRS}) |
874 |
- |
875 |
-+# libarchive |
876 |
-+if(USE_SHARED_LIBARCHIVE) |
877 |
-+ find_library(ARCHIVE_LIBRARIES NAMES archive) |
878 |
-+ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h) |
879 |
-+else() |
880 |
-+ add_definitions(-DLIBARCHIVE_STATIC) |
881 |
-+ set(ARCHIVE_LIBRARIES archive_static) |
882 |
-+endif() |
883 |
-+ |
884 |
- # libpng |
885 |
- if(USE_SHARED_LIBPNG) |
886 |
- find_package(PNG REQUIRED) |
887 |
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt |
888 |
-index a9e80d73c..619acac92 100644 |
889 |
---- a/src/app/CMakeLists.txt |
890 |
-+++ b/src/app/CMakeLists.txt |
891 |
-@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT) |
892 |
- add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT) |
893 |
- endif() |
894 |
- |
895 |
--# libarchive definitions |
896 |
--add_definitions(-DLIBARCHIVE_STATIC) |
897 |
-- |
898 |
- ###################################################################### |
899 |
- # app-lib target |
900 |
- |
901 |
-@@ -551,7 +548,7 @@ target_link_libraries(app-lib |
902 |
- ${FREETYPE_LIBRARIES} |
903 |
- ${HARFBUZZ_LIBRARIES} |
904 |
- json11 |
905 |
-- archive_static |
906 |
-+ ${ARCHIVE_LIBRARIES} |
907 |
- fmt |
908 |
- tinyexpr) |
909 |
- |
910 |
-diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
911 |
-index 596ffa2e4..977816439 100644 |
912 |
---- a/third_party/CMakeLists.txt |
913 |
-+++ b/third_party/CMakeLists.txt |
914 |
-@@ -105,16 +105,18 @@ endif() |
915 |
- add_subdirectory(json11) |
916 |
- |
917 |
- # libarchive |
918 |
--set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
919 |
--set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
920 |
--set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
921 |
--set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
922 |
--set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
923 |
--set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
924 |
--set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
925 |
--add_subdirectory(libarchive) |
926 |
--target_include_directories(archive_static INTERFACE |
927 |
-- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
928 |
-+if(NOT USE_SHARED_LIBARCHIVE) |
929 |
-+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
930 |
-+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
931 |
-+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
932 |
-+ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
933 |
-+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
934 |
-+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
935 |
-+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
936 |
-+ add_subdirectory(libarchive) |
937 |
-+ target_include_directories(archive_static INTERFACE |
938 |
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
939 |
-+endif() |
940 |
- |
941 |
- # benchmark |
942 |
- if(ENABLE_BENCHMARKS) |
943 |
|
944 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.21-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.21-system_libwebp.patch |
945 |
deleted file mode 100644 |
946 |
index 896e03e..0000000 |
947 |
--- a/dev-games/aseprite/files/aseprite-1.2.21-system_libwebp.patch |
948 |
+++ /dev/null |
949 |
@@ -1,41 +0,0 @@ |
950 |
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
951 |
---- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100 |
952 |
-+++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200 |
953 |
-@@ -66,6 +66,7 @@ |
954 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
955 |
- option(USE_SHARED_FREETYPE "Use shared FreeType library" off) |
956 |
- option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) |
957 |
-+option(USE_SHARED_WEBP "Use your installed copy of webp" off) |
958 |
- option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) |
959 |
- option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) |
960 |
- option(ENABLE_NEWS "Enable the news in Home tab" on) |
961 |
-@@ -229,9 +230,14 @@ |
962 |
- |
963 |
- # libwebp |
964 |
- if(WITH_WEBP_SUPPORT) |
965 |
-- set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
966 |
-- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
967 |
-- include_directories(${WEBP_INCLUDE_DIR}) |
968 |
-+ if(USE_SHARED_WEBP) |
969 |
-+ find_library(WEBP_LIBRARIES NAMES webp) |
970 |
-+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) |
971 |
-+ else() |
972 |
-+ set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
973 |
-+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
974 |
-+ include_directories(${WEBP_INCLUDE_DIR}) |
975 |
-+ endif() |
976 |
- endif() |
977 |
- |
978 |
- # tinyxml |
979 |
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
980 |
---- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200 |
981 |
-+++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200 |
982 |
-@@ -32,7 +32,7 @@ |
983 |
- add_subdirectory(giflib) |
984 |
- endif() |
985 |
- |
986 |
--if(WITH_WEBP_SUPPORT) |
987 |
-+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) |
988 |
- set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") |
989 |
- add_subdirectory(libwebp) |
990 |
- endif() |
991 |
|
992 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.30-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.30-system_libarchive.patch |
993 |
deleted file mode 100644 |
994 |
index 2434840..0000000 |
995 |
--- a/dev-games/aseprite/files/aseprite-1.2.30-system_libarchive.patch |
996 |
+++ /dev/null |
997 |
@@ -1,90 +0,0 @@ |
998 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
999 |
-index dae638be8..dd5d17794 100644 |
1000 |
---- a/CMakeLists.txt |
1001 |
-+++ b/CMakeLists.txt |
1002 |
-@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off) |
1003 |
- option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) |
1004 |
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) |
1005 |
- option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) |
1006 |
-+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) |
1007 |
- option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) |
1008 |
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) |
1009 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
1010 |
-@@ -202,6 +202,15 @@ else() |
1011 |
- endif() |
1012 |
- include_directories(${ZLIB_INCLUDE_DIRS}) |
1013 |
- |
1014 |
-+# libarchive |
1015 |
-+if(USE_SHARED_LIBARCHIVE) |
1016 |
-+ find_library(ARCHIVE_LIBRARIES NAMES archive) |
1017 |
-+ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h) |
1018 |
-+else() |
1019 |
-+ add_definitions(-DLIBARCHIVE_STATIC) |
1020 |
-+ set(ARCHIVE_LIBRARIES archive_static) |
1021 |
-+endif() |
1022 |
-+ |
1023 |
- # libpng |
1024 |
- if(USE_SHARED_LIBPNG) |
1025 |
- find_package(PNG REQUIRED) |
1026 |
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt |
1027 |
-index a9e80d73c..619acac92 100644 |
1028 |
---- a/src/app/CMakeLists.txt |
1029 |
-+++ b/src/app/CMakeLists.txt |
1030 |
-@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT) |
1031 |
- add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT) |
1032 |
- endif() |
1033 |
- |
1034 |
--# libarchive definitions |
1035 |
--add_definitions(-DLIBARCHIVE_STATIC) |
1036 |
-- |
1037 |
- ###################################################################### |
1038 |
- # app-lib target |
1039 |
- |
1040 |
-@@ -551,7 +548,7 @@ target_link_libraries(app-lib |
1041 |
- ${FREETYPE_LIBRARIES} |
1042 |
- ${HARFBUZZ_LIBRARIES} |
1043 |
- json11 |
1044 |
-- archive_static |
1045 |
-+ ${ARCHIVE_LIBRARIES} |
1046 |
- fmt |
1047 |
- tinyexpr) |
1048 |
- |
1049 |
-diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
1050 |
-index 596ffa2e4..977816439 100644 |
1051 |
---- a/third_party/CMakeLists.txt |
1052 |
-+++ b/third_party/CMakeLists.txt |
1053 |
-@@ -105,19 +105,21 @@ endif() |
1054 |
- add_subdirectory(json11) |
1055 |
- |
1056 |
- # libarchive |
1057 |
--set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
1058 |
--set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
1059 |
--set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
1060 |
--set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
1061 |
--set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
1062 |
--set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
1063 |
--set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
1064 |
--set(ENABLE_CAT OFF CACHE BOOL "Enable cat building") |
1065 |
--set(ENABLE_TAR OFF CACHE BOOL "Enable tar building") |
1066 |
--set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") |
1067 |
--add_subdirectory(libarchive) |
1068 |
--target_include_directories(archive_static INTERFACE |
1069 |
-- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
1070 |
-+if(NOT USE_SHARED_LIBARCHIVE) |
1071 |
-+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
1072 |
-+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
1073 |
-+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
1074 |
-+ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
1075 |
-+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
1076 |
-+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
1077 |
-+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
1078 |
-+ set(ENABLE_CAT OFF CACHE BOOL "Enable cat building") |
1079 |
-+ set(ENABLE_TAR OFF CACHE BOOL "Enable tar building") |
1080 |
-+ set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") |
1081 |
-+ add_subdirectory(libarchive) |
1082 |
-+ target_include_directories(archive_static INTERFACE |
1083 |
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
1084 |
-+endif() |
1085 |
- |
1086 |
- # benchmark |
1087 |
- if(ENABLE_BENCHMARKS) |
1088 |
|
1089 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.30-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.30-system_libwebp.patch |
1090 |
deleted file mode 100644 |
1091 |
index 896e03e..0000000 |
1092 |
--- a/dev-games/aseprite/files/aseprite-1.2.30-system_libwebp.patch |
1093 |
+++ /dev/null |
1094 |
@@ -1,41 +0,0 @@ |
1095 |
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
1096 |
---- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100 |
1097 |
-+++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200 |
1098 |
-@@ -66,6 +66,7 @@ |
1099 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
1100 |
- option(USE_SHARED_FREETYPE "Use shared FreeType library" off) |
1101 |
- option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) |
1102 |
-+option(USE_SHARED_WEBP "Use your installed copy of webp" off) |
1103 |
- option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) |
1104 |
- option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) |
1105 |
- option(ENABLE_NEWS "Enable the news in Home tab" on) |
1106 |
-@@ -229,9 +230,14 @@ |
1107 |
- |
1108 |
- # libwebp |
1109 |
- if(WITH_WEBP_SUPPORT) |
1110 |
-- set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
1111 |
-- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
1112 |
-- include_directories(${WEBP_INCLUDE_DIR}) |
1113 |
-+ if(USE_SHARED_WEBP) |
1114 |
-+ find_library(WEBP_LIBRARIES NAMES webp) |
1115 |
-+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) |
1116 |
-+ else() |
1117 |
-+ set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
1118 |
-+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
1119 |
-+ include_directories(${WEBP_INCLUDE_DIR}) |
1120 |
-+ endif() |
1121 |
- endif() |
1122 |
- |
1123 |
- # tinyxml |
1124 |
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
1125 |
---- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200 |
1126 |
-+++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200 |
1127 |
-@@ -32,7 +32,7 @@ |
1128 |
- add_subdirectory(giflib) |
1129 |
- endif() |
1130 |
- |
1131 |
--if(WITH_WEBP_SUPPORT) |
1132 |
-+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) |
1133 |
- set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") |
1134 |
- add_subdirectory(libwebp) |
1135 |
- endif() |
1136 |
|
1137 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.34.1-system_harfbuzz.patch b/dev-games/aseprite/files/aseprite-1.2.34.1-system_harfbuzz.patch |
1138 |
deleted file mode 100644 |
1139 |
index f7c8543..0000000 |
1140 |
--- a/dev-games/aseprite/files/aseprite-1.2.34.1-system_harfbuzz.patch |
1141 |
+++ /dev/null |
1142 |
@@ -1,23 +0,0 @@ |
1143 |
-diff -uNr a/laf/CMakeLists.txt b/laf/CMakeLists.txt |
1144 |
---- a/laf/CMakeLists.txt 2021-12-01 22:06:08.000000000 +0100 |
1145 |
-+++ b/laf/CMakeLists.txt 2022-02-15 18:05:31.640137967 +0100 |
1146 |
-@@ -44,13 +44,12 @@ |
1147 |
- # Find libraries |
1148 |
- if(LAF_BACKEND STREQUAL "skia") |
1149 |
- include(FindSkia) |
1150 |
--else() |
1151 |
-- if(NOT FREETYPE_LIBRARIES) |
1152 |
-- find_package(Freetype) |
1153 |
-- endif() |
1154 |
-- if(NOT HARFBUZZ_LIBRARIES) |
1155 |
-- find_package(HarfBuzz) |
1156 |
-- endif() |
1157 |
-+endif() |
1158 |
-+if(NOT FREETYPE_LIBRARIES) |
1159 |
-+ find_package(Freetype) |
1160 |
-+endif() |
1161 |
-+if(NOT HARFBUZZ_LIBRARIES) |
1162 |
-+ find_package(HarfBuzz) |
1163 |
- endif() |
1164 |
- |
1165 |
- add_subdirectory(third_party) |
1166 |
|
1167 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.34.1-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.34.1-system_libarchive.patch |
1168 |
deleted file mode 100644 |
1169 |
index 8b23f45..0000000 |
1170 |
--- a/dev-games/aseprite/files/aseprite-1.2.34.1-system_libarchive.patch |
1171 |
+++ /dev/null |
1172 |
@@ -1,93 +0,0 @@ |
1173 |
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
1174 |
---- a/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100 |
1175 |
-+++ b/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100 |
1176 |
-@@ -57,6 +57,7 @@ |
1177 |
- option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) |
1178 |
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) |
1179 |
- option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) |
1180 |
-+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) |
1181 |
- option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) |
1182 |
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) |
1183 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
1184 |
-@@ -216,6 +217,15 @@ |
1185 |
- endif() |
1186 |
- include_directories(${ZLIB_INCLUDE_DIRS}) |
1187 |
- |
1188 |
-+# libarchive |
1189 |
-+if(USE_SHARED_LIBARCHIVE) |
1190 |
-+ find_library(ARCHIVE_LIBRARIES NAMES archive) |
1191 |
-+ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h) |
1192 |
-+else() |
1193 |
-+ add_definitions(-DLIBARCHIVE_STATIC) |
1194 |
-+ set(ARCHIVE_LIBRARIES archive_static) |
1195 |
-+endif() |
1196 |
-+ |
1197 |
- # libpng |
1198 |
- if(USE_SHARED_LIBPNG) |
1199 |
- find_package(PNG REQUIRED) |
1200 |
-diff -uNr a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt |
1201 |
---- a/src/app/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100 |
1202 |
-+++ b/src/app/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100 |
1203 |
-@@ -91,9 +91,6 @@ |
1204 |
- add_definitions(-DENABLE_WEBP) |
1205 |
- endif() |
1206 |
- |
1207 |
--# libarchive definitions |
1208 |
--add_definitions(-DLIBARCHIVE_STATIC) |
1209 |
-- |
1210 |
- ###################################################################### |
1211 |
- # app-lib target |
1212 |
- |
1213 |
-@@ -669,7 +666,7 @@ |
1214 |
- ${FREETYPE_LIBRARIES} |
1215 |
- ${HARFBUZZ_LIBRARIES} |
1216 |
- json11 |
1217 |
-- archive_static |
1218 |
-+ ${ARCHIVE_LIBRARIES} |
1219 |
- fmt |
1220 |
- tinyexpr) |
1221 |
- |
1222 |
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
1223 |
---- a/third_party/CMakeLists.txt 2022-01-12 15:10:34.000000000 +0100 |
1224 |
-+++ b/third_party/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100 |
1225 |
-@@ -119,22 +119,24 @@ |
1226 |
- add_subdirectory(json11) |
1227 |
- |
1228 |
- # libarchive |
1229 |
--set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
1230 |
--set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
1231 |
--set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
1232 |
--set(ENABLE_LZ4 OFF CACHE BOOL "Enable the use of the system LZ4 library if found") |
1233 |
--set(ENABLE_LZO OFF CACHE BOOL "Enable the use of the system LZO library if found") |
1234 |
--set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
1235 |
--set(ENABLE_ZSTD OFF CACHE BOOL "Enable the use of the system zstd library if found") |
1236 |
--set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
1237 |
--set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
1238 |
--set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
1239 |
--set(ENABLE_CAT OFF CACHE BOOL "Enable cat building") |
1240 |
--set(ENABLE_TAR OFF CACHE BOOL "Enable tar building") |
1241 |
--set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") |
1242 |
--add_subdirectory(libarchive) |
1243 |
--target_include_directories(archive_static INTERFACE |
1244 |
-- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
1245 |
-+if(NOT USE_SHARED_LIBARCHIVE) |
1246 |
-+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
1247 |
-+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
1248 |
-+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
1249 |
-+ set(ENABLE_LZ4 OFF CACHE BOOL "Enable the use of the system LZ4 library if found") |
1250 |
-+ set(ENABLE_LZO OFF CACHE BOOL "Enable the use of the system LZO library if found") |
1251 |
-+ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
1252 |
-+ set(ENABLE_ZSTD OFF CACHE BOOL "Enable the use of the system zstd library if found") |
1253 |
-+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
1254 |
-+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
1255 |
-+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
1256 |
-+ set(ENABLE_CAT OFF CACHE BOOL "Enable cat building") |
1257 |
-+ set(ENABLE_TAR OFF CACHE BOOL "Enable tar building") |
1258 |
-+ set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") |
1259 |
-+ add_subdirectory(libarchive) |
1260 |
-+ target_include_directories(archive_static INTERFACE |
1261 |
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
1262 |
-+endif() |
1263 |
- |
1264 |
- # benchmark |
1265 |
- if(ENABLE_BENCHMARKS) |
1266 |
|
1267 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.34.1-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.34.1-system_libwebp.patch |
1268 |
deleted file mode 100644 |
1269 |
index 161e4f8..0000000 |
1270 |
--- a/dev-games/aseprite/files/aseprite-1.2.34.1-system_libwebp.patch |
1271 |
+++ /dev/null |
1272 |
@@ -1,44 +0,0 @@ |
1273 |
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
1274 |
---- a/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100 |
1275 |
-+++ b/CMakeLists.txt 2022-02-15 18:39:49.384093189 +0100 |
1276 |
-@@ -62,6 +62,7 @@ |
1277 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
1278 |
- option(USE_SHARED_FREETYPE "Use shared FreeType library" off) |
1279 |
- option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) |
1280 |
-+option(USE_SHARED_WEBP "Use your installed copy of webp" off) |
1281 |
- option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) |
1282 |
- option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) |
1283 |
- option(ENABLE_NEWS "Enable the news in Home tab" on) |
1284 |
-@@ -235,9 +236,17 @@ |
1285 |
- |
1286 |
- # libwebp |
1287 |
- if(ENABLE_WEBP) |
1288 |
-- set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
1289 |
-- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
1290 |
-- include_directories(${WEBP_INCLUDE_DIR}) |
1291 |
-+ if(USE_SHARED_WEBP) |
1292 |
-+ find_library(WEBP_LIBRARY NAMES webp) |
1293 |
-+ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) |
1294 |
-+ find_library(WEBPMUX_LIBRARY NAMES webpmux) |
1295 |
-+ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) |
1296 |
-+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) |
1297 |
-+ else() |
1298 |
-+ set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
1299 |
-+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
1300 |
-+ include_directories(${WEBP_INCLUDE_DIR}) |
1301 |
-+ endif() |
1302 |
- endif() |
1303 |
- |
1304 |
- # tinyxml |
1305 |
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
1306 |
---- a/third_party/CMakeLists.txt 2022-01-12 15:10:34.000000000 +0100 |
1307 |
-+++ b/third_party/CMakeLists.txt 2022-02-15 18:39:26.632093684 +0100 |
1308 |
-@@ -33,7 +33,7 @@ |
1309 |
- add_subdirectory(giflib) |
1310 |
- endif() |
1311 |
- |
1312 |
--if(ENABLE_WEBP) |
1313 |
-+if(ENABLE_WEBP AND NOT USE_SHARED_WEBP) |
1314 |
- set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") |
1315 |
- set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.") |
1316 |
- set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.") |
1317 |
|
1318 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.35-system_harfbuzz.patch b/dev-games/aseprite/files/aseprite-1.2.35-system_harfbuzz.patch |
1319 |
deleted file mode 100644 |
1320 |
index f7c8543..0000000 |
1321 |
--- a/dev-games/aseprite/files/aseprite-1.2.35-system_harfbuzz.patch |
1322 |
+++ /dev/null |
1323 |
@@ -1,23 +0,0 @@ |
1324 |
-diff -uNr a/laf/CMakeLists.txt b/laf/CMakeLists.txt |
1325 |
---- a/laf/CMakeLists.txt 2021-12-01 22:06:08.000000000 +0100 |
1326 |
-+++ b/laf/CMakeLists.txt 2022-02-15 18:05:31.640137967 +0100 |
1327 |
-@@ -44,13 +44,12 @@ |
1328 |
- # Find libraries |
1329 |
- if(LAF_BACKEND STREQUAL "skia") |
1330 |
- include(FindSkia) |
1331 |
--else() |
1332 |
-- if(NOT FREETYPE_LIBRARIES) |
1333 |
-- find_package(Freetype) |
1334 |
-- endif() |
1335 |
-- if(NOT HARFBUZZ_LIBRARIES) |
1336 |
-- find_package(HarfBuzz) |
1337 |
-- endif() |
1338 |
-+endif() |
1339 |
-+if(NOT FREETYPE_LIBRARIES) |
1340 |
-+ find_package(Freetype) |
1341 |
-+endif() |
1342 |
-+if(NOT HARFBUZZ_LIBRARIES) |
1343 |
-+ find_package(HarfBuzz) |
1344 |
- endif() |
1345 |
- |
1346 |
- add_subdirectory(third_party) |
1347 |
|
1348 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.35-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.35-system_libarchive.patch |
1349 |
deleted file mode 100644 |
1350 |
index 699d3bd..0000000 |
1351 |
--- a/dev-games/aseprite/files/aseprite-1.2.35-system_libarchive.patch |
1352 |
+++ /dev/null |
1353 |
@@ -1,97 +0,0 @@ |
1354 |
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
1355 |
---- a/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100 |
1356 |
-+++ b/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100 |
1357 |
-@@ -57,6 +57,7 @@ |
1358 |
- option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) |
1359 |
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) |
1360 |
- option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) |
1361 |
-+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) |
1362 |
- option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) |
1363 |
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) |
1364 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
1365 |
-@@ -216,6 +217,15 @@ |
1366 |
- endif() |
1367 |
- include_directories(${ZLIB_INCLUDE_DIRS}) |
1368 |
- |
1369 |
-+# libarchive |
1370 |
-+if(USE_SHARED_LIBARCHIVE) |
1371 |
-+ find_library(ARCHIVE_LIBRARIES NAMES archive) |
1372 |
-+ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h) |
1373 |
-+else() |
1374 |
-+ add_definitions(-DLIBARCHIVE_STATIC) |
1375 |
-+ set(ARCHIVE_LIBRARIES archive_static) |
1376 |
-+endif() |
1377 |
-+ |
1378 |
- # libpng |
1379 |
- if(USE_SHARED_LIBPNG) |
1380 |
- find_package(PNG REQUIRED) |
1381 |
-diff -uNr a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt |
1382 |
---- a/src/app/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100 |
1383 |
-+++ b/src/app/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100 |
1384 |
-@@ -91,9 +91,6 @@ |
1385 |
- add_definitions(-DENABLE_WEBP) |
1386 |
- endif() |
1387 |
- |
1388 |
--# libarchive definitions |
1389 |
--add_definitions(-DLIBARCHIVE_STATIC) |
1390 |
-- |
1391 |
- ###################################################################### |
1392 |
- # app-lib target |
1393 |
- |
1394 |
-@@ -669,7 +666,7 @@ |
1395 |
- ${FREETYPE_LIBRARIES} |
1396 |
- ${HARFBUZZ_LIBRARIES} |
1397 |
- json11 |
1398 |
-- archive_static |
1399 |
-+ ${ARCHIVE_LIBRARIES} |
1400 |
- fmt |
1401 |
- tinyexpr) |
1402 |
- |
1403 |
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
1404 |
---- a/third_party/CMakeLists.txt 2022-01-12 15:10:34.000000000 +0100 |
1405 |
-+++ b/third_party/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100 |
1406 |
-@@ -119,24 +119,26 @@ |
1407 |
- add_subdirectory(json11) |
1408 |
- |
1409 |
- # libarchive |
1410 |
--set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
1411 |
--set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
1412 |
--set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
1413 |
--set(ENABLE_LZ4 OFF CACHE BOOL "Enable the use of the system LZ4 library if found") |
1414 |
--set(ENABLE_LZO OFF CACHE BOOL "Enable the use of the system LZO library if found") |
1415 |
--set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
1416 |
--set(ENABLE_ZSTD OFF CACHE BOOL "Enable the use of the system zstd library if found") |
1417 |
--set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
1418 |
--set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
1419 |
--set(ENABLE_EXPAT OFF CACHE BOOL "Enable the use of the system EXPAT library if found") |
1420 |
--set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
1421 |
--set(ENABLE_CAT OFF CACHE BOOL "Enable cat building") |
1422 |
--set(ENABLE_TAR OFF CACHE BOOL "Enable tar building") |
1423 |
--set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") |
1424 |
--set(ENABLE_LIBB2 OFF CACHE BOOL "Enable the use of the system LIBB2 library if found") |
1425 |
--add_subdirectory(libarchive) |
1426 |
--target_include_directories(archive_static INTERFACE |
1427 |
-- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
1428 |
-+if(NOT USE_SHARED_LIBARCHIVE) |
1429 |
-+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") |
1430 |
-+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") |
1431 |
-+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") |
1432 |
-+ set(ENABLE_LZ4 OFF CACHE BOOL "Enable the use of the system LZ4 library if found") |
1433 |
-+ set(ENABLE_LZO OFF CACHE BOOL "Enable the use of the system LZO library if found") |
1434 |
-+ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found") |
1435 |
-+ set(ENABLE_ZSTD OFF CACHE BOOL "Enable the use of the system zstd library if found") |
1436 |
-+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)") |
1437 |
-+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found") |
1438 |
-+ set(ENABLE_EXPAT OFF CACHE BOOL "Enable the use of the system EXPAT library if found") |
1439 |
-+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found") |
1440 |
-+ set(ENABLE_CAT OFF CACHE BOOL "Enable cat building") |
1441 |
-+ set(ENABLE_TAR OFF CACHE BOOL "Enable tar building") |
1442 |
-+ set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") |
1443 |
-+ set(ENABLE_LIBB2 OFF CACHE BOOL "Enable the use of the system LIBB2 library if found") |
1444 |
-+ add_subdirectory(libarchive) |
1445 |
-+ target_include_directories(archive_static INTERFACE |
1446 |
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>) |
1447 |
-+endif() |
1448 |
- |
1449 |
- # benchmark |
1450 |
- if(ENABLE_BENCHMARKS) |
1451 |
|
1452 |
diff --git a/dev-games/aseprite/files/aseprite-1.2.35-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.35-system_libwebp.patch |
1453 |
deleted file mode 100644 |
1454 |
index 161e4f8..0000000 |
1455 |
--- a/dev-games/aseprite/files/aseprite-1.2.35-system_libwebp.patch |
1456 |
+++ /dev/null |
1457 |
@@ -1,44 +0,0 @@ |
1458 |
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt |
1459 |
---- a/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100 |
1460 |
-+++ b/CMakeLists.txt 2022-02-15 18:39:49.384093189 +0100 |
1461 |
-@@ -62,6 +62,7 @@ |
1462 |
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) |
1463 |
- option(USE_SHARED_FREETYPE "Use shared FreeType library" off) |
1464 |
- option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) |
1465 |
-+option(USE_SHARED_WEBP "Use your installed copy of webp" off) |
1466 |
- option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) |
1467 |
- option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) |
1468 |
- option(ENABLE_NEWS "Enable the news in Home tab" on) |
1469 |
-@@ -235,9 +236,17 @@ |
1470 |
- |
1471 |
- # libwebp |
1472 |
- if(ENABLE_WEBP) |
1473 |
-- set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
1474 |
-- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
1475 |
-- include_directories(${WEBP_INCLUDE_DIR}) |
1476 |
-+ if(USE_SHARED_WEBP) |
1477 |
-+ find_library(WEBP_LIBRARY NAMES webp) |
1478 |
-+ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) |
1479 |
-+ find_library(WEBPMUX_LIBRARY NAMES webpmux) |
1480 |
-+ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) |
1481 |
-+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) |
1482 |
-+ else() |
1483 |
-+ set(WEBP_LIBRARIES webp webpdemux libwebpmux) |
1484 |
-+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) |
1485 |
-+ include_directories(${WEBP_INCLUDE_DIR}) |
1486 |
-+ endif() |
1487 |
- endif() |
1488 |
- |
1489 |
- # tinyxml |
1490 |
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt |
1491 |
---- a/third_party/CMakeLists.txt 2022-01-12 15:10:34.000000000 +0100 |
1492 |
-+++ b/third_party/CMakeLists.txt 2022-02-15 18:39:26.632093684 +0100 |
1493 |
-@@ -33,7 +33,7 @@ |
1494 |
- add_subdirectory(giflib) |
1495 |
- endif() |
1496 |
- |
1497 |
--if(ENABLE_WEBP) |
1498 |
-+if(ENABLE_WEBP AND NOT USE_SHARED_WEBP) |
1499 |
- set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") |
1500 |
- set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.") |
1501 |
- set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.") |