* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2021-04-15 18:28 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2021-04-15 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 2532654d9481c4870a5a866695a130618f6c3896
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Thu Apr 15 18:27:55 2021 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Thu Apr 15 18:27:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=2532654d
dev-games/aseprite-1.2.26
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 10 +++++-----
.../{aseprite-1.2.25.ebuild => aseprite-1.2.26.ebuild} | 0
...ibarchive.patch => aseprite-1.2.26-system_libarchive.patch} | 0
...stem_libwebp.patch => aseprite-1.2.26-system_libwebp.patch} | 0
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index b2ff85d..4a991e0 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,12 +1,12 @@
AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
-AUX aseprite-1.2.25-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
-AUX aseprite-1.2.25-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
+AUX aseprite-1.2.26-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.26-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
-DIST Aseprite-v1.2.25-Source.zip 24487484 BLAKE2B ea08aa2fc61ffbeb783de7547c17ebce628270efb9b106512631cbf3fad2758fd92902e13d3763f2e2685517d276bca2a33b6838c38d941290dd3939e9074cc3 SHA512 45da65b4b3af495fd000923bab58c62703a7c18a1be4b48ce234b3401cc624de70f0c597e3d00b0f4f18c98fab85eaeccfedbbfb45fd0779471f0383d5fa272c
+DIST Aseprite-v1.2.26-Source.zip 24506961 BLAKE2B 1e57477ecb37d76bc1b56cd649300b6030c95c67b6575515a8bf2e024ab377f25e740763fcbe0a92a1156c1157e169d51ec71979c59bd8bac186352baafd75ca SHA512 7dcf18bf006d1d59e641b2e13d67dfec44323f0a5dfc2ebee57d427cf9d58595c67c1b47a6b656df97b33fafcc3a19dac7e9d7522bb4069ad2d02bd5b0364c9c
DIST aseprite-1.2.21-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
-DIST aseprite-1.2.25-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST aseprite-1.2.26-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
EBUILD aseprite-1.2.21.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
-EBUILD aseprite-1.2.25.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
+EBUILD aseprite-1.2.26.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
diff --git a/dev-games/aseprite/aseprite-1.2.25.ebuild b/dev-games/aseprite/aseprite-1.2.26.ebuild
similarity index 100%
rename from dev-games/aseprite/aseprite-1.2.25.ebuild
rename to dev-games/aseprite/aseprite-1.2.26.ebuild
diff --git a/dev-games/aseprite/files/aseprite-1.2.25-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.25-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.25-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.25-system_libwebp.patch
rename to dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2022-03-16 7:59 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2022-03-16 7:59 UTC (permalink / raw
To: gentoo-commits
commit: fe3a315db72c6b2a701249a7f14901f92c82a61e
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Wed Mar 16 07:59:04 2022 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Wed Mar 16 07:59:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=fe3a315d
dev-games/aseprite-1.2.34.1
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 5 +
dev-games/aseprite/aseprite-1.2.34.1.ebuild | 112 +++++++++++++++++++++
.../files/aseprite-1.2.34.1-system_harfbuzz.patch | 23 +++++
.../aseprite-1.2.34.1-system_libarchive.patch | 93 +++++++++++++++++
.../files/aseprite-1.2.34.1-system_libwebp.patch | 44 ++++++++
5 files changed, 277 insertions(+)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 5afde3a..0cc548c 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -5,13 +5,18 @@ AUX aseprite-1.2.30-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8
AUX aseprite-1.2.33-system_harfbuzz.patch 580 BLAKE2B 76874db3b8d1b164dfe46926ebd30dd7f782081104a000ff2c74733f4283aa20710072ddee0cae3022af4d9cf8d5ebd90c5db93dae8f46c05d5b08c2b1efcb3a SHA512 fa36b354e5d42beb7c846a89edbda2d2b6071047eddc1c522a1115fa58b9ccf83a680ff0318cc022feebdda3c98818677c748e10d18c81c0b728b819aca52fc1
AUX aseprite-1.2.33-system_libarchive.patch 4375 BLAKE2B 15d0956e267d3ab756fd5c1c1799718dd484c501b501a9683b3f3709aded515ece3f0fd2eb87afc3a70e53015cf77d8b9a36505f83d0d8823aca64b3b35e2207 SHA512 ff07fa565fff198e59a4e2667c731d1b7f60886d6ebd34b3d3d513acf51f59f666b6b2743c2e27cf67bc0986936eb11524f2d42b7f629cbfd3930dd6d8218a55
AUX aseprite-1.2.33-system_libwebp.patch 1871 BLAKE2B 399933e038f6eefa71e95c3256b3ba9f9ac93cc230cf9e6c04f76af5ed77e085f929b1edc5d8a3ce8d69b4f84a384877c9e0745721b9c074c7f56e385b093f44 SHA512 7fb7b7e3a9a5d97e7dcb1668b3aecba33b1903e36ddeaea2d6d5e1c0a39bafc7164345c162133cf198edbbaee5aff81ee19836b660e1fd6af175425d90201f2e
+AUX aseprite-1.2.34.1-system_harfbuzz.patch 580 BLAKE2B 76874db3b8d1b164dfe46926ebd30dd7f782081104a000ff2c74733f4283aa20710072ddee0cae3022af4d9cf8d5ebd90c5db93dae8f46c05d5b08c2b1efcb3a SHA512 fa36b354e5d42beb7c846a89edbda2d2b6071047eddc1c522a1115fa58b9ccf83a680ff0318cc022feebdda3c98818677c748e10d18c81c0b728b819aca52fc1
+AUX aseprite-1.2.34.1-system_libarchive.patch 4375 BLAKE2B 15d0956e267d3ab756fd5c1c1799718dd484c501b501a9683b3f3709aded515ece3f0fd2eb87afc3a70e53015cf77d8b9a36505f83d0d8823aca64b3b35e2207 SHA512 ff07fa565fff198e59a4e2667c731d1b7f60886d6ebd34b3d3d513acf51f59f666b6b2743c2e27cf67bc0986936eb11524f2d42b7f629cbfd3930dd6d8218a55
+AUX aseprite-1.2.34.1-system_libwebp.patch 1871 BLAKE2B 399933e038f6eefa71e95c3256b3ba9f9ac93cc230cf9e6c04f76af5ed77e085f929b1edc5d8a3ce8d69b4f84a384877c9e0745721b9c074c7f56e385b093f44 SHA512 7fb7b7e3a9a5d97e7dcb1668b3aecba33b1903e36ddeaea2d6d5e1c0a39bafc7164345c162133cf198edbbaee5aff81ee19836b660e1fd6af175425d90201f2e
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
DIST Aseprite-v1.2.30-Source.zip 30057883 BLAKE2B fc3a0923c963ae4adf0afc4f2bc9949a5f86123250eb0600ada35e711da35363b7719cbfe0296f1b6faf90e948b58318a56918f926eb3361baf576a81c16280b SHA512 c8534cc093a22078b44c3ae265625292e228e44bca894fbeb137759259862cc8956027a04d6982fdf1b6af2d8cd349842e1fc128827064e000de03e851e6620f
DIST Aseprite-v1.2.33-Source.zip 56234668 BLAKE2B 4afeaa210a31b26e76fb69c0b13b3c79598336241573c7db17248b37b28776eb95173da6181593f876591c851f4d480e8a83b2360c58b4f10524c05659fbefe0 SHA512 a965b6728283808a8fb8498ff557570014a0247fcb07585f0278088ddb65a79b2727bbfe57ba2edd1f275982c727c733a23013250ce82b1d2a242467b3105337
+DIST Aseprite-v1.2.34.1-Source.zip 56240404 BLAKE2B 14a7867955f34332584ff137efbb77605ffda6d01e6902e40fa34a6ba6453a29b0de9e8c121232b5e65c3c8c266f2540a1cf98eaeaba486233b8bc2d67404b36 SHA512 43a7eeb542f621d2b4dc236b803a7fe3816d08a26c4b4974ba98c30d921da6f481234542bad715ffacd3efd175e404deda0e20611819c565bc41d2e60da2047a
DIST aseprite-skia-m81-b607b32047-amd64.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
DIST aseprite-skia-m81-b607b32047-x86.zip 33398654 BLAKE2B b312f09d54e81b1b77c8100443ae1464bbe22edb9ce21fdb17a1b0f56dff728665070ad5b895f70420c0671fac973267271eb864b240fc8a070ca9f2e676b363 SHA512 37a093fb9ab9f6c766f406fa62a610921108b118d2a324cf1e0d6f3b635992034f222ba3eb9a023dc968312e53ede29b6fa18628cfd484eddd52bcfe8383823c
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
EBUILD aseprite-1.2.21.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72
EBUILD aseprite-1.2.30.ebuild 2769 BLAKE2B e930dc6f025e428a194d3543fabedc963177cb625dd8354a38f70f5b6d8b8d4c3212a1e3b31771415fa2a3d26953e55db51770fd6f1291aa18b04162dfdb17e5 SHA512 9ee2454b560b5479bc4a55477d50bea3dd6c86175e5a6b816cc95527709b44a4a0e1afdd27d95c5a130e05816afa44b3005445669c7cd9bf1dc7aee391a03c4b
EBUILD aseprite-1.2.33.ebuild 2529 BLAKE2B 6894a72da565dce8243921de92546db8d448e440f2a9814624a6bdbbaff0cebc32e2c9b455f41fe84c4d003c2dc65e4d73d9e1da100d09424693ba9d1aa2d327 SHA512 e6b88031a9ccf1cbb5dcb0e54bae86a7483c18245bede5798939832bdca6fab22be604691432e44abdfaa484d782b3c05c10d75686ba9e15f46fd37e00c71716
+EBUILD aseprite-1.2.34.1.ebuild 2529 BLAKE2B 6894a72da565dce8243921de92546db8d448e440f2a9814624a6bdbbaff0cebc32e2c9b455f41fe84c4d003c2dc65e4d73d9e1da100d09424693ba9d1aa2d327 SHA512 e6b88031a9ccf1cbb5dcb0e54bae86a7483c18245bede5798939832bdca6fab22be604691432e44abdfaa484d782b3c05c10d75686ba9e15f46fd37e00c71716
diff --git a/dev-games/aseprite/aseprite-1.2.34.1.ebuild b/dev-games/aseprite/aseprite-1.2.34.1.ebuild
new file mode 100644
index 0000000..96d4a58
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.34.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+inherit cmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+LICENSE="Proprietary"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${P}-system_harfbuzz.patch"
+ "${FILESDIR}/${P}-system_libarchive.patch"
+ "${FILESDIR}/${P}-system_libwebp.patch"
+)
+
+ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
+ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
+
+SRC_URI="${ASEPRITE_URI}"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}"
+
+IUSE="
+ debug
+ memleak
+ webp
+ kde
+"
+
+RDEPEND="
+ app-arch/libarchive
+ app-text/cmark
+ dev-libs/expat
+ dev-libs/tinyxml
+ =dev-games/aseprite-skia-9999-r96
+ media-libs/freetype:2
+ >=media-libs/giflib-5.0
+ media-libs/fontconfig
+ media-libs/libpng:0
+ webp? ( media-libs/libwebp )
+ net-misc/curl
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/jpeg:=
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/pixman
+ kde? (
+ kde-apps/thumbnailers
+ )"
+
+DOCS=(
+ EULA.txt
+ docs/ase-file-specs.md
+ docs/LICENSES.md
+ README.md)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i "s:Icon=aseprite:Icon=${EPREFIX}/usr/share/aseprite/data/icons/ase256.png:" "${S}/src/desktop/linux/aseprite.desktop" || die
+ sed -i "s:#!/usr/bin/sh:#!/bin/env sh:" "${S}/src/desktop/linux/aseprite-thumbnailer" || die
+}
+
+src_configure() {
+ use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DENABLE_UPDATER=OFF
+ -DENABLE_CCACHE="$(has ccache "${FEATURES}" && echo 'ON' || echo 'OFF')"
+ -DFULLSCREEN_PLATFORM=ON
+ -DUSE_SHARED_CMARK=ON
+ -DUSE_SHARED_CURL=ON
+ -DUSE_SHARED_GIFLIB=ON
+ -DUSE_SHARED_JPEGLIB=ON
+ -DUSE_SHARED_ZLIB=ON
+ -DUSE_SHARED_LIBARCHIVE=ON
+ -DUSE_SHARED_LIBPNG=ON
+ -DUSE_SHARED_TINYXML=ON
+ -DUSE_SHARED_PIXMAN=ON
+ -DUSE_SHARED_FREETYPE=ON
+ -DUSE_SHARED_HARFBUZZ=ON
+ -DUSE_SHARED_WEBP=ON
+ -DENABLE_DESKTOP_INTEGRATION=ON
+ -DENABLE_QT_THUMBNAILER="$(usex kde)"
+ -DENABLE_WEBP="$(usex webp)"
+ -DENABLE_MEMLEAK="$(usex memleak)"
+ -DLAF_BACKEND=skia
+ -DLAF_WITH_EXAMPLES=OFF
+ -DLAF_WITH_TESTS=OFF
+ -DSKIA_DIR="/var/lib/aseprite-skia"
+ -DSKIA_LIBRARY_DIR="/var/lib/aseprite-skia/out/Release"
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ ewarn "Aseprite is for personal use only. You may not distribute it."
+
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
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
new file mode 100644
index 0000000..f7c8543
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.34.1-system_harfbuzz.patch
@@ -0,0 +1,23 @@
+diff -uNr a/laf/CMakeLists.txt b/laf/CMakeLists.txt
+--- a/laf/CMakeLists.txt 2021-12-01 22:06:08.000000000 +0100
++++ b/laf/CMakeLists.txt 2022-02-15 18:05:31.640137967 +0100
+@@ -44,13 +44,12 @@
+ # Find libraries
+ if(LAF_BACKEND STREQUAL "skia")
+ include(FindSkia)
+-else()
+- if(NOT FREETYPE_LIBRARIES)
+- find_package(Freetype)
+- endif()
+- if(NOT HARFBUZZ_LIBRARIES)
+- find_package(HarfBuzz)
+- endif()
++endif()
++if(NOT FREETYPE_LIBRARIES)
++ find_package(Freetype)
++endif()
++if(NOT HARFBUZZ_LIBRARIES)
++ find_package(HarfBuzz)
+ endif()
+
+ add_subdirectory(third_party)
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
new file mode 100644
index 0000000..8b23f45
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.34.1-system_libarchive.patch
@@ -0,0 +1,93 @@
+diff -uNr a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100
++++ b/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100
+@@ -57,6 +57,7 @@
+ option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
+ option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
+ option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+@@ -216,6 +217,15 @@
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})
+
++# libarchive
++if(USE_SHARED_LIBARCHIVE)
++ find_library(ARCHIVE_LIBRARIES NAMES archive)
++ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
++else()
++ add_definitions(-DLIBARCHIVE_STATIC)
++ set(ARCHIVE_LIBRARIES archive_static)
++endif()
++
+ # libpng
+ if(USE_SHARED_LIBPNG)
+ find_package(PNG REQUIRED)
+diff -uNr a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+--- a/src/app/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100
++++ b/src/app/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100
+@@ -91,9 +91,6 @@
+ add_definitions(-DENABLE_WEBP)
+ endif()
+
+-# libarchive definitions
+-add_definitions(-DLIBARCHIVE_STATIC)
+-
+ ######################################################################
+ # app-lib target
+
+@@ -669,7 +666,7 @@
+ ${FREETYPE_LIBRARIES}
+ ${HARFBUZZ_LIBRARIES}
+ json11
+- archive_static
++ ${ARCHIVE_LIBRARIES}
+ fmt
+ tinyexpr)
+
+diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt 2022-01-12 15:10:34.000000000 +0100
++++ b/third_party/CMakeLists.txt 2022-01-18 15:06:41.357885045 +0100
+@@ -119,22 +119,24 @@
+ add_subdirectory(json11)
+
+ # libarchive
+-set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
+-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
+-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
+-set(ENABLE_LZ4 OFF CACHE BOOL "Enable the use of the system LZ4 library if found")
+-set(ENABLE_LZO OFF CACHE BOOL "Enable the use of the system LZO library if found")
+-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
+-set(ENABLE_ZSTD OFF CACHE BOOL "Enable the use of the system zstd library if found")
+-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
+-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
+-set(ENABLE_CAT OFF CACHE BOOL "Enable cat building")
+-set(ENABLE_TAR OFF CACHE BOOL "Enable tar building")
+-set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building")
+-add_subdirectory(libarchive)
+-target_include_directories(archive_static INTERFACE
+- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++if(NOT USE_SHARED_LIBARCHIVE)
++ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
++ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
++ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
++ set(ENABLE_LZ4 OFF CACHE BOOL "Enable the use of the system LZ4 library if found")
++ set(ENABLE_LZO OFF CACHE BOOL "Enable the use of the system LZO library if found")
++ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
++ set(ENABLE_ZSTD OFF CACHE BOOL "Enable the use of the system zstd library if found")
++ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
++ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
++ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
++ set(ENABLE_CAT OFF CACHE BOOL "Enable cat building")
++ set(ENABLE_TAR OFF CACHE BOOL "Enable tar building")
++ set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building")
++ add_subdirectory(libarchive)
++ target_include_directories(archive_static INTERFACE
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++endif()
+
+ # benchmark
+ if(ENABLE_BENCHMARKS)
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
new file mode 100644
index 0000000..161e4f8
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.34.1-system_libwebp.patch
@@ -0,0 +1,44 @@
+diff -uNr a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2022-01-12 15:10:33.000000000 +0100
++++ b/CMakeLists.txt 2022-02-15 18:39:49.384093189 +0100
+@@ -62,6 +62,7 @@
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+ option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
+ option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
++option(USE_SHARED_WEBP "Use your installed copy of webp" off)
+ option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
+ option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
+ option(ENABLE_NEWS "Enable the news in Home tab" on)
+@@ -235,9 +236,17 @@
+
+ # libwebp
+ if(ENABLE_WEBP)
+- set(WEBP_LIBRARIES webp webpdemux libwebpmux)
+- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
+- include_directories(${WEBP_INCLUDE_DIR})
++ if(USE_SHARED_WEBP)
++ find_library(WEBP_LIBRARY NAMES webp)
++ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux)
++ find_library(WEBPMUX_LIBRARY NAMES webpmux)
++ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY})
++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
++ else()
++ set(WEBP_LIBRARIES webp webpdemux libwebpmux)
++ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++ include_directories(${WEBP_INCLUDE_DIR})
++ endif()
+ endif()
+
+ # tinyxml
+diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt 2022-01-12 15:10:34.000000000 +0100
++++ b/third_party/CMakeLists.txt 2022-02-15 18:39:26.632093684 +0100
+@@ -33,7 +33,7 @@
+ add_subdirectory(giflib)
+ endif()
+
+-if(ENABLE_WEBP)
++if(ENABLE_WEBP AND NOT USE_SHARED_WEBP)
+ set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
+ set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
+ set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2021-08-28 8:09 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2021-08-28 8:09 UTC (permalink / raw
To: gentoo-commits
commit: a2cf55c8016b82b0bb54f2ca0a7af7dbe157a0ca
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Sat Aug 28 08:09:00 2021 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Sat Aug 28 08:09:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=a2cf55c8
dev-games/aseprite-1.2.29
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 10 +++++-----
.../{aseprite-1.2.27.ebuild => aseprite-1.2.29.ebuild} | 0
...ibarchive.patch => aseprite-1.2.29-system_libarchive.patch} | 8 +++++++-
...stem_libwebp.patch => aseprite-1.2.29-system_libwebp.patch} | 0
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index b32b64b..e3e393b 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,17 +1,17 @@
AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
-AUX aseprite-1.2.27-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
-AUX aseprite-1.2.27-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
AUX aseprite-1.2.28-system_libarchive.patch 3897 BLAKE2B 40afbda3676a2db0ab755b0f748876ec72e980dd758fbe40b15286ff877530d6d44fda503c6fd54f076ac67b6042e5d37a6ae48f40f812ff0251d2a5e6b2b7ee SHA512 f4607555cec237f9889995ff679ac65f94fc230f0d8e1d71ab181b2e25664cb03a218794dcff2b8e7b591658e5160771e1ca7752ca96a0d9a7f607cb00d79496
AUX aseprite-1.2.28-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
+AUX aseprite-1.2.29-system_libarchive.patch 3897 BLAKE2B 40afbda3676a2db0ab755b0f748876ec72e980dd758fbe40b15286ff877530d6d44fda503c6fd54f076ac67b6042e5d37a6ae48f40f812ff0251d2a5e6b2b7ee SHA512 f4607555cec237f9889995ff679ac65f94fc230f0d8e1d71ab181b2e25664cb03a218794dcff2b8e7b591658e5160771e1ca7752ca96a0d9a7f607cb00d79496
+AUX aseprite-1.2.29-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
-DIST Aseprite-v1.2.27-Source.zip 24507948 BLAKE2B 1c321a1762e9e0dfa0982f77f37520f4f0b6c61a9bf96956b20137a61cbd066953bd3304dfc32df25922a24c7700c1ac5af2324ec07ac96505edf283d564e9f7 SHA512 6f8cdc64ac79c61c40c41f9f7f78ff5a3705087d818fd64cc2a56f7c9d8ae12aa5d201ea341cc75b1062fe0b467d89304da4f019c7d8b1d95203f5377e10ef94
DIST Aseprite-v1.2.28-Source.zip 24622259 BLAKE2B 5231c9beec00e18b57ed8f39a78d3b54ee1504f6c162c49ba2eee73e62f033dfa4d10015b10f97f858c1d015ee7085bf52a326cd9ae2fe3c2afe7cefbc94eb2b SHA512 97d5cd3aa1dc578f73430b5fc5b45f8e10390010652aa4dab7cebf34fd3bd071544b1bfe03dbdeaa97b960c1ea70e3d66dc28e53a8a79bdf8bcf48f92852ee16
+DIST Aseprite-v1.2.29-Source.zip 24627286 BLAKE2B 3e5739f3d2e9ab53a8854c4042a668bbec40940914447921b2b626a1d6c249f1731d082060c79ceeea45ca09ff195847f6206f9925d68206b862fc1204fe601d SHA512 af53890faebadf117e504bf9d2e8c69db8bb6713a6749b72026ff0c3ac310a0c6ef38aa1255b31f88d28942f5123eda5060850bbf5a4bd64fe07796a469febea
DIST aseprite-1.2.21-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
-DIST aseprite-1.2.27-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
DIST aseprite-1.2.28-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST aseprite-1.2.29-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
EBUILD aseprite-1.2.21.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
-EBUILD aseprite-1.2.27.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
EBUILD aseprite-1.2.28.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
+EBUILD aseprite-1.2.29.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
diff --git a/dev-games/aseprite/aseprite-1.2.27.ebuild b/dev-games/aseprite/aseprite-1.2.29.ebuild
similarity index 100%
rename from dev-games/aseprite/aseprite-1.2.27.ebuild
rename to dev-games/aseprite/aseprite-1.2.29.ebuild
diff --git a/dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.29-system_libarchive.patch
similarity index 90%
rename from dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.29-system_libarchive.patch
index c032508..2434840 100644
--- a/dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.29-system_libarchive.patch
@@ -53,7 +53,7 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 596ffa2e4..977816439 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
-@@ -105,16 +105,18 @@ endif()
+@@ -105,19 +105,21 @@ endif()
add_subdirectory(json11)
# libarchive
@@ -64,6 +64,9 @@ index 596ffa2e4..977816439 100644
-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
+-set(ENABLE_CAT OFF CACHE BOOL "Enable cat building")
+-set(ENABLE_TAR OFF CACHE BOOL "Enable tar building")
+-set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building")
-add_subdirectory(libarchive)
-target_include_directories(archive_static INTERFACE
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
@@ -75,6 +78,9 @@ index 596ffa2e4..977816439 100644
+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
++ set(ENABLE_CAT OFF CACHE BOOL "Enable cat building")
++ set(ENABLE_TAR OFF CACHE BOOL "Enable tar building")
++ set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building")
+ add_subdirectory(libarchive)
+ target_include_directories(archive_static INTERFACE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
diff --git a/dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.29-system_libwebp.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch
rename to dev-games/aseprite/files/aseprite-1.2.29-system_libwebp.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2021-04-20 14:41 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2021-04-20 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 4034cbc02a58c457e29973bfad3e3b6f875e12dd
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Tue Apr 20 14:41:04 2021 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Tue Apr 20 14:41:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=4034cbc0
dev-games/aseprite-1.2.27
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 10 +++++-----
.../{aseprite-1.2.26.ebuild => aseprite-1.2.27.ebuild} | 0
...ibarchive.patch => aseprite-1.2.27-system_libarchive.patch} | 0
...stem_libwebp.patch => aseprite-1.2.27-system_libwebp.patch} | 0
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 4a991e0..8ad48f1 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,12 +1,12 @@
AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
-AUX aseprite-1.2.26-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
-AUX aseprite-1.2.26-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
+AUX aseprite-1.2.27-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.27-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
-DIST Aseprite-v1.2.26-Source.zip 24506961 BLAKE2B 1e57477ecb37d76bc1b56cd649300b6030c95c67b6575515a8bf2e024ab377f25e740763fcbe0a92a1156c1157e169d51ec71979c59bd8bac186352baafd75ca SHA512 7dcf18bf006d1d59e641b2e13d67dfec44323f0a5dfc2ebee57d427cf9d58595c67c1b47a6b656df97b33fafcc3a19dac7e9d7522bb4069ad2d02bd5b0364c9c
+DIST Aseprite-v1.2.27-Source.zip 24507948 BLAKE2B 1c321a1762e9e0dfa0982f77f37520f4f0b6c61a9bf96956b20137a61cbd066953bd3304dfc32df25922a24c7700c1ac5af2324ec07ac96505edf283d564e9f7 SHA512 6f8cdc64ac79c61c40c41f9f7f78ff5a3705087d818fd64cc2a56f7c9d8ae12aa5d201ea341cc75b1062fe0b467d89304da4f019c7d8b1d95203f5377e10ef94
DIST aseprite-1.2.21-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
-DIST aseprite-1.2.26-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST aseprite-1.2.27-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
EBUILD aseprite-1.2.21.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
-EBUILD aseprite-1.2.26.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
+EBUILD aseprite-1.2.27.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
diff --git a/dev-games/aseprite/aseprite-1.2.26.ebuild b/dev-games/aseprite/aseprite-1.2.27.ebuild
similarity index 100%
rename from dev-games/aseprite/aseprite-1.2.26.ebuild
rename to dev-games/aseprite/aseprite-1.2.27.ebuild
diff --git a/dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.26-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.27-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.26-system_libwebp.patch
rename to dev-games/aseprite/files/aseprite-1.2.27-system_libwebp.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2020-08-13 10:13 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2020-08-13 10:13 UTC (permalink / raw
To: gentoo-commits
commit: fa484dede128f6b50912bcd521bb1427b3567b56
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Thu Aug 13 10:13:39 2020 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Thu Aug 13 10:13:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=fa484ded
dev-games/aseprite-1.2.24
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 15 ++--
dev-games/aseprite/aseprite-1.2.19.2.ebuild | 95 ----------------------
...eprite-1.2.18.ebuild => aseprite-1.2.24.ebuild} | 2 +-
.../files/aseprite-1.2.18-system_libwebp.patch | 41 ----------
.../aseprite-1.2.19.2-system_libarchive.patch | 84 -------------------
...tch => aseprite-1.2.24-system_libarchive.patch} | 0
....patch => aseprite-1.2.24-system_libwebp.patch} | 2 +-
7 files changed, 7 insertions(+), 232 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index cd90069..fa113b3 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,17 +1,12 @@
-AUX aseprite-1.2.18-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
-AUX aseprite-1.2.18-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
-AUX aseprite-1.2.19.2-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
-AUX aseprite-1.2.19.2-system_libwebp.patch 1539 BLAKE2B d9c47c64ec49f8030c4ac8fe299c20534bb2cf10c1d70013a7076d62d6d6ec5f4cefd8c8d886ba3a6c5f37d9de097af29fcb07f8e613382847ee5cff6881a637 SHA512 62fe435bf57b4ae81256cee002d1b780fa4e5f5ca26778be9dbd8258e78621fb3dda86c30ec5ae7569f739a5cf0f1e3f6ac19ff5c1cd6fcdf137cd81afefcaff
AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
+AUX aseprite-1.2.24-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.24-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.18-Source.zip 24427303 BLAKE2B d8ae9b7dce73d1f2e9b8b4c851eadd32f62f9336487f62ab12c173b76deeca704eeda92fb17637d9d9c9742e45728d935b3eff7c0396da5260f84886cebd893e SHA512 5a95a12c1c86e5bcc46f92f00eb663d3f4f3a865cf68bf53601a1eb577b6581530bfbf944a20f63014f87ffc32cfc0961339900e353d138564d260cc038c5217
-DIST Aseprite-v1.2.19.2-Source.zip 24467556 BLAKE2B 25e09cb6fd5dc018f6c6ccfefac652116cc7675188ca5a0b6a0890f01b2a477de9a2eba432f31cc3a3357eb0e3fc1cef34b6e34d8629d511b4b4ec02d3ddc8c2 SHA512 16310cb7eb1343419a671039a2861c028e9d69aa6bd729708deac56c26e42b33befc10fff3d7ae87fd8e37c9277f9e4632e3553f43bf4c488696f0b4c6657a22
DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
-DIST aseprite-1.2.18-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
-DIST aseprite-1.2.19.2-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST Aseprite-v1.2.24-Source.zip 24487144 BLAKE2B 19e4748f73acf80c8a0c8cb85dd32a713329f6abed8dfe81022985c227a1a64835d98d86d41207781c36dd53e575d145c668d793d3783f3b0a04e76466a8e7f5 SHA512 e083617f728bab71cff0dea5f84463198b95f38507386699fdb1d7776bd6be852cf1bd7852b8bc3f4fe64cb523cadd654d6ba70c89f3f1d22536b0c75927bd86
DIST aseprite-1.2.21-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST aseprite-1.2.24-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.18.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
-EBUILD aseprite-1.2.19.2.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
EBUILD aseprite-1.2.21.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
+EBUILD aseprite-1.2.24.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
diff --git a/dev-games/aseprite/aseprite-1.2.19.2.ebuild b/dev-games/aseprite/aseprite-1.2.19.2.ebuild
deleted file mode 100644
index 8416f3c..0000000
--- a/dev-games/aseprite/aseprite-1.2.19.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Animated sprite editor & pixel art tool"
-HOMEPAGE="http://www.aseprite.org"
-LICENSE="Proprietary"
-SLOT="0"
-
-PATCHES=(
- "${FILESDIR}/${P}-system_libarchive.patch"
- "${FILESDIR}/${P}-system_libwebp.patch"
-)
-
-SKIA_VERSION="m81-b607b32047"
-SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip"
-SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download"
-SKIA_URI="${SKIA_BASE_URL}/${SKIA_VERSION}/${SKIA_FILE} -> ${P}-skia-${SKIA_VERSION}.zip"
-
-ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
-ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
-
-SRC_URI="${ASEPRITE_URI} ${SKIA_URI}"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="
- debug
- memleak
- webp"
-
-RDEPEND="
- app-arch/libarchive
- app-text/cmark
- dev-libs/expat
- dev-libs/tinyxml
- media-libs/freetype:2
- >=media-libs/giflib-5.0
- media-libs/fontconfig
- media-libs/libpng:0
- webp? ( media-libs/libwebp )
- net-misc/curl
- sys-apps/util-linux
- sys-libs/zlib
- virtual/jpeg:=
- x11-libs/libX11
- x11-libs/pixman"
-
-DOCS=( EULA.txt
- docs/ase-file-specs.md
- docs/LICENSES.md
- README.md )
-
-src_unpack() {
- mkdir -p "${P}/skia"
- cd "${P}"
- unpack "${ASEPRITE_FILE}"
- ( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-src_configure() {
- use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
-
- local mycmakeargs=(
- -DENABLE_UPDATER=OFF
- -DFULLSCREEN_PLATFORM=ON
- -DUSE_SHARED_CMARK=ON
- -DUSE_SHARED_CURL=ON
- -DUSE_SHARED_GIFLIB=ON
- -DUSE_SHARED_JPEGLIB=ON
- -DUSE_SHARED_ZLIB=ON
- -DUSE_SHARED_LIBARCHIVE=ON
- -DUSE_SHARED_LIBPNG=ON
- -DUSE_SHARED_TINYXML=ON
- -DUSE_SHARED_PIXMAN=ON
- -DUSE_SHARED_FREETYPE=ON
- -DUSE_SHARED_HARFBUZZ=ON
- -DUSE_SHARED_WEBP=ON
- -DWITH_WEBP_SUPPORT="$(usex webp)"
- -DENABLE_MEMLEAK="$(usex memleak)"
- -DSKIA_DIR="${S}/skia"
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "Aseprite is for personal use only. You may not distribute it."
-}
diff --git a/dev-games/aseprite/aseprite-1.2.18.ebuild b/dev-games/aseprite/aseprite-1.2.24.ebuild
similarity index 96%
rename from dev-games/aseprite/aseprite-1.2.18.ebuild
rename to dev-games/aseprite/aseprite-1.2.24.ebuild
index 8416f3c..54db779 100644
--- a/dev-games/aseprite/aseprite-1.2.18.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.24.ebuild
@@ -91,5 +91,5 @@ src_configure() {
}
pkg_postinst() {
- elog "Aseprite is for personal use only. You may not distribute it."
+ ewarn "Aseprite is for personal use only. You may not distribute it."
}
diff --git a/dev-games/aseprite/files/aseprite-1.2.18-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.18-system_libwebp.patch
deleted file mode 100644
index 8c7e417..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.18-system_libwebp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uNr a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100
-+++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200
-@@ -65,6 +65,7 @@
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
- option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
- option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
-+option(USE_SHARED_WEBP "Use your installed copy of webp" off)
- option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
- option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
- option(ENABLE_NEWS "Enable the news in Home tab" on)
-@@ -219,9 +220,14 @@
-
- # libwebp
- if(WITH_WEBP_SUPPORT)
-- set(WEBP_LIBRARIES webp webpdemux webpmux)
-- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
-- include_directories(${WEBP_INCLUDE_DIR})
-+ if(USE_SHARED_WEBP)
-+ find_library(WEBP_LIBRARIES NAMES webp)
-+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
-+ else()
-+ set(WEBP_LIBRARIES webp webpdemux webpmux)
-+ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
-+ include_directories(${WEBP_INCLUDE_DIR})
-+ endif()
- endif()
-
- # tinyxml
-diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
---- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200
-+++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200
-@@ -32,7 +32,7 @@
- add_subdirectory(giflib)
- endif()
-
--if(WITH_WEBP_SUPPORT)
-+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP)
- # Enable img2webp so "webpmux" library is built
- set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
- add_subdirectory(libwebp)
diff --git a/dev-games/aseprite/files/aseprite-1.2.19.2-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.19.2-system_libarchive.patch
deleted file mode 100644
index c032508..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.19.2-system_libarchive.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dae638be8..dd5d17794 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
- option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
- option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
- option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
-+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
- option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
-@@ -202,6 +202,15 @@ else()
- endif()
- include_directories(${ZLIB_INCLUDE_DIRS})
-
-+# libarchive
-+if(USE_SHARED_LIBARCHIVE)
-+ find_library(ARCHIVE_LIBRARIES NAMES archive)
-+ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
-+else()
-+ add_definitions(-DLIBARCHIVE_STATIC)
-+ set(ARCHIVE_LIBRARIES archive_static)
-+endif()
-+
- # libpng
- if(USE_SHARED_LIBPNG)
- find_package(PNG REQUIRED)
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index a9e80d73c..619acac92 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT)
- add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
- endif()
-
--# libarchive definitions
--add_definitions(-DLIBARCHIVE_STATIC)
--
- ######################################################################
- # app-lib target
-
-@@ -551,7 +548,7 @@ target_link_libraries(app-lib
- ${FREETYPE_LIBRARIES}
- ${HARFBUZZ_LIBRARIES}
- json11
-- archive_static
-+ ${ARCHIVE_LIBRARIES}
- fmt
- tinyexpr)
-
-diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-index 596ffa2e4..977816439 100644
---- a/third_party/CMakeLists.txt
-+++ b/third_party/CMakeLists.txt
-@@ -105,16 +105,18 @@ endif()
- add_subdirectory(json11)
-
- # libarchive
--set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
--set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
--set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
--set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
--set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
--set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
--set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
--add_subdirectory(libarchive)
--target_include_directories(archive_static INTERFACE
-- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
-+if(NOT USE_SHARED_LIBARCHIVE)
-+ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
-+ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
-+ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
-+ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
-+ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
-+ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
-+ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
-+ add_subdirectory(libarchive)
-+ target_include_directories(archive_static INTERFACE
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
-+endif()
-
- # benchmark
- if(ENABLE_BENCHMARKS)
diff --git a/dev-games/aseprite/files/aseprite-1.2.18-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.24-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.18-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.24-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.19.2-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.24-system_libwebp.patch
similarity index 96%
rename from dev-games/aseprite/files/aseprite-1.2.19.2-system_libwebp.patch
rename to dev-games/aseprite/files/aseprite-1.2.24-system_libwebp.patch
index 4950296..896e03e 100644
--- a/dev-games/aseprite/files/aseprite-1.2.19.2-system_libwebp.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.24-system_libwebp.patch
@@ -36,6 +36,6 @@ diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-if(WITH_WEBP_SUPPORT)
+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP)
+ set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
add_subdirectory(libwebp)
endif()
-
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2020-06-18 6:33 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2020-06-18 6:33 UTC (permalink / raw
To: gentoo-commits
commit: cab1b479753e1a9d22e08ce0f5b8972a75e28765
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Thu Jun 18 06:32:47 2020 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Thu Jun 18 06:32:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=cab1b479
dev-games/aseprite-1.2.19.2
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 5 ++
dev-games/aseprite/aseprite-1.2.21.ebuild | 95 ++++++++++++++++++++++
.../files/aseprite-1.2.21-system_libarchive.patch | 84 +++++++++++++++++++
.../files/aseprite-1.2.21-system_libwebp.patch | 41 ++++++++++
4 files changed, 225 insertions(+)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index eb746a0..cd90069 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -2,11 +2,16 @@ AUX aseprite-1.2.18-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f
AUX aseprite-1.2.18-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
AUX aseprite-1.2.19.2-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
AUX aseprite-1.2.19.2-system_libwebp.patch 1539 BLAKE2B d9c47c64ec49f8030c4ac8fe299c20534bb2cf10c1d70013a7076d62d6d6ec5f4cefd8c8d886ba3a6c5f37d9de097af29fcb07f8e613382847ee5cff6881a637 SHA512 62fe435bf57b4ae81256cee002d1b780fa4e5f5ca26778be9dbd8258e78621fb3dda86c30ec5ae7569f739a5cf0f1e3f6ac19ff5c1cd6fcdf137cd81afefcaff
+AUX aseprite-1.2.21-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.21-system_libwebp.patch 1595 BLAKE2B 5bd386fae6723de0d6068b25d8ba75eedf1ebc4abd94d91325dbc856752eb67c7d851a3a02976b6d048cec4c0d57b5d16007b83fdc32285355b7e94fc0930010 SHA512 14d3ab4c345046cf91e6237825456ef94703f334e1fd9fc6d09a4606c89ea04518e12fdc20956638a60fc42302fca5f47beb73fa3318a3ba4e78f3cac35527cb
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.18-Source.zip 24427303 BLAKE2B d8ae9b7dce73d1f2e9b8b4c851eadd32f62f9336487f62ab12c173b76deeca704eeda92fb17637d9d9c9742e45728d935b3eff7c0396da5260f84886cebd893e SHA512 5a95a12c1c86e5bcc46f92f00eb663d3f4f3a865cf68bf53601a1eb577b6581530bfbf944a20f63014f87ffc32cfc0961339900e353d138564d260cc038c5217
DIST Aseprite-v1.2.19.2-Source.zip 24467556 BLAKE2B 25e09cb6fd5dc018f6c6ccfefac652116cc7675188ca5a0b6a0890f01b2a477de9a2eba432f31cc3a3357eb0e3fc1cef34b6e34d8629d511b4b4ec02d3ddc8c2 SHA512 16310cb7eb1343419a671039a2861c028e9d69aa6bd729708deac56c26e42b33befc10fff3d7ae87fd8e37c9277f9e4632e3553f43bf4c488696f0b4c6657a22
+DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
DIST aseprite-1.2.18-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
DIST aseprite-1.2.19.2-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST aseprite-1.2.21-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
EBUILD aseprite-1.2.18.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
EBUILD aseprite-1.2.19.2.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
+EBUILD aseprite-1.2.21.ebuild 2085 BLAKE2B 09cb7e751d1282315f663c26dcac8a4a21bced2957fdb2850cb56febdf0d623e4fbc83a183f66f996622951a98991297a8dabf3a37835765e4d85fe884b7c522 SHA512 96f319dbc563f5665800466df743ec4a481831f259e98280a43737f67769fb9facc83206d51c8ba1f84fdaf82271fc88063b549f03dab4366ceb2d5e59a42a97
diff --git a/dev-games/aseprite/aseprite-1.2.21.ebuild b/dev-games/aseprite/aseprite-1.2.21.ebuild
new file mode 100644
index 0000000..54db779
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.21.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+LICENSE="Proprietary"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${P}-system_libarchive.patch"
+ "${FILESDIR}/${P}-system_libwebp.patch"
+)
+
+SKIA_VERSION="m81-b607b32047"
+SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip"
+SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download"
+SKIA_URI="${SKIA_BASE_URL}/${SKIA_VERSION}/${SKIA_FILE} -> ${P}-skia-${SKIA_VERSION}.zip"
+
+ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
+ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
+
+SRC_URI="${ASEPRITE_URI} ${SKIA_URI}"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="
+ debug
+ memleak
+ webp"
+
+RDEPEND="
+ app-arch/libarchive
+ app-text/cmark
+ dev-libs/expat
+ dev-libs/tinyxml
+ media-libs/freetype:2
+ >=media-libs/giflib-5.0
+ media-libs/fontconfig
+ media-libs/libpng:0
+ webp? ( media-libs/libwebp )
+ net-misc/curl
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/jpeg:=
+ x11-libs/libX11
+ x11-libs/pixman"
+
+DOCS=( EULA.txt
+ docs/ase-file-specs.md
+ docs/LICENSES.md
+ README.md )
+
+src_unpack() {
+ mkdir -p "${P}/skia"
+ cd "${P}"
+ unpack "${ASEPRITE_FILE}"
+ ( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DENABLE_UPDATER=OFF
+ -DFULLSCREEN_PLATFORM=ON
+ -DUSE_SHARED_CMARK=ON
+ -DUSE_SHARED_CURL=ON
+ -DUSE_SHARED_GIFLIB=ON
+ -DUSE_SHARED_JPEGLIB=ON
+ -DUSE_SHARED_ZLIB=ON
+ -DUSE_SHARED_LIBARCHIVE=ON
+ -DUSE_SHARED_LIBPNG=ON
+ -DUSE_SHARED_TINYXML=ON
+ -DUSE_SHARED_PIXMAN=ON
+ -DUSE_SHARED_FREETYPE=ON
+ -DUSE_SHARED_HARFBUZZ=ON
+ -DUSE_SHARED_WEBP=ON
+ -DWITH_WEBP_SUPPORT="$(usex webp)"
+ -DENABLE_MEMLEAK="$(usex memleak)"
+ -DSKIA_DIR="${S}/skia"
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ ewarn "Aseprite is for personal use only. You may not distribute it."
+}
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
new file mode 100644
index 0000000..c032508
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.21-system_libarchive.patch
@@ -0,0 +1,84 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dae638be8..dd5d17794 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
+ option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
+ option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
+ option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+@@ -202,6 +202,15 @@ else()
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})
+
++# libarchive
++if(USE_SHARED_LIBARCHIVE)
++ find_library(ARCHIVE_LIBRARIES NAMES archive)
++ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
++else()
++ add_definitions(-DLIBARCHIVE_STATIC)
++ set(ARCHIVE_LIBRARIES archive_static)
++endif()
++
+ # libpng
+ if(USE_SHARED_LIBPNG)
+ find_package(PNG REQUIRED)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index a9e80d73c..619acac92 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT)
+ add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
+ endif()
+
+-# libarchive definitions
+-add_definitions(-DLIBARCHIVE_STATIC)
+-
+ ######################################################################
+ # app-lib target
+
+@@ -551,7 +548,7 @@ target_link_libraries(app-lib
+ ${FREETYPE_LIBRARIES}
+ ${HARFBUZZ_LIBRARIES}
+ json11
+- archive_static
++ ${ARCHIVE_LIBRARIES}
+ fmt
+ tinyexpr)
+
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 596ffa2e4..977816439 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -105,16 +105,18 @@ endif()
+ add_subdirectory(json11)
+
+ # libarchive
+-set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
+-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
+-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
+-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
+-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
+-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
+-add_subdirectory(libarchive)
+-target_include_directories(archive_static INTERFACE
+- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++if(NOT USE_SHARED_LIBARCHIVE)
++ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
++ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
++ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
++ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
++ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
++ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
++ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
++ add_subdirectory(libarchive)
++ target_include_directories(archive_static INTERFACE
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++endif()
+
+ # benchmark
+ if(ENABLE_BENCHMARKS)
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
new file mode 100644
index 0000000..896e03e
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.21-system_libwebp.patch
@@ -0,0 +1,41 @@
+diff -uNr a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100
++++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200
+@@ -66,6 +66,7 @@
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+ option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
+ option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
++option(USE_SHARED_WEBP "Use your installed copy of webp" off)
+ option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
+ option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
+ option(ENABLE_NEWS "Enable the news in Home tab" on)
+@@ -229,9 +230,14 @@
+
+ # libwebp
+ if(WITH_WEBP_SUPPORT)
+- set(WEBP_LIBRARIES webp webpdemux libwebpmux)
+- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
+- include_directories(${WEBP_INCLUDE_DIR})
++ if(USE_SHARED_WEBP)
++ find_library(WEBP_LIBRARIES NAMES webp)
++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
++ else()
++ set(WEBP_LIBRARIES webp webpdemux libwebpmux)
++ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++ include_directories(${WEBP_INCLUDE_DIR})
++ endif()
+ endif()
+
+ # tinyxml
+diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200
++++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200
+@@ -32,7 +32,7 @@
+ add_subdirectory(giflib)
+ endif()
+
+-if(WITH_WEBP_SUPPORT)
++if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP)
+ set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
+ add_subdirectory(libwebp)
+ endif()
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2020-05-30 9:05 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2020-05-30 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 6f059971f7137782b478818e16bfbc0376d943d9
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Sat May 30 09:05:10 2020 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Sat May 30 09:05:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=6f059971
dev-games/aseprite-1.2.19
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 5 ++
dev-games/aseprite/aseprite-1.2.19.ebuild | 95 ++++++++++++++++++++++
.../files/aseprite-1.2.19-system_libarchive.patch | 84 +++++++++++++++++++
.../files/aseprite-1.2.19-system_libwebp.patch | 41 ++++++++++
4 files changed, 225 insertions(+)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 0c89861..a54b3c9 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,7 +1,12 @@
AUX aseprite-1.2.18-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
AUX aseprite-1.2.18-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
+AUX aseprite-1.2.19-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.19-system_libwebp.patch 1539 BLAKE2B d9c47c64ec49f8030c4ac8fe299c20534bb2cf10c1d70013a7076d62d6d6ec5f4cefd8c8d886ba3a6c5f37d9de097af29fcb07f8e613382847ee5cff6881a637 SHA512 62fe435bf57b4ae81256cee002d1b780fa4e5f5ca26778be9dbd8258e78621fb3dda86c30ec5ae7569f739a5cf0f1e3f6ac19ff5c1cd6fcdf137cd81afefcaff
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.18-Source.zip 24427303 BLAKE2B d8ae9b7dce73d1f2e9b8b4c851eadd32f62f9336487f62ab12c173b76deeca704eeda92fb17637d9d9c9742e45728d935b3eff7c0396da5260f84886cebd893e SHA512 5a95a12c1c86e5bcc46f92f00eb663d3f4f3a865cf68bf53601a1eb577b6581530bfbf944a20f63014f87ffc32cfc0961339900e353d138564d260cc038c5217
+DIST Aseprite-v1.2.19-Source.zip 24465351 BLAKE2B 618b651a1d33e9a39e74430f9e62d576418c598ac435a85df2ed1c0b5e5a1750673caa6501c641b6f057eb4c4f8997e6f1a9175df6a2893bfbfb7418f1674c60 SHA512 fabde9993c3587b747138b2e6e2791bca134dcbdca326313c3d8053c2a78a040ff81b7ff22ec380d75a58378d02560a8591707127f65a89bfda5bf17eaa0745e
DIST aseprite-1.2.18-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST aseprite-1.2.19-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
EBUILD aseprite-1.2.18.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
+EBUILD aseprite-1.2.19.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
diff --git a/dev-games/aseprite/aseprite-1.2.19.ebuild b/dev-games/aseprite/aseprite-1.2.19.ebuild
new file mode 100644
index 0000000..8416f3c
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.19.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+LICENSE="Proprietary"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${P}-system_libarchive.patch"
+ "${FILESDIR}/${P}-system_libwebp.patch"
+)
+
+SKIA_VERSION="m81-b607b32047"
+SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip"
+SKIA_BASE_URL="https://github.com/${PN}/skia/releases/download"
+SKIA_URI="${SKIA_BASE_URL}/${SKIA_VERSION}/${SKIA_FILE} -> ${P}-skia-${SKIA_VERSION}.zip"
+
+ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
+ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
+
+SRC_URI="${ASEPRITE_URI} ${SKIA_URI}"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="
+ debug
+ memleak
+ webp"
+
+RDEPEND="
+ app-arch/libarchive
+ app-text/cmark
+ dev-libs/expat
+ dev-libs/tinyxml
+ media-libs/freetype:2
+ >=media-libs/giflib-5.0
+ media-libs/fontconfig
+ media-libs/libpng:0
+ webp? ( media-libs/libwebp )
+ net-misc/curl
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/jpeg:=
+ x11-libs/libX11
+ x11-libs/pixman"
+
+DOCS=( EULA.txt
+ docs/ase-file-specs.md
+ docs/LICENSES.md
+ README.md )
+
+src_unpack() {
+ mkdir -p "${P}/skia"
+ cd "${P}"
+ unpack "${ASEPRITE_FILE}"
+ ( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DENABLE_UPDATER=OFF
+ -DFULLSCREEN_PLATFORM=ON
+ -DUSE_SHARED_CMARK=ON
+ -DUSE_SHARED_CURL=ON
+ -DUSE_SHARED_GIFLIB=ON
+ -DUSE_SHARED_JPEGLIB=ON
+ -DUSE_SHARED_ZLIB=ON
+ -DUSE_SHARED_LIBARCHIVE=ON
+ -DUSE_SHARED_LIBPNG=ON
+ -DUSE_SHARED_TINYXML=ON
+ -DUSE_SHARED_PIXMAN=ON
+ -DUSE_SHARED_FREETYPE=ON
+ -DUSE_SHARED_HARFBUZZ=ON
+ -DUSE_SHARED_WEBP=ON
+ -DWITH_WEBP_SUPPORT="$(usex webp)"
+ -DENABLE_MEMLEAK="$(usex memleak)"
+ -DSKIA_DIR="${S}/skia"
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ elog "Aseprite is for personal use only. You may not distribute it."
+}
diff --git a/dev-games/aseprite/files/aseprite-1.2.19-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.19-system_libarchive.patch
new file mode 100644
index 0000000..c032508
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.19-system_libarchive.patch
@@ -0,0 +1,84 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dae638be8..dd5d17794 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
+ option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
+ option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
+ option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+@@ -202,6 +202,15 @@ else()
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})
+
++# libarchive
++if(USE_SHARED_LIBARCHIVE)
++ find_library(ARCHIVE_LIBRARIES NAMES archive)
++ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
++else()
++ add_definitions(-DLIBARCHIVE_STATIC)
++ set(ARCHIVE_LIBRARIES archive_static)
++endif()
++
+ # libpng
+ if(USE_SHARED_LIBPNG)
+ find_package(PNG REQUIRED)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index a9e80d73c..619acac92 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT)
+ add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
+ endif()
+
+-# libarchive definitions
+-add_definitions(-DLIBARCHIVE_STATIC)
+-
+ ######################################################################
+ # app-lib target
+
+@@ -551,7 +548,7 @@ target_link_libraries(app-lib
+ ${FREETYPE_LIBRARIES}
+ ${HARFBUZZ_LIBRARIES}
+ json11
+- archive_static
++ ${ARCHIVE_LIBRARIES}
+ fmt
+ tinyexpr)
+
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 596ffa2e4..977816439 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -105,16 +105,18 @@ endif()
+ add_subdirectory(json11)
+
+ # libarchive
+-set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
+-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
+-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
+-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
+-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+-set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
+-set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
+-add_subdirectory(libarchive)
+-target_include_directories(archive_static INTERFACE
+- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++if(NOT USE_SHARED_LIBARCHIVE)
++ set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
++ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
++ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
++ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
++ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
++ set(ENABLE_BZip2 OFF CACHE BOOL "Enable the use of the system BZip2 library if found")
++ set(ENABLE_LIBXML2 OFF CACHE BOOL "Enable the use of the system libxml2 library if found")
++ add_subdirectory(libarchive)
++ target_include_directories(archive_static INTERFACE
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++endif()
+
+ # benchmark
+ if(ENABLE_BENCHMARKS)
diff --git a/dev-games/aseprite/files/aseprite-1.2.19-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.19-system_libwebp.patch
new file mode 100644
index 0000000..4950296
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.19-system_libwebp.patch
@@ -0,0 +1,41 @@
+diff -uNr a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100
++++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200
+@@ -66,6 +66,7 @@
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+ option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
+ option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
++option(USE_SHARED_WEBP "Use your installed copy of webp" off)
+ option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
+ option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
+ option(ENABLE_NEWS "Enable the news in Home tab" on)
+@@ -229,9 +230,14 @@
+
+ # libwebp
+ if(WITH_WEBP_SUPPORT)
+- set(WEBP_LIBRARIES webp webpdemux libwebpmux)
+- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
+- include_directories(${WEBP_INCLUDE_DIR})
++ if(USE_SHARED_WEBP)
++ find_library(WEBP_LIBRARIES NAMES webp)
++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
++ else()
++ set(WEBP_LIBRARIES webp webpdemux libwebpmux)
++ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++ include_directories(${WEBP_INCLUDE_DIR})
++ endif()
+ endif()
+
+ # tinyxml
+diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200
++++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200
+@@ -32,7 +32,7 @@
+ add_subdirectory(giflib)
+ endif()
+
+-if(WITH_WEBP_SUPPORT)
++if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP)
+ add_subdirectory(libwebp)
+ endif()
+
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2020-04-27 12:46 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2020-04-27 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 7d7f0212e942cf11886492ac76425dd08a8ea8f4
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Mon Apr 27 12:45:56 2020 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Mon Apr 27 12:45:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=7d7f0212
dev-games/aseprite-1.2.18
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 10 +++++-----
.../{aseprite-1.2.17.ebuild => aseprite-1.2.18.ebuild} | 0
...ibarchive.patch => aseprite-1.2.18-system_libarchive.patch} | 0
...stem_libwebp.patch => aseprite-1.2.18-system_libwebp.patch} | 0
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 32507b3..0c89861 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,7 +1,7 @@
-AUX aseprite-1.2.17-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
-AUX aseprite-1.2.17-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
+AUX aseprite-1.2.18-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.18-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.17-Source.zip 24303986 BLAKE2B d3034d4491cef993f3f1238c42375a469c60c8ab69ab571670c233300169c1821943e59ca142cf9a7afd54100cffc729204fac5f55ec55218089b7f41228659c SHA512 559203dc0bca4da6145b08c3cca4e5dd40fbf3e5c5e4a7de4b05ed16c32d10de96034923aab42168daec5b64ea7459babd468d5d7b0de69337c4f95f2edc85bd
-DIST aseprite-1.2.17-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+DIST Aseprite-v1.2.18-Source.zip 24427303 BLAKE2B d8ae9b7dce73d1f2e9b8b4c851eadd32f62f9336487f62ab12c173b76deeca704eeda92fb17637d9d9c9742e45728d935b3eff7c0396da5260f84886cebd893e SHA512 5a95a12c1c86e5bcc46f92f00eb663d3f4f3a865cf68bf53601a1eb577b6581530bfbf944a20f63014f87ffc32cfc0961339900e353d138564d260cc038c5217
+DIST aseprite-1.2.18-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.17.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
+EBUILD aseprite-1.2.18.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
diff --git a/dev-games/aseprite/aseprite-1.2.17.ebuild b/dev-games/aseprite/aseprite-1.2.18.ebuild
similarity index 100%
rename from dev-games/aseprite/aseprite-1.2.17.ebuild
rename to dev-games/aseprite/aseprite-1.2.18.ebuild
diff --git a/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.18-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.18-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.18-system_libwebp.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch
rename to dev-games/aseprite/files/aseprite-1.2.18-system_libwebp.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2020-04-14 7:55 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2020-04-14 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 28be5b56f130166724bd346977830e039c569c91
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Tue Apr 14 07:55:13 2020 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Tue Apr 14 07:55:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=28be5b56
Made dev-games/aseprite-1.2.17 use system libwebp
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 5 +--
dev-games/aseprite/aseprite-1.2.17.ebuild | 8 +++--
.../files/aseprite-1.2.17-system_libarchive.patch | 19 +++-------
.../files/aseprite-1.2.17-system_libwebp.patch | 41 ++++++++++++++++++++++
4 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index aa7f740..32507b3 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,6 +1,7 @@
-AUX aseprite-1.2.17-system_libarchive.patch 3837 BLAKE2B f9b5f4eb6f81befbaa0fb1255501367aa6ac7c7e20a16a1764a51afdaf2a09208c6a7f68708d1d65e04499bb004e438415d7402537166ab5954e3437a4b32aca SHA512 5eaac64aa9ee339b6991d42b46798392b668f2715e3f99455c8bfc860acb06d5525c0d431d833428037cce67572dcf48d1b384bbffefc79184cafa57acbdc8d2
+AUX aseprite-1.2.17-system_libarchive.patch 3563 BLAKE2B 478a69322ec4cf6b7588b8f1dbd85b1eae0a327c87b400b1061197ff09274843703a480efd8a34d8ca77cd22402b8ae2ab2eaa52741e3a72ab73fd3de6bed84f SHA512 9f378d07b44cc5234022ba1b96608a648dbbcca2e07946025642cb9c7daf507072b203b4f97815dab2913977527d3c5b0e8883c2ad2da51cb2551adf6f7840ab
+AUX aseprite-1.2.17-system_libwebp.patch 1653 BLAKE2B fc3d7ce12353a820b58cb1f8da329331e86e82d2d238ac763c2987bb4f93364e951ce3a426a19286092d4d099eec026ecf5a0f7249ff15492f2c8853ea0f70ea SHA512 88357d05856f9a5341a32ea6c0b95d3704d1e6d0ec34e199573b205f7be78187abed2097578697b58ae5300a544235a66c60b61ee9999932960335a3a0a79aa1
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
DIST Aseprite-v1.2.17-Source.zip 24303986 BLAKE2B d3034d4491cef993f3f1238c42375a469c60c8ab69ab571670c233300169c1821943e59ca142cf9a7afd54100cffc729204fac5f55ec55218089b7f41228659c SHA512 559203dc0bca4da6145b08c3cca4e5dd40fbf3e5c5e4a7de4b05ed16c32d10de96034923aab42168daec5b64ea7459babd468d5d7b0de69337c4f95f2edc85bd
DIST aseprite-1.2.17-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.17.ebuild 2021 BLAKE2B 4233a4ecd4e633a984457ed610b065f55bf93bd27cc6abdfada648209a4b9a9a10e8ebf6e649fed376aed51b3015737734c53aae7c660cdefb5bd4019ec114c8 SHA512 26ea0b676c09dcba6663f09d89d350571f2c7e7ca4532c31f5cd686295121f02aac2290df92023dd443978f51ca68208653b2a9ca1ede5d611b383855c94843e
+EBUILD aseprite-1.2.17.ebuild 2084 BLAKE2B 7e243188476ee43111cb951ad8950ab6b3fc268313706da938425515cf03b3ebefda0d47cee3f2feaa62f1eb667929f67ad0d632cc8d2863fa144515ebb01b8e SHA512 a892878b9c63462721e825676c1a905d031b55ce8ecf1d62eb6653bdb5211293c1effbf53c6801750e1d36b3655f031c22017318d020168aa101ae67a52f3384
diff --git a/dev-games/aseprite/aseprite-1.2.17.ebuild b/dev-games/aseprite/aseprite-1.2.17.ebuild
index 1b9446f..8416f3c 100644
--- a/dev-games/aseprite/aseprite-1.2.17.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.17.ebuild
@@ -10,7 +10,10 @@ HOMEPAGE="http://www.aseprite.org"
LICENSE="Proprietary"
SLOT="0"
-PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-system_libarchive.patch"
+ "${FILESDIR}/${P}-system_libwebp.patch"
+)
SKIA_VERSION="m81-b607b32047"
SKIA_FILE="Skia-Linux-Release-${ARCH/amd64/x64}.zip"
@@ -37,7 +40,7 @@ RDEPEND="
>=media-libs/giflib-5.0
media-libs/fontconfig
media-libs/libpng:0
- webp? ( !!media-libs/libwebp )
+ webp? ( media-libs/libwebp )
net-misc/curl
sys-apps/util-linux
sys-libs/zlib
@@ -78,6 +81,7 @@ src_configure() {
-DUSE_SHARED_PIXMAN=ON
-DUSE_SHARED_FREETYPE=ON
-DUSE_SHARED_HARFBUZZ=ON
+ -DUSE_SHARED_WEBP=ON
-DWITH_WEBP_SUPPORT="$(usex webp)"
-DENABLE_MEMLEAK="$(usex memleak)"
-DSKIA_DIR="${S}/skia"
diff --git a/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
index 7cd457b..c032508 100644
--- a/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-1.2.17-system_libarchive.patch
@@ -2,15 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index dae638be8..dd5d17794 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -64,6 +64,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
+@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
- option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
-@@ -193,6 +194,15 @@ else()
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+@@ -202,6 +202,15 @@ else()
endif()
include_directories(${ZLIB_INCLUDE_DIRS})
@@ -26,20 +26,11 @@ index dae638be8..dd5d17794 100644
# libpng
if(USE_SHARED_LIBPNG)
find_package(PNG REQUIRED)
-@@ -294,7 +304,7 @@ if(USE_SHARED_CMARK)
- else()
- add_definitions(-DCMARK_STATIC_DEFINE)
- set(CMARK_LIBRARIES libcmark_static)
-- include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/cmark)
-+ include_directories(${CMARK_DIR})
- endif()
-
- if(REQUIRE_CURL)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index a9e80d73c..619acac92 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
-@@ -82,9 +82,6 @@ if(WITH_WEBP_SUPPORT)
+@@ -91,9 +91,6 @@ if(WITH_WEBP_SUPPORT)
add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
endif()
@@ -62,7 +53,7 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 596ffa2e4..977816439 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
-@@ -113,16 +113,18 @@ endif()
+@@ -105,16 +105,18 @@ endif()
add_subdirectory(json11)
# libarchive
diff --git a/dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch b/dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch
new file mode 100644
index 0000000..8c7e417
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.17-system_libwebp.patch
@@ -0,0 +1,41 @@
+diff -uNr a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-03-06 18:47:37.000000000 +0100
++++ b/CMakeLists.txt 2020-04-14 09:25:00.270728334 +0200
+@@ -65,6 +65,7 @@
+ option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
+ option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
+ option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
++option(USE_SHARED_WEBP "Use your installed copy of webp" off)
+ option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
+ option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off)
+ option(ENABLE_NEWS "Enable the news in Home tab" on)
+@@ -219,9 +220,14 @@
+
+ # libwebp
+ if(WITH_WEBP_SUPPORT)
+- set(WEBP_LIBRARIES webp webpdemux webpmux)
+- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
+- include_directories(${WEBP_INCLUDE_DIR})
++ if(USE_SHARED_WEBP)
++ find_library(WEBP_LIBRARIES NAMES webp)
++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
++ else()
++ set(WEBP_LIBRARIES webp webpdemux webpmux)
++ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++ include_directories(${WEBP_INCLUDE_DIR})
++ endif()
+ endif()
+
+ # tinyxml
+diff -uNr a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt 2019-10-24 01:54:06.000000000 +0200
++++ b/third_party/CMakeLists.txt 2020-04-14 09:22:20.799744576 +0200
+@@ -32,7 +32,7 @@
+ add_subdirectory(giflib)
+ endif()
+
+-if(WITH_WEBP_SUPPORT)
++if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP)
+ # Enable img2webp so "webpmux" library is built
+ set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
+ add_subdirectory(libwebp)
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2019-10-15 7:36 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2019-10-15 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 2ec2a32e347fea667033c312fe0a3e7a1b29253b
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Tue Oct 15 07:36:22 2019 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Tue Oct 15 07:36:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=2ec2a32e
dev-games/aseprite-1.2.15
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 6 +++---
.../aseprite/{aseprite-1.2.13.ebuild => aseprite-1.2.15.ebuild} | 1 -
...tem_libarchive.patch => aseprite-1.2.15-system_libarchive.patch} | 0
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index c292878..c4a3d4d 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,13 +1,13 @@
-AUX aseprite-1.2.13-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
AUX aseprite-1.2.14-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
+AUX aseprite-1.2.15-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
AUX aseprite-9999-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.13-Source.zip 23778598 BLAKE2B 328f45159d78fca5f4f814a53cedd5066e64ad9d5e7d1af4b51fffda546c564eaec7c5df7c71b46809f3418ad1d3acb342ca7a546f8c293c821523907cc5399b SHA512 31f05f7155b783f5bc9a9d13d2fb2262b08111b7f66d257305c237046f6c6ae69c39f93f546f0ca3ecdbe14723cad4e0682898e59ce0be2bb1465b83f769a4db
DIST Aseprite-v1.2.14-Source.zip 23797447 BLAKE2B b4e87a359a829d551b43ce05215f33b6ef6e46db56cd98f5d06f5a01c62efdbe57a75c21c273b5b0e09c8da90d78ef2e2060b7285793a5bd2dd78098b0afbe38 SHA512 d984ac9123744b93ce4dd151491518485f8abce44d8b478416c0f30adb4cd8ec0d8f0e59fc7269528b5e38e115ab012239eb1f0e3427c9ce5e65ac66ddc2115c
+DIST Aseprite-v1.2.15-Source.zip 23798637 BLAKE2B ab7e32694e2f73207819a55fba5f3ac2d39cd7dcb191a8e6c1cb5b5cd462987c9515e91412ec294473552228da8de1877c606bca871e4670ee7c536c9496e280 SHA512 bef0c9197f62518734c79a5a8a51ed4782ab22a04568e410a40decaa6b70306d67cea725c5989b1bf5e6aafc3d1dff2c8edea85e942a206583983c7f48675858
DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.13.ebuild 1946 BLAKE2B 834aad940270ca648078ea1269d2930e4b520f2bdcbdbcc4003665b51f334cece4c96d022e3baff5f17dd1ea27470c6a87291af64c1bf3af3489bc258ccfeeaa SHA512 3800fd3e40116ad8cf4b6bc945566d7d20ba4ae9c3e017593718ae798e86ed690e204dc28c937fb9c50e077955b6a8984fd6554a38e3ac498f11ffb4c711995f
EBUILD aseprite-1.2.14.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
+EBUILD aseprite-1.2.15.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
EBUILD aseprite-9999.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
diff --git a/dev-games/aseprite/aseprite-1.2.13.ebuild b/dev-games/aseprite/aseprite-1.2.15.ebuild
similarity index 98%
rename from dev-games/aseprite/aseprite-1.2.13.ebuild
rename to dev-games/aseprite/aseprite-1.2.15.ebuild
index 0e544a9..9eff062 100644
--- a/dev-games/aseprite/aseprite-1.2.13.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.15.ebuild
@@ -65,7 +65,6 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATER=OFF
-DFULLSCREEN_PLATFORM=ON
- -DBUILD_GMOCK=OFF
-DUSE_SHARED_CMARK=ON
-DUSE_SHARED_CURL=ON
-DUSE_SHARED_GIFLIB=ON
diff --git a/dev-games/aseprite/files/aseprite-1.2.13-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.15-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.13-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-1.2.15-system_libarchive.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2019-09-10 16:07 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2019-09-10 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 56081f336766df14b3e81e0b8d992f949d695663
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Tue Sep 10 16:07:43 2019 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Tue Sep 10 16:07:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=56081f33
dev-games/aseprite-1.2.14
Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>
dev-games/aseprite/Manifest | 10 +++---
...eprite-1.2.12.ebuild => aseprite-1.2.14.ebuild} | 3 +-
dev-games/aseprite/aseprite-9999.ebuild | 25 ++++++---------
.../aseprite/files/aseprite-1.2.12-draw.patch | 37 ----------------------
...tch => aseprite-1.2.14-system_libarchive.patch} | 0
...patch => aseprite-9999-system_libarchive.patch} | 0
6 files changed, 15 insertions(+), 60 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 146e06d..c292878 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,13 +1,13 @@
-AUX aseprite-1.2.12-draw.patch 1536 BLAKE2B bb029bf30e265d9eedba9d66b6e8c6a8f7cebe73c9dd9e7e0ddf3f6a03a285facd8509796a86fe502c9fface66a0e135bf6f22bfc673ef64aec0955c7874cf33 SHA512 56a62b9fde18e7e9df82e8051f3f00a807949c473380e1231ced1632921111bfb83e2683b276a76a074ae02ba842b21021283856c65325b4450cfae4b9b12725
-AUX aseprite-1.2.12-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
AUX aseprite-1.2.13-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
+AUX aseprite-1.2.14-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
AUX aseprite-1.2.9-system_libarchive.patch 3622 BLAKE2B 1b3d74497a8510c2988b86646823f1972a5f210dd690ede65a5f1c71cfaebdafe2c3f352a3a86dec006cd9d30a4f9d7532b33373d89f92eed4fe7e32e25e1af6 SHA512 0abf6d1329c1aa894adfb09a8a05418c063962bd606abbe2832b4f344911a76541ebed0181dbc1889620aff8d25c061c2a1940ec3fcb5cb65047f250a1676892
+AUX aseprite-9999-system_libarchive.patch 3627 BLAKE2B da38e42aee63b4604c4cccd85216ff05f68a2f29c20d1c3f875e4be2399d459f46c831b97c103387c06eba5fe75a5b69f618b3341d8ec39538a90b6e079a7058 SHA512 47eb8e258d43d9196a186b5eed29695d7d5b1a675e4c7be1ae5f304929f615e67cac19a6bffc7f6c8111c0d26e06db52362fa095777f45f604d37c203e5ff7a1
DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a52c2f65e59f01a65bc3ac2f8feef725b2caeef94f542c70132834280c3227a3a1cf7756a708f6970c12d4fd7aca4e646c3 SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258
-DIST Aseprite-v1.2.12-Source.zip 23776131 BLAKE2B 19dc023d4a0444af48dd646e7398c3756f0e5bb7f43eeea887bb23ab53a95972c7d4a81663e672e9ad1f1a21599944dbb1e21ee68e6bbbf06d7cd9f925d66a44 SHA512 57fd85c48e4e0975304e85d5f334bc477d41f546fab0fa363807685de3289cc8f3ed2c9d33dd4729b2c56c60665c75d1d2011d0dd0968c2d033f84772bcbde53
DIST Aseprite-v1.2.13-Source.zip 23778598 BLAKE2B 328f45159d78fca5f4f814a53cedd5066e64ad9d5e7d1af4b51fffda546c564eaec7c5df7c71b46809f3418ad1d3acb342ca7a546f8c293c821523907cc5399b SHA512 31f05f7155b783f5bc9a9d13d2fb2262b08111b7f66d257305c237046f6c6ae69c39f93f546f0ca3ecdbe14723cad4e0682898e59ce0be2bb1465b83f769a4db
+DIST Aseprite-v1.2.14-Source.zip 23797447 BLAKE2B b4e87a359a829d551b43ce05215f33b6ef6e46db56cd98f5d06f5a01c62efdbe57a75c21c273b5b0e09c8da90d78ef2e2060b7285793a5bd2dd78098b0afbe38 SHA512 d984ac9123744b93ce4dd151491518485f8abce44d8b478416c0f30adb4cd8ec0d8f0e59fc7269528b5e38e115ab012239eb1f0e3427c9ce5e65ac66ddc2115c
DIST Aseprite-v1.2.9-Source.zip 23723562 BLAKE2B 6fd168cbd7f8b2fe4e9aae4ad2a14f99ff83f0c8b79142a1ec9c9ee483fd48a4c99dfb754a6071d6cd196951443064442af83405a132d8a6a18cdb4f42bb8da8 SHA512 24800a770d44ebe8ecafb26d454a30c78f5bf7321f14c80711efc2ff101fcaf936b400ee0db256e30ab04864f01b30fa3c1e6523b6b169476da023e2659968db
EBUILD aseprite-1.1.13.ebuild 3008 BLAKE2B 7419fdaaa1d9506d841ec9c0af3fa04b930afa98373accff9c9d6ee150d9e2ff3c64e670a800c1e40a118f608b2a6f362a779637c397f77a90802a97eef9557d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49
-EBUILD aseprite-1.2.12.ebuild 1976 BLAKE2B e3e309c857e22a926b0132ba8892a8d36457578c1f96af1a7ebc14fdcfefe6b2cc6175801db82457914fa363102f19e0fa166f1624d437906206664cb129b973 SHA512 3ca347cfb6f8674d38fa29e5e3d63a652d0811fc0d5f6af4d5011ef360ad61ab8377eec411fe8d544d6480b93aa948be6d28635281cdc8e84a5f23e2bf3e9d34
EBUILD aseprite-1.2.13.ebuild 1946 BLAKE2B 834aad940270ca648078ea1269d2930e4b520f2bdcbdbcc4003665b51f334cece4c96d022e3baff5f17dd1ea27470c6a87291af64c1bf3af3489bc258ccfeeaa SHA512 3800fd3e40116ad8cf4b6bc945566d7d20ba4ae9c3e017593718ae798e86ed690e204dc28c937fb9c50e077955b6a8984fd6554a38e3ac498f11ffb4c711995f
+EBUILD aseprite-1.2.14.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
EBUILD aseprite-1.2.9.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
-EBUILD aseprite-9999.ebuild 2235 BLAKE2B 49d66eabc5b6bf8f6f1d737dd63a9b7d074fdda44e47bdc92b8052cc02082c4a5be361ac0c34af598902b8fbcebce609313d4f25e66df675d513ede4e8bfb687 SHA512 fb34ed0eb133f604af117a24ce6eb8250353c5067ba606c1ee7238191636fa343a85d638e22e618a2d791276d47e5f71567817818ab7b7942455b785f809754e
+EBUILD aseprite-9999.ebuild 1926 BLAKE2B 4b3076cfaf82becd75d029487d1f1440d0ab14b059206511982569b1759b7e17b98bc9e0aa4e048bb154c5af9ea27f30524965600e600027a386594b2f4cdee7 SHA512 020e14c5b85244056b35fce8144cde91190602fda7b3d5b5647db733846172c9f15e5d0e55fda8ae41b8be2940aeeaf30bdb37ddbef4856764a01f6cca7df234
diff --git a/dev-games/aseprite/aseprite-1.2.12.ebuild b/dev-games/aseprite/aseprite-1.2.14.ebuild
similarity index 94%
rename from dev-games/aseprite/aseprite-1.2.12.ebuild
rename to dev-games/aseprite/aseprite-1.2.14.ebuild
index f9e6c0c..9eff062 100644
--- a/dev-games/aseprite/aseprite-1.2.12.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.14.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.aseprite.org"
LICENSE="Proprietary"
SLOT="0"
-PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" "${FILESDIR}/${P}-draw.patch" )
+PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
if [[ ${PV} = 9999* ]]; then
inherit git-r3
@@ -65,7 +65,6 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATER=OFF
-DFULLSCREEN_PLATFORM=ON
- -DBUILD_GMOCK=OFF
-DUSE_SHARED_CMARK=ON
-DUSE_SHARED_CURL=ON
-DUSE_SHARED_GIFLIB=ON
diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
index 92c9b8b..9eff062 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
PATCHES=( "${FILESDIR}/${P}-system_libarchive.patch" )
-if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
+if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/aseprite/aseprite"
EGIT_BRANCH="master"
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
EGIT_COMMIT="v${PV/_/-}"
fi
else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${PN^}-v${PV//_/-}-Source.zip"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}"
fi
@@ -28,23 +28,24 @@ fi
IUSE="
debug
memleak
- webp
- system-allegro"
+ webp"
RDEPEND="
app-arch/libarchive
app-text/cmark
+ dev-libs/expat
dev-libs/tinyxml
- system-allegro? ( media-libs/allegro:0[X,png] )
+ =dev-games/aseprite-skia-9999-r71[debug=]
media-libs/freetype:2
>=media-libs/giflib-5.0
+ media-libs/fontconfig
media-libs/libpng:0
webp? ( !!media-libs/libwebp )
net-misc/curl
+ sys-apps/util-linux
sys-libs/zlib
virtual/jpeg:=
x11-libs/libX11
- x11-libs/libXxf86dga
x11-libs/pixman"
DEPEND="$RDEPEND
app-arch/unzip"
@@ -56,13 +57,6 @@ DOCS=( EULA.txt
src_prepare() {
cmake-utils_src_prepare
-
- if use system-allegro; then
- ewarn "system-allegro is enabled. It has know issues which are solved"
- ewarn "in the bundled version:"
- ewarn " * You will not be able to resize the window."
- ewarn " * You will have problems adding HSV colours on non-English systems."
- fi
}
src_configure() {
@@ -71,7 +65,6 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATER=OFF
-DFULLSCREEN_PLATFORM=ON
- -DBUILD_GMOCK=OFF
-DUSE_SHARED_CMARK=ON
-DUSE_SHARED_CURL=ON
-DUSE_SHARED_GIFLIB=ON
@@ -79,14 +72,14 @@ src_configure() {
-DUSE_SHARED_ZLIB=ON
-DUSE_SHARED_LIBARCHIVE=ON
-DUSE_SHARED_LIBPNG=ON
- -DUSE_SHARED_LIBLOADPNG=OFF # Does not exist in the main tree
-DUSE_SHARED_TINYXML=ON
-DUSE_SHARED_PIXMAN=ON
-DUSE_SHARED_FREETYPE=ON
-DUSE_SHARED_HARFBUZZ=ON
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
-DWITH_WEBP_SUPPORT="$(usex webp)"
-DENABLE_MEMLEAK="$(usex memleak)"
+ -DSKIA_DIR="/var/lib/aseprite-skia"
+ -DSKIA_OUT_DIR="/var/lib/aseprite-skia/out/Release"
)
cmake-utils_src_configure
diff --git a/dev-games/aseprite/files/aseprite-1.2.12-draw.patch b/dev-games/aseprite/files/aseprite-1.2.12-draw.patch
deleted file mode 100644
index 44b4bef..0000000
--- a/dev-games/aseprite/files/aseprite-1.2.12-draw.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-v1.2.12.1 patch
-
-From 86ffa37fdd2b3267f5ccbdc29b592b208f15052d Mon Sep 17 00:00:00 2001
-From: David Capello <david@igarastudio.com>
-Date: Tue, 11 Jun 2019 10:42:41 -0300
-Subject: [PATCH] Fix rendering bug with new engine and zoom out (canvas is not
- updated correctly)
-
----
- src/app/ui/editor/editor.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
-index dc8715315..0bdaf4b3b 100644
---- a/src/app/ui/editor/editor.cpp
-+++ b/src/app/ui/editor/editor.cpp
-@@ -668,6 +668,20 @@ void Editor::drawOneSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& sprite
- }
-
- if (tmp->nativeHandle()) {
-+ if (newEngine) {
-+ // Without doing something on the "tmp" surface before (like
-+ // just drawing a pixel), we get a strange behavior where
-+ // pixels are not updated correctly on the editor (e.g. when
-+ // zoom < 100%). I didn't have enough time to investigate this
-+ // issue yet, but this is a partial fix/hack.
-+ //
-+ // TODO review why do we need to do this, it looks like some
-+ // internal state of a SkCanvas or SkBitmap thing is
-+ // updated after this, because convert_image_to_surface()
-+ // will overwrite these pixels anyway.
-+ tmp->drawRect(gfx::rgba(0, 0, 0, 255), gfx::Rect(0, 0, 1, 1));
-+ }
-+
- convert_image_to_surface(rendered.get(), m_sprite->palette(m_frame),
- tmp, 0, 0, 0, 0, rc2.w, rc2.h);
-
diff --git a/dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch b/dev-games/aseprite/files/aseprite-1.2.14-system_libarchive.patch
similarity index 100%
copy from dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch
copy to dev-games/aseprite/files/aseprite-1.2.14-system_libarchive.patch
diff --git a/dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch b/dev-games/aseprite/files/aseprite-9999-system_libarchive.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-1.2.12-system_libarchive.patch
rename to dev-games/aseprite/files/aseprite-9999-system_libarchive.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2017-12-12 19:35 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2017-12-12 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 3240e65d60ee585cd3f3f4e03014cd466395db32
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Tue Dec 12 19:34:33 2017 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Tue Dec 12 19:34:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=3240e65d
Aseprite 1.2.5
dev-games/aseprite/Manifest | 6 +++---
dev-games/aseprite/{aseprite-1.2.2.ebuild => aseprite-1.2.5.ebuild} | 0
dev-games/aseprite/files/aseprite-system_libarchive.patch | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index be382d2..0924462 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,7 +1,7 @@
-AUX aseprite-system_libarchive.patch 3043 SHA256 26b18b4be713aa41eba64433b45b4d45c0aa9b2b48b4c4a676df57e6fccca744 SHA512 c148baf4282a3fc2f4a23395dbd35b2296b586161409af1e7b9325e7e5a65da469da582dd04106434350032591f4e9dc7efa619585cca5b750f2c2c079c79535 WHIRLPOOL e8a57354a5198a60f604813ff14935da383913e7c63bbb446e2b7983f61728bd34629eaa40e00bfcf3888ca0e7ebfbede60443282993c30a177d599f29d044cf
+AUX aseprite-system_libarchive.patch 3268 SHA256 c62aae0a7707860600adb5beb2003af53761ebb9a981c96725f7cc74c3a3195d SHA512 eb0588983620e77cc5e054f585f347a382e3a23517a04ddc0251beaf21869015e58ed5c964ddbfe17a79749cfb1b05ce0e71dab39fc8fe71558115b571493cce WHIRLPOOL 64bd00a17eed5037975518794f7d9e0c998d7411a635565076384d591a8f932baa80bee66790c3803726747ad12d570171dcc71ba426b8227537149943cd4c66
DIST Aseprite-v1.1.13-Source.zip 12809688 SHA256 f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 WHIRLPOOL 18af949c5a0d7f2b866e8c9a45fcf3fb623722c44537abbf8b3e79501e6f898b9e037e7afc83170b9383a567ff5889ab2013b1624a06a45c074220b68a51b736
-DIST Aseprite-v1.2.2-Source.zip 20082797 SHA256 95fe1f9f8ee57aedd82b90dc358f3f0782cfe7f8d398af98a5df11fa4a00a98e SHA512 0798bacb626a0f7e0a2c3984c342cd30d1da5ff2be839c395667c359e1a2c422daf7c1e4a74594f12385f6fec46868948f2491bc609ccd9fa992566fa631c06a WHIRLPOOL 1d65f9a0ba60f867da73793e9158a44bd4b9e63d863717de444f0d547cd1a57d81112a7f8f4b7731c8a25e4f54c650b7ff66d04d7dc4b765fc36de67afd2fb50
+DIST Aseprite-v1.2.5-Source.zip 21167203 SHA256 3b976e3cae78f1457f401f93eb02bf73afde7c820470349fe19ef055b6599bb2 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877 WHIRLPOOL e53dc459b8e9bf131c37427a320b16465f879ccdc3dbf555db326cff0507184d53f9167952dcec9d68b34d9f41df88e1770a30886ec1b7b64cf61b72a20518fd
EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
-EBUILD aseprite-1.2.2.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
+EBUILD aseprite-1.2.5.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
EBUILD aseprite-1.2_beta9.ebuild 2981 SHA256 734aeabb701c559fb8a4f448cd7db716d1b0985c8671d8aea6c48786449e814b SHA512 57c9589cb28105e8a069edb905670d4c0ed71dfa620545117c3eac3ae7c1fc62f4c69f8cafce88c7f51c7242904e0fb209c09376034cb075e8c2a15e96541fbf WHIRLPOOL 85e3d939a4ce8c43f7bbca7e192166eb3498a9612edacb3a0ed98282c8df8b25bef006754e1e62956f0d35d3422ca153b40b015e562e03767e95afac126a0134
EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
diff --git a/dev-games/aseprite/aseprite-1.2.2.ebuild b/dev-games/aseprite/aseprite-1.2.5.ebuild
similarity index 100%
rename from dev-games/aseprite/aseprite-1.2.2.ebuild
rename to dev-games/aseprite/aseprite-1.2.5.ebuild
diff --git a/dev-games/aseprite/files/aseprite-system_libarchive.patch b/dev-games/aseprite/files/aseprite-system_libarchive.patch
index 4d8a174..8959c10 100644
--- a/dev-games/aseprite/files/aseprite-system_libarchive.patch
+++ b/dev-games/aseprite/files/aseprite-system_libarchive.patch
@@ -53,11 +53,11 @@ index a9e80d73c..619acac92 100644
${FREETYPE_LIBRARIES}
${HARFBUZZ_LIBRARIES}
json11
-- archive_static)
-+ ${ARCHIVE_LIBRARIES})
+- archive_static
++ ${ARCHIVE_LIBRARIES}
+ fmt)
if(ENABLE_SCRIPTING)
- target_link_libraries(app-lib script-lib)
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 596ffa2e4..977816439 100644
--- a/third_party/CMakeLists.txt
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2017-10-04 20:00 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2017-10-04 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 2ba9980ba8a4eefab233c0571cd333de1f84e8cf
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Tue Oct 3 20:25:16 2017 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Wed Oct 4 19:50:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=2ba9980b
Updated Aseprite to version 1.2.2
dev-games/aseprite/Manifest | 3 +
dev-games/aseprite/aseprite-1.2.2.ebuild | 109 +++++++++++++++++++++
.../files/aseprite-system_libarchive.patch | 87 ++++++++++++++++
3 files changed, 199 insertions(+)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 003dc6a..be382d2 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,4 +1,7 @@
+AUX aseprite-system_libarchive.patch 3043 SHA256 26b18b4be713aa41eba64433b45b4d45c0aa9b2b48b4c4a676df57e6fccca744 SHA512 c148baf4282a3fc2f4a23395dbd35b2296b586161409af1e7b9325e7e5a65da469da582dd04106434350032591f4e9dc7efa619585cca5b750f2c2c079c79535 WHIRLPOOL e8a57354a5198a60f604813ff14935da383913e7c63bbb446e2b7983f61728bd34629eaa40e00bfcf3888ca0e7ebfbede60443282993c30a177d599f29d044cf
DIST Aseprite-v1.1.13-Source.zip 12809688 SHA256 f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a SHA512 b6dd948223885bc9511a8a0f8427540011dc2a6a4ec3448d3461a5661c7de574487e2306024f9522240490b1784a4231818f2790466d106f8b21259c188ca258 WHIRLPOOL 18af949c5a0d7f2b866e8c9a45fcf3fb623722c44537abbf8b3e79501e6f898b9e037e7afc83170b9383a567ff5889ab2013b1624a06a45c074220b68a51b736
+DIST Aseprite-v1.2.2-Source.zip 20082797 SHA256 95fe1f9f8ee57aedd82b90dc358f3f0782cfe7f8d398af98a5df11fa4a00a98e SHA512 0798bacb626a0f7e0a2c3984c342cd30d1da5ff2be839c395667c359e1a2c422daf7c1e4a74594f12385f6fec46868948f2491bc609ccd9fa992566fa631c06a WHIRLPOOL 1d65f9a0ba60f867da73793e9158a44bd4b9e63d863717de444f0d547cd1a57d81112a7f8f4b7731c8a25e4f54c650b7ff66d04d7dc4b765fc36de67afd2fb50
EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
+EBUILD aseprite-1.2.2.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
EBUILD aseprite-1.2_beta9.ebuild 2981 SHA256 734aeabb701c559fb8a4f448cd7db716d1b0985c8671d8aea6c48786449e814b SHA512 57c9589cb28105e8a069edb905670d4c0ed71dfa620545117c3eac3ae7c1fc62f4c69f8cafce88c7f51c7242904e0fb209c09376034cb075e8c2a15e96541fbf WHIRLPOOL 85e3d939a4ce8c43f7bbca7e192166eb3498a9612edacb3a0ed98282c8df8b25bef006754e1e62956f0d35d3422ca153b40b015e562e03767e95afac126a0134
EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
diff --git a/dev-games/aseprite/aseprite-1.2.2.ebuild b/dev-games/aseprite/aseprite-1.2.2.ebuild
new file mode 100644
index 0000000..1a74919
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.2.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://www.aseprite.org"
+LICENSE="Proprietary"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-system_libarchive.patch" )
+
+if [[ ${PV} = 9999* || ${PV} = *beta* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/aseprite/aseprite"
+ EGIT_BRANCH="master"
+ if [[ ${PV} != 9999* ]]; then
+ EGIT_COMMIT="v${PV/_/-}"
+ fi
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"
+fi
+
+IUSE="
+ debug
+ memleak
+ webp
+ system-allegro
+ +system-curl
+ +system-giflib
+ +system-jpeg
+ +system-libpng
+ +system-libwebp
+ +system-pixman
+ +system-tinyxml
+ +system-zlib"
+
+RDEPEND="
+ app-arch/libarchive
+ app-text/cmark
+ system-tinyxml? ( dev-libs/tinyxml )
+ system-allegro? ( media-libs/allegro:0[X,png] )
+ system-giflib? ( >=media-libs/giflib-5.0 )
+ system-libpng? ( media-libs/libpng:0 )
+ webp? ( system-libwebp? ( media-libs/libwebp ) )
+ system-curl? ( net-misc/curl )
+ system-zlib? ( sys-libs/zlib )
+ system-jpeg? ( virtual/jpeg:= )
+ x11-libs/libX11
+ x11-libs/libXxf86dga
+ system-pixman? ( x11-libs/pixman )"
+DEPEND="$RDEPEND
+ app-arch/unzip"
+ #dev-cpp/gtest
+
+DOCS=( EULA.txt
+ docs/ase-file-specs.md
+ docs/LICENSES.md
+ README.md )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if use system-allegro; then
+ ewarn "system-allegro is enabled. It has know issues which are solved"
+ ewarn "in the bundled version:"
+ ewarn " * You will not be able to resize the window."
+ ewarn " * You will have problems adding HSV colours on non-English systems."
+ fi
+}
+
+src_configure() {
+ use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DCURL_STATICLIB=OFF
+ -DENABLE_UPDATER=OFF
+ -DFULLSCREEN_PLATFORM=ON
+ -DENABLE_TESTS=OFF
+ -DBUILD_GMOCK=OFF
+ $(use system-pixman && echo \
+ -DPIXMAN_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
+ -DPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
+ -DUSE_SHARED_CMARK=ON
+ -DUSE_SHARED_CURL="$(usex system-curl)"
+ -DUSE_SHARED_GIFLIB="$(usex system-giflib)"
+ -DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
+ -DUSE_SHARED_LIBARCHIVE=ON
+ -DUSE_SHARED_LIBPNG="$(usex system-libpng)"
+ -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+ -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
+ -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
+ -DUSE_SHARED_PIXMAN="$(usex system-pixman)"
+ -DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
+ -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
+ -DWITH_WEBP_SUPPORT="$(usex webp)"
+ -DENABLE_MEMLEAK="$(usex memleak)"
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ elog "Aseprite is for personal use only. You may not distribute it."
+}
diff --git a/dev-games/aseprite/files/aseprite-system_libarchive.patch b/dev-games/aseprite/files/aseprite-system_libarchive.patch
new file mode 100644
index 0000000..4d8a174
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-system_libarchive.patch
@@ -0,0 +1,87 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dae638be8..dd5d17794 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,6 +64,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off)
+ option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off)
+ option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
+ option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
+ option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+ option(USE_SHARED_LIBLOADPNG "Use your installed copy of libloadpng" off)
+ option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off)
+@@ -193,6 +194,15 @@ else()
+ endif()
+ include_directories(${ZLIB_INCLUDE_DIRS})
+
++# libarchive
++if(USE_SHARED_LIBARCHIVE)
++ find_library(ARCHIVE_LIBRARIES NAMES archive)
++ find_path(ARCHIVE_INCLUDE_DIRS NAMES archive.h)
++else()
++ add_definitions(-DLIBARCHIVE_STATIC)
++ set(ARCHIVE_LIBRARIES archive_static)
++endif()
++
+ # libpng
+ if(USE_SHARED_LIBPNG)
+ find_package(PNG REQUIRED)
+@@ -294,7 +304,7 @@ if(USE_SHARED_CMARK)
+ else()
+ add_definitions(-DCMARK_STATIC_DEFINE)
+ set(CMARK_LIBRARIES libcmark_static)
+- include_directories(${CMAKE_BINARY_DIR}/third_party/cmark)
++ include_directories(${CMARK_DIR})
+ endif()
+
+ if(USE_SHARED_CURL)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index a9e80d73c..619acac92 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -82,9 +82,6 @@ if(WITH_WEBP_SUPPORT)
+ add_definitions(-DASEPRITE_WITH_WEBP_SUPPORT)
+ endif()
+
+-# libarchive definitions
+-add_definitions(-DLIBARCHIVE_STATIC)
+-
+ ######################################################################
+ # app-lib target
+
+@@ -551,7 +548,7 @@ target_link_libraries(app-lib
+ ${FREETYPE_LIBRARIES}
+ ${HARFBUZZ_LIBRARIES}
+ json11
+- archive_static)
++ ${ARCHIVE_LIBRARIES})
+
+ if(ENABLE_SCRIPTING)
+ target_link_libraries(app-lib script-lib)
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 596ffa2e4..977816439 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -113,13 +113,15 @@ endif()
+ add_subdirectory(json11)
+
+ # libarchive
+-set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
+-set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
+-set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
+-set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
+-add_subdirectory(libarchive)
+-target_include_directories(archive_static INTERFACE
+- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++if(NOT USE_SHARED_LIBARCHIVE)
++ set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
++ set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
++ set(ENABLE_LZMA OFF CACHE BOOL "Enable the use of the system LZMA library if found")
++ set(ENABLE_CNG OFF CACHE BOOL "Enable the use of CNG(Crypto Next Generation)")
++ add_subdirectory(libarchive)
++ target_include_directories(archive_static INTERFACE
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
++endif()
+
+ # benchmark
+ if(ENABLE_BENCHMARKS)
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/
@ 2016-04-16 11:03 Albert Diserholt
0 siblings, 0 replies; 14+ messages in thread
From: Albert Diserholt @ 2016-04-16 11:03 UTC (permalink / raw
To: gentoo-commits
commit: cd658f1161b7738a47b55c41922292be1b72bb44
Author: Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Sat Apr 16 11:01:09 2016 +0000
Commit: Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Sat Apr 16 11:01:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=cd658f11
dev-games/aseprite: New upstream version
Added webp use flag.
Upstream now releases zip files of the complete source code,
removing the need to checkout code with git.
dev-games/aseprite/Manifest | 8 ++--
dev-games/aseprite/aseprite-1.1.1.ebuild | 13 ++---
...eprite-1.1.1.ebuild => aseprite-1.1.4.1.ebuild} | 56 +++++++++++++++-------
dev-games/aseprite/aseprite-9999.ebuild | 56 +++++++++++++++-------
...patch => aseprite-freetype-include-1.1.1.patch} | 0
5 files changed, 85 insertions(+), 48 deletions(-)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 3692f5f..b3177ee 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,3 +1,5 @@
-AUX aseprite-freetype-include.patch 423 SHA256 143f1084b5a9eda6767549fa067076c9307e787c5daaab621fab0212c7970f6a SHA512 113925bd48fce8473137c6a8d814acc701dd8740c5cb17bbb889ffdf2cefdc970c32b9f40ce72453a1c6b6719c35fec0a9d6c3d6d49bdabfe2d804b7c7b4f892 WHIRLPOOL a3466656f4bd5250967685fe6c55a9087b47f8a1091afae9ef24548b0a92a9354696f58dfa6137ef75131b8c9d9e61f160684a2fc371db5579da999b4fd9cc2c
-EBUILD aseprite-1.1.1.ebuild 2501 SHA256 3ea306bb955c3db46c60cd8bf0987bdbcb7378b6089dc4c68d276b3f03806faf SHA512 c68fcfc4e9b6c982a2a077d128f041fcc1ea37caf85fd054dd01bf146f9ab272a701dda7eb1f3fc1a685b44f6f1045b1b7fda0e394bc88e534d36ed67fe23525 WHIRLPOOL 32c83cf1f0f1aab510f5357232b64010e83e04f5e1791149dfb773ac7106a92819f055daa63208f09fafabcabb60d57957b0f6def8e617f99cdc38130f9454db
-EBUILD aseprite-9999.ebuild 2501 SHA256 3ea306bb955c3db46c60cd8bf0987bdbcb7378b6089dc4c68d276b3f03806faf SHA512 c68fcfc4e9b6c982a2a077d128f041fcc1ea37caf85fd054dd01bf146f9ab272a701dda7eb1f3fc1a685b44f6f1045b1b7fda0e394bc88e534d36ed67fe23525 WHIRLPOOL 32c83cf1f0f1aab510f5357232b64010e83e04f5e1791149dfb773ac7106a92819f055daa63208f09fafabcabb60d57957b0f6def8e617f99cdc38130f9454db
+AUX aseprite-freetype-include-1.1.1.patch 423 SHA256 143f1084b5a9eda6767549fa067076c9307e787c5daaab621fab0212c7970f6a SHA512 113925bd48fce8473137c6a8d814acc701dd8740c5cb17bbb889ffdf2cefdc970c32b9f40ce72453a1c6b6719c35fec0a9d6c3d6d49bdabfe2d804b7c7b4f892 WHIRLPOOL a3466656f4bd5250967685fe6c55a9087b47f8a1091afae9ef24548b0a92a9354696f58dfa6137ef75131b8c9d9e61f160684a2fc371db5579da999b4fd9cc2c
+DIST Aseprite-v1.1.4.1-Source.zip 11723085 SHA256 731ac44259217626dde91cdcae9a24cdd4337540fc91bbe5c05cebcb12869879 SHA512 deeb42c123517e17378498584bb788f375e8aaaf046d5f9732848a5bd794a1af1d8381ff51271f9e30c198478e0f716ae23495972b693db9049ff4c2b8968672 WHIRLPOOL 5c2bd1bf8f5d187c385086a431ab070f55308b01089ce703e54093963402a9300295ea1cbf3602021fea1211ae68c6a2a07391e8e054827ce82ee60462001c4a
+EBUILD aseprite-1.1.1.ebuild 2448 SHA256 7895541da855d083cff2bb2b24ddd780819fd6bcf335d1703be46ba728ada828 SHA512 f9f58d56c495381f2225524b427f32469599c8102fa92894a4ceb230d94445e5b107f9f8eac3f72f96887f5b817e6d90945fe649aad25f0835a9cda20baaf81d WHIRLPOOL db45a1d6564a959fa74372954f62e62061985810b86cd0541e81311d6fa4999d8a7f2b1e2d0445e89afb2d7a7b34dd584682a562f82721ec3280d100f317772f
+EBUILD aseprite-1.1.4.1.ebuild 2916 SHA256 4bf92aa71fb2adf844c8ac26479a627b04109ac20db1f92ea57f99597c0cbd4f SHA512 06e2ac0a22ad1d06be5fb6df4cdfdaa7146cd431c91635abc2596fdd9ded9cfeba9150d22dd2b4b414feacca6cdc797867e635774ff2e6ac539731b780098ca6 WHIRLPOOL 32fced5f3b7de835c9097a8ce39d52fa2b7eb91aec25bd1aba12d0a3b9a3978fd69aecfda41e3a5449068974a67b063d2eeefafcc9f090288e8c064def801e34
+EBUILD aseprite-9999.ebuild 2916 SHA256 4bf92aa71fb2adf844c8ac26479a627b04109ac20db1f92ea57f99597c0cbd4f SHA512 06e2ac0a22ad1d06be5fb6df4cdfdaa7146cd431c91635abc2596fdd9ded9cfeba9150d22dd2b4b414feacca6cdc797867e635774ff2e6ac539731b780098ca6 WHIRLPOOL 32fced5f3b7de835c9097a8ce39d52fa2b7eb91aec25bd1aba12d0a3b9a3978fd69aecfda41e3a5449068974a67b063d2eeefafcc9f090288e8c064def801e34
diff --git a/dev-games/aseprite/aseprite-1.1.1.ebuild b/dev-games/aseprite/aseprite-1.1.1.ebuild
index 114a481..ac956ad 100644
--- a/dev-games/aseprite/aseprite-1.1.1.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.1.ebuild
@@ -8,13 +8,8 @@ inherit cmake-utils toolchain-funcs git-r3
DESCRIPTION="Animated sprite editor & pixel art tool"
HOMEPAGE="http://www.aseprite.org"
EGIT_REPO_URI="https://github.com/aseprite/aseprite"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_COMMIT="master"
-else
- EGIT_COMMIT="v${PV}"
- KEYWORDS="~amd64 ~x86"
-fi
+EGIT_COMMIT="v${PV}"
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"
@@ -29,7 +24,7 @@ RDEPEND="
system-libpng? ( media-libs/libpng:0 )
system-curl? ( net-misc/curl )
system-zlib? ( sys-libs/zlib )
- system-jpeg? ( virtual/jpeg )
+ system-jpeg? ( virtual/jpeg:= )
x11-libs/libX11
system-pixman? ( x11-libs/pixman )"
DEPEND="$RDEPEND
@@ -43,7 +38,7 @@ DOCS=( docs/files/ase.txt
README.md )
src_prepare() {
- use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include.patch"
+ use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include-${PV}.patch"
cmake-utils_src_prepare
diff --git a/dev-games/aseprite/aseprite-1.1.1.ebuild b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
similarity index 68%
copy from dev-games/aseprite/aseprite-1.1.1.ebuild
copy to dev-games/aseprite/aseprite-1.1.4.1.ebuild
index 114a481..0553cae 100644
--- a/dev-games/aseprite/aseprite-1.1.1.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
@@ -3,23 +3,37 @@
# $Id$
EAPI=6
-inherit cmake-utils toolchain-funcs git-r3
+inherit cmake-utils toolchain-funcs
DESCRIPTION="Animated sprite editor & pixel art tool"
HOMEPAGE="http://www.aseprite.org"
-EGIT_REPO_URI="https://github.com/aseprite/aseprite"
+LICENSE="GPL-2"
+SLOT="0"
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/aseprite/aseprite"
EGIT_COMMIT="master"
else
- EGIT_COMMIT="v${PV}"
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"
fi
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug memleak +system-curl +system-tinyxml +system-giflib +system-libpng +system-zlib +system-jpeg +system-pixman +system-freetype system-allegro"
+IUSE="
+ debug
+ memleak
+ webp
+ system-allegro
+ +system-curl
+ +system-freetype
+ +system-giflib
+ +system-jpeg
+ +system-libpng
+ +system-libwebp
+ +system-pixman
+ +system-tinyxml
+ +system-zlib"
RDEPEND="
system-tinyxml? ( dev-libs/tinyxml )
@@ -27,12 +41,14 @@ RDEPEND="
system-freetype? ( media-libs/freetype:2 )
system-giflib? ( >=media-libs/giflib-5.0 )
system-libpng? ( media-libs/libpng:0 )
+ webp? ( system-libwebp? ( media-libs/libwebp ) )
system-curl? ( net-misc/curl )
system-zlib? ( sys-libs/zlib )
- system-jpeg? ( virtual/jpeg )
+ system-jpeg? ( virtual/jpeg:= )
x11-libs/libX11
system-pixman? ( x11-libs/pixman )"
DEPEND="$RDEPEND
+ app-arch/unzip
dev-cpp/gtest"
DOCS=( docs/files/ase.txt
@@ -41,15 +57,16 @@ DOCS=( docs/files/ase.txt
docs/files/pic.txt
docs/files/picpro.txt
README.md )
+# EULA.txt not applicable to source code distribution.
src_prepare() {
- use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include.patch"
-
cmake-utils_src_prepare
if use system-allegro; then
- ewarn "system-allegro is enabled. It has a bug which prevents"
- ewarn "resizing of the Aseprite window."
+ ewarn "system-allegro is enabled. It has know issues which are solved"
+ ewarn "in the bundled version:"
+ ewarn " * You will not be able to resize the window."
+ ewarn " * You will have problems adding HSV colours on non-English systems."
fi
}
@@ -60,22 +77,25 @@ src_configure() {
-DCURL_STATICLIB=OFF
-DENABLE_UPDATER=OFF
-DFULLSCREEN_PLATFORM=ON
+ -DENABLE_TESTS=ON
$(use system-pixman && echo \
-DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
-DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
$(use system-freetype && echo \
-DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
-DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
+ -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
-DUSE_SHARED_CURL="$(usex system-curl)"
+ -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
-DUSE_SHARED_GIFLIB="$(usex system-giflib)"
-DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
- -DUSE_SHARED_ZLIB="$(usex system-zlib)"
+ -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
-DUSE_SHARED_LIBPNG="$(usex system-libpng)"
- -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
-DUSE_SHARED_PIXMAN="$(usex system-pixman)"
- -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
- -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+ -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
+ -DUSE_SHARED_ZLIB="$(usex system-zlib)"
+ -DWITH_WEBP_SUPPORT="$(usex webp)"
+ -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
-DENABLE_memleak="$(usex memleak)"
)
diff --git a/dev-games/aseprite/aseprite-9999.ebuild b/dev-games/aseprite/aseprite-9999.ebuild
index 114a481..0553cae 100644
--- a/dev-games/aseprite/aseprite-9999.ebuild
+++ b/dev-games/aseprite/aseprite-9999.ebuild
@@ -3,23 +3,37 @@
# $Id$
EAPI=6
-inherit cmake-utils toolchain-funcs git-r3
+inherit cmake-utils toolchain-funcs
DESCRIPTION="Animated sprite editor & pixel art tool"
HOMEPAGE="http://www.aseprite.org"
-EGIT_REPO_URI="https://github.com/aseprite/aseprite"
+LICENSE="GPL-2"
+SLOT="0"
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/aseprite/aseprite"
EGIT_COMMIT="master"
else
- EGIT_COMMIT="v${PV}"
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN^}-v${PV}-Source.zip"
KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}"
fi
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug memleak +system-curl +system-tinyxml +system-giflib +system-libpng +system-zlib +system-jpeg +system-pixman +system-freetype system-allegro"
+IUSE="
+ debug
+ memleak
+ webp
+ system-allegro
+ +system-curl
+ +system-freetype
+ +system-giflib
+ +system-jpeg
+ +system-libpng
+ +system-libwebp
+ +system-pixman
+ +system-tinyxml
+ +system-zlib"
RDEPEND="
system-tinyxml? ( dev-libs/tinyxml )
@@ -27,12 +41,14 @@ RDEPEND="
system-freetype? ( media-libs/freetype:2 )
system-giflib? ( >=media-libs/giflib-5.0 )
system-libpng? ( media-libs/libpng:0 )
+ webp? ( system-libwebp? ( media-libs/libwebp ) )
system-curl? ( net-misc/curl )
system-zlib? ( sys-libs/zlib )
- system-jpeg? ( virtual/jpeg )
+ system-jpeg? ( virtual/jpeg:= )
x11-libs/libX11
system-pixman? ( x11-libs/pixman )"
DEPEND="$RDEPEND
+ app-arch/unzip
dev-cpp/gtest"
DOCS=( docs/files/ase.txt
@@ -41,15 +57,16 @@ DOCS=( docs/files/ase.txt
docs/files/pic.txt
docs/files/picpro.txt
README.md )
+# EULA.txt not applicable to source code distribution.
src_prepare() {
- use system-freetype && epatch "${FILESDIR}/aseprite-freetype-include.patch"
-
cmake-utils_src_prepare
if use system-allegro; then
- ewarn "system-allegro is enabled. It has a bug which prevents"
- ewarn "resizing of the Aseprite window."
+ ewarn "system-allegro is enabled. It has know issues which are solved"
+ ewarn "in the bundled version:"
+ ewarn " * You will not be able to resize the window."
+ ewarn " * You will have problems adding HSV colours on non-English systems."
fi
}
@@ -60,22 +77,25 @@ src_configure() {
-DCURL_STATICLIB=OFF
-DENABLE_UPDATER=OFF
-DFULLSCREEN_PLATFORM=ON
+ -DENABLE_TESTS=ON
$(use system-pixman && echo \
-DLIBPIXMAN_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir pixman-1)/pixman-1" \
-DLIBPIXMAN_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir pixman-1)/libpixman-1.so")
$(use system-freetype && echo \
-DFREETYPE_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir freetype2)" \
-DFREETYPE_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir freetype2)/libfreetype.so")
+ -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
-DUSE_SHARED_CURL="$(usex system-curl)"
+ -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
-DUSE_SHARED_GIFLIB="$(usex system-giflib)"
-DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
- -DUSE_SHARED_ZLIB="$(usex system-zlib)"
+ -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
-DUSE_SHARED_LIBPNG="$(usex system-libpng)"
- -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
-DUSE_SHARED_PIXMAN="$(usex system-pixman)"
- -DUSE_SHARED_FREETYPE="$(usex system-freetype)"
- -DUSE_SHARED_ALLEGRO4="$(usex system-allegro)"
- -DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+ -DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
+ -DUSE_SHARED_ZLIB="$(usex system-zlib)"
+ -DWITH_WEBP_SUPPORT="$(usex webp)"
+ -DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
-DENABLE_memleak="$(usex memleak)"
)
diff --git a/dev-games/aseprite/files/aseprite-freetype-include.patch b/dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch
similarity index 100%
rename from dev-games/aseprite/files/aseprite-freetype-include.patch
rename to dev-games/aseprite/files/aseprite-freetype-include-1.1.1.patch
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-03-16 7:59 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-15 18:28 [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/files/, dev-games/aseprite/ Albert Diserholt
-- strict thread matches above, loose matches on Subject: below --
2022-03-16 7:59 Albert Diserholt
2021-08-28 8:09 Albert Diserholt
2021-04-20 14:41 Albert Diserholt
2020-08-13 10:13 Albert Diserholt
2020-06-18 6:33 Albert Diserholt
2020-05-30 9:05 Albert Diserholt
2020-04-27 12:46 Albert Diserholt
2020-04-14 7:55 Albert Diserholt
2019-10-15 7:36 Albert Diserholt
2019-09-10 16:07 Albert Diserholt
2017-12-12 19:35 Albert Diserholt
2017-10-04 20:00 Albert Diserholt
2016-04-16 11:03 Albert Diserholt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox