summaryrefslogtreecommitdiff
path: root/dev-games/aseprite
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-12 00:33:29 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-12 00:33:29 +0100
commit3a6d209caa07e3be8e8423251b70c8bbeeedb17f (patch)
treeaa94c255fa1bd982214ca518fb93d674cc253101 /dev-games/aseprite
parent1f43daba2fbe6f53e67c63944941dc645657c5b3 (diff)
gentoo auto-resync : 12:04:2024 - 00:33:28
Diffstat (limited to 'dev-games/aseprite')
-rw-r--r--dev-games/aseprite/Manifest4
-rw-r--r--dev-games/aseprite/aseprite-1.2.40.ebuild15
-rw-r--r--dev-games/aseprite/aseprite-1.3.2.ebuild15
3 files changed, 30 insertions, 4 deletions
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 96f59324cfe2..c880aca9ff47 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -13,6 +13,6 @@ AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e3119
DIST Aseprite-v1.2.40-Source.zip 61802371 BLAKE2B f6f586a3ca222de208e6639e3fc94a63f98e487e1975dccd2974ffa71f937384177639e3799fb81f064afaf1c4a048394fab32a30bcda353320ac55c38b17636 SHA512 0a548428a3362f49cb6cecaa061de8371ad3f0bc22d00bc957e21f22316772e854d7ad36ebb7e5b69274eea376bb62fa39abfd4bc02250524c3707f81a628b1f
DIST Aseprite-v1.3.2-Source.zip 64151421 BLAKE2B 9e23bf62b7d8c6377e36149ce830151d35b48e125a5a99aeb44b0fb1f2f653e53df9b8d74b7127598607561cf6dde4b59f00dd6c6abd08581eddab71feda415d SHA512 cbe1acd1f851f049ceaa948eb59ec1cb1e67c99e9204750f1e38cbedb8122fe0ce63230b63ab537e59d87c88d5ebae03b0785d0eb5195c8ef9a206c8ac71b977
DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
-EBUILD aseprite-1.2.40.ebuild 5326 BLAKE2B 5f180f9d1c59a12eec86accfb1aab43379a0a1ebf1a83034b22d659a10514053a2be4830cc3d1608c0da88bdca866270f5be2d306f9c7f11779079d5fa87ad04 SHA512 0386c00ab618442d0e97e235329eb38a35dd12af57ca9ed02b633f7a0f5d7ae62ff835dbbfa4f8cbc9425245e62165740a3d1fd6ff9f6c8cf1153763899585e2
-EBUILD aseprite-1.3.2.ebuild 5250 BLAKE2B 8d12d25807fc7a916f7e04db30201935be02e7f4561bfc23e1e5dfa10de6831d53d3f4d01b4486f53710e8fdfd027f332ffecb14d846adf904777fdad9b64d43 SHA512 c9889ed1130d949fc4a69872d3c0789d630a0f6800d5adb138d40f92f0bef91a60fd599f3dc8fdb66c13901aba2e9b35da5e0c56b9cc40c935bb4aebc2387ef3
+EBUILD aseprite-1.2.40.ebuild 5852 BLAKE2B 304c13646d338ac0a049ae753a731fd740d2e55efa9177cdb01063338420b6f6aa8508c644696fa31e14a8abf8fe79367545068e33eca1c39c16b9769b07441f SHA512 16152159dad23c1965a4604c0512b36fc6699efd45ba7aa1548175477a52346d366c05b67ef99707f48857ca39d662cb4dc6156d3c93727ff178e8aab7f374f1
+EBUILD aseprite-1.3.2.ebuild 5776 BLAKE2B d92d4c6bf19330b42516418df491972c52358bcc2795a097d92fa90214e14555b2284ddc93c8fec1b174d9f985a87bae1b997cb3123d7376c97428b07f95bf32 SHA512 d54816caa8120b201a5220fc27fbe4be5ff7750be647c9cff2e374f4255a58c3cfb07b5c4d4304eed51c0231894af1da905312231cd4fc81f8105af32d09e55a
MISC metadata.xml 489 BLAKE2B a7c8e63d627aed0bbdcab626fd6b15941b1597b56abe3de87d172a919008122cfa9ee29dc10256c5722e6cea243d836a8d3bb9918f1d1d1963bc299d04fab285 SHA512 beb3ca2b414414980370e02138e0ec8bc931d4807fabb403e21a244365c4af65a5830dc6465d2a3798d56eec360930444a71a549d4d6d4a03f292bf3946bab79
diff --git a/dev-games/aseprite/aseprite-1.2.40.ebuild b/dev-games/aseprite/aseprite-1.2.40.ebuild
index db187de2e8df..2a603fddfb1f 100644
--- a/dev-games/aseprite/aseprite-1.2.40.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.40.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake desktop ninja-utils python-any-r1 toolchain-funcs xdg-utils
+inherit cmake desktop flag-o-matic ninja-utils python-any-r1 toolchain-funcs xdg-utils
SKIA_VER="m102"
# Last commit in ${SKIA_VER} feature branch
@@ -96,6 +96,19 @@ src_prepare() {
}
src_configure() {
+ # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/924692
+ # https://github.com/aseprite/aseprite/issues/4413
+ #
+ # There is a bundled skia that fails with ODR errors. When excluding just
+ # skia from testing, aseprite itself fails with strict-aliasing, and when
+ # that is disabled, fails again with ODR and lto-type-mismatch issues.
+ #
+ # There are a lot of issues, so don't trust any fixes without thorough
+ # testing.
+ append-flags -fno-strict-aliasing
+ filter-lto
+
einfo "Skia configuration"
cd "${WORKDIR}/skia-${SKIA_REV}" || die
diff --git a/dev-games/aseprite/aseprite-1.3.2.ebuild b/dev-games/aseprite/aseprite-1.3.2.ebuild
index a5dfeae7a147..7630df8d90a4 100644
--- a/dev-games/aseprite/aseprite-1.3.2.ebuild
+++ b/dev-games/aseprite/aseprite-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake desktop python-any-r1 toolchain-funcs xdg-utils
+inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg-utils
SKIA_VER="m102"
# Last commit in ${SKIA_VER} feature branch
@@ -96,6 +96,19 @@ src_prepare() {
}
src_configure() {
+ # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/924692
+ # https://github.com/aseprite/aseprite/issues/4413
+ #
+ # There is a bundled skia that fails with ODR errors. When excluding just
+ # skia from testing, aseprite itself fails with strict-aliasing, and when
+ # that is disabled, fails again with ODR and lto-type-mismatch issues.
+ #
+ # There are a lot of issues, so don't trust any fixes without thorough
+ # testing.
+ append-flags -fno-strict-aliasing
+ filter-lto
+
einfo "Skia configuration"
cd "${WORKDIR}/skia-${SKIA_REV}" || die