From 51b4abe93138651b280def0cf8452d737934af2b Mon Sep 17 00:00:00 2001 From: Albert Diserholt Date: Sun, 12 Sep 2021 16:10:20 +0200 Subject: Fix download of pre-built Skia library for aseprite Signed-off-by: Albert Diserholt --- 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() { -- cgit v1.2.3-65-gdbad