public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/
@ 2018-01-21 12:34 Albert Diserholt
  0 siblings, 0 replies; 4+ messages in thread
From: Albert Diserholt @ 2018-01-21 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     33a583defc8cdcaab663ae350fe8af598b1d7014
Author:     Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Sun Jan 21 12:34:18 2018 +0000
Commit:     Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Sun Jan 21 12:34:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=33a583de

Aseprite 1.2.6

 dev-games/aseprite/Manifest                        |  3 ++-
 ...rite-1.2_beta9.ebuild => aseprite-1.2.6.ebuild} | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 0924462..836d24b 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,7 +1,8 @@
 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.5-Source.zip 21167203 SHA256 3b976e3cae78f1457f401f93eb02bf73afde7c820470349fe19ef055b6599bb2 SHA512 888c8fe43c6dbe94679e44bfb0fe805262e4a846a6eb8ea91ce6e007d6dff7a89eb195f168efaa9643ea058205850ce979280f324b45c2d4c20a14be26c21877 WHIRLPOOL e53dc459b8e9bf131c37427a320b16465f879ccdc3dbf555db326cff0507184d53f9167952dcec9d68b34d9f41df88e1770a30886ec1b7b64cf61b72a20518fd
+DIST Aseprite-v1.2.6-Source.zip 20560401 SHA256 e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972 SHA512 e2e7316f0ac723dff86e23759135dc662cfe7bfc8c63160c4066c8503c92eebbf05a3b6f8003581d8daaa77eee62060e575c825a6e34020157ecdfc6e3def418 WHIRLPOOL b413a5c9ba20e2989fd7f7dd94cd1dc56c9118a2affd0a67b81158ef44b9f9dfddd3fe457720cf2b9194d3e713cf2d68b74ca19cdbbe7f6b6b09df885d0778d4
 EBUILD aseprite-1.1.13.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24
 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-1.2.6.ebuild 2909 SHA256 5ad0b6bde6729b0daa345b0782ea0163f62fc4de0cb6ac3ae5a8d777c46150a4 SHA512 a31092536e076644e8bf4db4bf9dcf36981040b82252c5ab83a1cff1763281b4fd49b205abcc5a584246e417df85c0fc9c3e349483a2e62057e1361b261254a1 WHIRLPOOL df7ff7e221299b2405f116c777ae69b601ded121cbca38c1b96d2c22c6af3eb9c462fa99700cf65dbf38c2c8e64364bd74d54503b208eeb6169cafc5599b907e
 EBUILD aseprite-9999.ebuild 3008 SHA256 1683aab831ef721b959105b273409ad6ff9334b22f87fb6554a111ce5ea65c4d SHA512 58cb3df2e8b33502021b90adde0459004507c9809ee4e0a06f5ddcbefef3c9758cd7374e7f529309a1c876a98e8983305e18f7f9344350221470a7bcebe9ce49 WHIRLPOOL cff7736e9fa83d4042e90bc46d7bf60e31979befe2378b1f06b93912157b3f6c851d5f71488619e42d99481a0dd7bec27b3e173402936821a84aeee2f7467f24

diff --git a/dev-games/aseprite/aseprite-1.2_beta9.ebuild b/dev-games/aseprite/aseprite-1.2.6.ebuild
similarity index 90%
rename from dev-games/aseprite/aseprite-1.2_beta9.ebuild
rename to dev-games/aseprite/aseprite-1.2.6.ebuild
index 87c0b32..1a74919 100644
--- a/dev-games/aseprite/aseprite-1.2_beta9.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.6.ebuild
@@ -10,6 +10,8 @@ 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"
@@ -38,6 +40,8 @@ IUSE="
 	+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 )
@@ -70,7 +74,7 @@ src_prepare() {
 }
 
 src_configure() {
-	use debug && CMAKE_BUILD_TYPE=Debug
+	use debug && CMAKE_BUILD_TYPE=Debug || CMAKE_BUILD_TYPE=Release
 
 	local mycmakeargs=(
 		-DCURL_STATICLIB=OFF
@@ -81,21 +85,19 @@ src_configure() {
 		$(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")
-		#$(use system-freetype && echo \
-			#-DFREETYPE_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_CMARK=ON
 		-DUSE_SHARED_CURL="$(usex system-curl)"
-		-DUSE_SHARED_FREETYPE=OFF # Currently requires non-distributed internal files."
 		-DUSE_SHARED_GIFLIB="$(usex system-giflib)"
 		-DUSE_SHARED_JPEGLIB="$(usex system-jpeg)"
-		-DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+		-DUSE_SHARED_LIBARCHIVE=ON
 		-DUSE_SHARED_LIBPNG="$(usex system-libpng)"
-		-DUSE_SHARED_PIXMAN="$(usex system-pixman)"
+		-DUSE_SHARED_LIBLOADPNG="$(usex system-allegro)"
+		-DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
 		-DUSE_SHARED_TINYXML="$(usex system-tinyxml)"
-		-DUSE_SHARED_ZLIB="$(usex system-zlib)"
+		-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)"
-		-DUSE_SHARED_LIBWEBP="$(usex system-libwebp)"
 		-DENABLE_MEMLEAK="$(usex memleak)"
 	)
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/
@ 2021-09-12 14:11 Albert Diserholt
  0 siblings, 0 replies; 4+ messages in thread
From: Albert Diserholt @ 2021-09-12 14:11 UTC (permalink / raw
  To: gentoo-commits

commit:     51b4abe93138651b280def0cf8452d737934af2b
Author:     Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Sun Sep 12 14:10:20 2021 +0000
Commit:     Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Sun Sep 12 14:10:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=51b4abe9

Fix download of pre-built Skia library for aseprite

Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>

 dev-games/aseprite/Manifest               | 11 +++++------
 dev-games/aseprite/aseprite-1.2.21.ebuild | 11 ++++++++---
 dev-games/aseprite/aseprite-1.2.28.ebuild | 11 ++++++++---
 dev-games/aseprite/aseprite-1.2.29.ebuild | 11 ++++++++---
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index e3e393b..4fc7aa0 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -8,10 +8,9 @@ DIST Aseprite-v1.1.13-Source.zip 12809688 BLAKE2B e9d6d58cfeb4b07d63945025a31e5a
 DIST Aseprite-v1.2.21-Source.zip 24477477 BLAKE2B b497cf5b6ba677eb742e44d2ee5d28c60ba57956ca04989e27ac8623832e08161c1cf0b64a9440c4fecf103e083556404d918a09ca61d7c496fdac7fb927b196 SHA512 17b2570f0114213b86e18f65a943867d72a497245b8f45bf22a23ad6ed32bb016c69391341cc0449c4fbc9d31e6f5d564c48a204df1c9f13488ffb4658393fee
 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.28-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
-DIST aseprite-1.2.29-skia-m81-b607b32047.zip 35390542 BLAKE2B f5f5bc6d237c92a302dd593cb91f02904426d342a5c1484589e9ac3444e226637791c5ae951a7406adf4a75a192009aa19beee0f36c4563e10cd32b6b4c6768e SHA512 6c417f289cc1874aefc4dc08ce2edf055c50106c9351476eafe2d554296e9075046eb726465c58097b0a894e2a709f9830208c44eb6c3c7f6ad53cc7d24e70ce
+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 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
+EBUILD aseprite-1.2.21.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72
+EBUILD aseprite-1.2.28.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72
+EBUILD aseprite-1.2.29.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72

diff --git a/dev-games/aseprite/aseprite-1.2.21.ebuild b/dev-games/aseprite/aseprite-1.2.21.ebuild
index 54db779..71183c6 100644
--- a/dev-games/aseprite/aseprite-1.2.21.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.21.ebuild
@@ -16,9 +16,14 @@ PATCHES=(
 )
 
 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"
+SKIA_URI="
+	amd64? (
+		${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x64.zip -> ${PN}-skia-${SKIA_VERSION}-amd64.zip
+	)
+	x86? (
+		${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x86.zip -> ${PN}-skia-${SKIA_VERSION}-x86.zip
+	)"
 
 ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
 ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
@@ -57,7 +62,7 @@ src_unpack() {
 	mkdir -p "${P}/skia"
 	cd "${P}"
 	unpack "${ASEPRITE_FILE}"
-	( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
+	( cd skia && unpack "${PN}-skia-${SKIA_VERSION}-${ARCH}.zip" )
 }
 
 src_prepare() {

diff --git a/dev-games/aseprite/aseprite-1.2.28.ebuild b/dev-games/aseprite/aseprite-1.2.28.ebuild
index 54db779..71183c6 100644
--- a/dev-games/aseprite/aseprite-1.2.28.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.28.ebuild
@@ -16,9 +16,14 @@ PATCHES=(
 )
 
 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"
+SKIA_URI="
+	amd64? (
+		${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x64.zip -> ${PN}-skia-${SKIA_VERSION}-amd64.zip
+	)
+	x86? (
+		${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x86.zip -> ${PN}-skia-${SKIA_VERSION}-x86.zip
+	)"
 
 ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
 ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
@@ -57,7 +62,7 @@ src_unpack() {
 	mkdir -p "${P}/skia"
 	cd "${P}"
 	unpack "${ASEPRITE_FILE}"
-	( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
+	( cd skia && unpack "${PN}-skia-${SKIA_VERSION}-${ARCH}.zip" )
 }
 
 src_prepare() {

diff --git a/dev-games/aseprite/aseprite-1.2.29.ebuild b/dev-games/aseprite/aseprite-1.2.29.ebuild
index 54db779..71183c6 100644
--- a/dev-games/aseprite/aseprite-1.2.29.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.29.ebuild
@@ -16,9 +16,14 @@ PATCHES=(
 )
 
 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"
+SKIA_URI="
+	amd64? (
+		${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x64.zip -> ${PN}-skia-${SKIA_VERSION}-amd64.zip
+	)
+	x86? (
+		${SKIA_BASE_URL}/${SKIA_VERSION}/Skia-Linux-Release-x86.zip -> ${PN}-skia-${SKIA_VERSION}-x86.zip
+	)"
 
 ASEPRITE_FILE="${PN^}-v${PV//_/-}-Source.zip"
 ASEPRITE_URI="https://github.com/${PN}/${PN}/releases/download/v${PV//_/-}/${ASEPRITE_FILE}"
@@ -57,7 +62,7 @@ src_unpack() {
 	mkdir -p "${P}/skia"
 	cd "${P}"
 	unpack "${ASEPRITE_FILE}"
-	( cd skia && unpack "${P}-skia-${SKIA_VERSION}.zip" )
+	( cd skia && unpack "${PN}-skia-${SKIA_VERSION}-${ARCH}.zip" )
 }
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/
@ 2021-09-23 19:17 Albert Diserholt
  0 siblings, 0 replies; 4+ messages in thread
From: Albert Diserholt @ 2021-09-23 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     eb7d0ae94767a3ab564f936d833a77d02ddfc678
Author:     Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Thu Sep 23 19:16:33 2021 +0000
Commit:     Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Thu Sep 23 19:16:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=eb7d0ae9

Add desktop icon for aseprite

Patch supplied by vaartis.

Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>

 dev-games/aseprite/Manifest               |  2 +-
 dev-games/aseprite/aseprite-1.2.29.ebuild | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 4fc7aa0..4962eeb 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -13,4 +13,4 @@ DIST aseprite-skia-m81-b607b32047-x86.zip 33398654 BLAKE2B b312f09d54e81b1b77c81
 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.28.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72
-EBUILD aseprite-1.2.29.ebuild 2189 BLAKE2B c01a0b8b93e6840a60066bfbab19ce275bfd67c0ed5957876d33b3d9afe491b2fb7192bb5b8a57deac7b5df5f933027128d877949e0c9f01c23f17292ae78f67 SHA512 ae8f1833c4041c6aa6bb7b34e15788095d0ec1bb63f8e7aed5cce8219cee1966bd48d794d4cf497b9f6d6877a132676d2d57c3bf31152d5b28b7081dfd20be72
+EBUILD aseprite-1.2.29.ebuild 2673 BLAKE2B 7442d8d8ea89284efeac197ce89c18cf1b2f29daf4cbf21491e458d91d29ae82fcae215780c032f740469f18f036f1dfdf789986e5a2b495a67c5e9d887b90d4 SHA512 89c71e0560227a79957c47996fdbfb8308baa67230c7b365e9faaf7fa65dffe3963c5bc7ab48fec7e20c61c92920740c60b8da41d157adaa6dc49ac64b891c41

diff --git a/dev-games/aseprite/aseprite-1.2.29.ebuild b/dev-games/aseprite/aseprite-1.2.29.ebuild
index 71183c6..45f0adb 100644
--- a/dev-games/aseprite/aseprite-1.2.29.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.29.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=7
-inherit cmake-utils toolchain-funcs
+inherit cmake-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
 HOMEPAGE="http://www.aseprite.org"
@@ -34,7 +34,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="
 	debug
 	memleak
-	webp"
+	webp
+	kde
+"
 
 RDEPEND="
 	app-arch/libarchive
@@ -51,7 +53,10 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:=
 	x11-libs/libX11
-	x11-libs/pixman"
+	x11-libs/pixman
+	kde? (
+		 kde-apps/thumbnailers
+	)"
 
 DOCS=( EULA.txt
 	docs/ase-file-specs.md
@@ -67,6 +72,9 @@ src_unpack() {
 
 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() {
@@ -87,6 +95,8 @@ src_configure() {
 		-DUSE_SHARED_FREETYPE=ON
 		-DUSE_SHARED_HARFBUZZ=ON
 		-DUSE_SHARED_WEBP=ON
+		-DWITH_DESKTOP_INTEGRATION=ON
+		-DWITH_QT_THUMBNAILER="$(usex kde)"
 		-DWITH_WEBP_SUPPORT="$(usex webp)"
 		-DENABLE_MEMLEAK="$(usex memleak)"
 		-DSKIA_DIR="${S}/skia"
@@ -97,4 +107,12 @@ 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
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/
@ 2021-11-24 17:38 Albert Diserholt
  0 siblings, 0 replies; 4+ messages in thread
From: Albert Diserholt @ 2021-11-24 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     c3df8ef619ee1a63edab441cecd3f98446cd0f64
Author:     Albert Diserholt <albert <AT> diserholt <DOT> com>
AuthorDate: Wed Nov 24 17:37:15 2021 +0000
Commit:     Albert Diserholt <albert <AT> diserholt <DOT> com>
CommitDate: Wed Nov 24 17:37:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/user/Drauthius.git/commit/?id=c3df8ef6

Add missing dependency in dev-games/aseprite-1.2.30

Also made it respect the system's CCache setting.

Signed-off-by: Albert Diserholt <albert <AT> diserholt.com>

 dev-games/aseprite/Manifest               | 2 +-
 dev-games/aseprite/aseprite-1.2.30.ebuild | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index c240bf4..16d0981 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -13,4 +13,4 @@ DIST aseprite-skia-m81-b607b32047-x86.zip 33398654 BLAKE2B b312f09d54e81b1b77c81
 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.29.ebuild 2673 BLAKE2B 7442d8d8ea89284efeac197ce89c18cf1b2f29daf4cbf21491e458d91d29ae82fcae215780c032f740469f18f036f1dfdf789986e5a2b495a67c5e9d887b90d4 SHA512 89c71e0560227a79957c47996fdbfb8308baa67230c7b365e9faaf7fa65dffe3963c5bc7ab48fec7e20c61c92920740c60b8da41d157adaa6dc49ac64b891c41
-EBUILD aseprite-1.2.30.ebuild 2673 BLAKE2B 7442d8d8ea89284efeac197ce89c18cf1b2f29daf4cbf21491e458d91d29ae82fcae215780c032f740469f18f036f1dfdf789986e5a2b495a67c5e9d887b90d4 SHA512 89c71e0560227a79957c47996fdbfb8308baa67230c7b365e9faaf7fa65dffe3963c5bc7ab48fec7e20c61c92920740c60b8da41d157adaa6dc49ac64b891c41
+EBUILD aseprite-1.2.30.ebuild 2769 BLAKE2B e930dc6f025e428a194d3543fabedc963177cb625dd8354a38f70f5b6d8b8d4c3212a1e3b31771415fa2a3d26953e55db51770fd6f1291aa18b04162dfdb17e5 SHA512 9ee2454b560b5479bc4a55477d50bea3dd6c86175e5a6b816cc95527709b44a4a0e1afdd27d95c5a130e05816afa44b3005445669c7cd9bf1dc7aee391a03c4b

diff --git a/dev-games/aseprite/aseprite-1.2.30.ebuild b/dev-games/aseprite/aseprite-1.2.30.ebuild
index 45f0adb..d3fad3e 100644
--- a/dev-games/aseprite/aseprite-1.2.30.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.30.ebuild
@@ -53,6 +53,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:=
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/pixman
 	kde? (
 		 kde-apps/thumbnailers
@@ -82,6 +83,7 @@ src_configure() {
 
 	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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-11-24 17:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-23 19:17 [gentoo-commits] repo/user/Drauthius:master commit in: dev-games/aseprite/ Albert Diserholt
  -- strict thread matches above, loose matches on Subject: below --
2021-11-24 17:38 Albert Diserholt
2021-09-12 14:11 Albert Diserholt
2018-01-21 12:34 Albert Diserholt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox