media-libs/blend2d: drop 0.11.4-r2 add 0.21.2

Also add subslot dependency on dev-libs/asmjit and update 9999.

Closes: https://bugs.gentoo.org/970929
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
This commit is contained in:
Alexander Golubev
2026-03-06 19:21:37 +03:00
parent 431b44c741
commit 8e42952068
5 changed files with 27 additions and 15 deletions

View File

@@ -1,2 +1,2 @@
DIST blend2d-0.11.4.tar.gz 2047624 BLAKE2B d2d9985e365a465d36e8a500a7fdf55e392370aec92af5d0059bcddd16ef590122fdfeff74c3ee4cacc06ca63e2434e56bbc477e25989d842c7512143d771323 SHA512 23d22e7aeccea66345cf9d2f3a6c96a16f899aaec611a8bdaa29a1f03ea40d02d2627d6b12661f0a9bc49405258e90bf23cf008310bf1f25309fb27a05d5f533
DIST blend2d-0.12.0.tar.gz 2113309 BLAKE2B 174def212ac2c01405a3e6340fe0d42cb0a1a40b6b6c9bf26a93ec517e3b3b29a047a3a1d018c2af87a6a7f164974c52cf232f893ed2956a5d58d4b8a2126d9b SHA512 16d4338b012d6c9e066359d587fca6a1432b742fad948f22776df09598678e06b3b668964376c0297af2d7b7475d34313351c6e72071b5034454518d773ec7b1
DIST blend2d-0.21.2.tar.gz 2707380 BLAKE2B 284c819c87abcba340d2ff9b3f9ca3103270ccddeeb081b18f1381d33d7ae114d43cecd1f4b8fc99ffae9750b973b6d4b45f9be344122218fb6f5e093b1ebf32 SHA512 783204fd59f14f0348d6c67965b9a0ca589f12d7f3e293712578995790d20a121e1dfea5982ee36393cc1f83e64c1872ed989dda7d83fb762cecc1273a78e74a

View File

@@ -22,8 +22,8 @@ RESTRICT="!test? ( test )"
RDEPEND="
jit? (
>=dev-libs/asmjit-2024.10.25
<dev-libs/asmjit-2025.06.15
>=dev-libs/asmjit-2024.10.25:=
<dev-libs/asmjit-2025.06.15:=
)
"
DEPEND="${RDEPEND}"

View File

@@ -20,22 +20,14 @@ SLOT="0/$(ver_cut 1-2)"
IUSE="+jit test"
RESTRICT="!test? ( test )"
RDEPEND="
jit? (
>=dev-libs/asmjit-2024.10.25
<dev-libs/asmjit-2025.06.15
)
"
RDEPEND="jit? ( >=dev-libs/asmjit-2025.10.12:= )"
DEPEND="${RDEPEND}"
DOCS=( README.md CONTRIBUTING.md )
PATCHES=(
"${FILESDIR}/blend2d-0.11.4-avoid-adding-O2-to-cflags-gentoo-bug-943226.patch"
"${FILESDIR}/${PN}-0.21.2-avoid-adding-O2-to-cflags-gentoo-bug-943226.patch"
)
# see https://github.com/blend2d/blend2d/issues/217
CMAKE_SKIP_TESTS="bl_test_image_io"
src_configure() {
local mycmakeargs=(
-DBLEND2D_NO_JIT=$(usex !jit)

View File

@@ -20,12 +20,12 @@ SLOT="0/$(ver_cut 1-2)"
IUSE="+jit test"
RESTRICT="!test? ( test )"
RDEPEND="jit? ( >=dev-libs/asmjit-2025.06.15 )"
RDEPEND="jit? ( >=dev-libs/asmjit-2025.10.12:= )"
DEPEND="${RDEPEND}"
DOCS=( README.md CONTRIBUTING.md )
PATCHES=(
"${FILESDIR}/blend2d-0.11.4-avoid-adding-O2-to-cflags-gentoo-bug-943226.patch"
"${FILESDIR}/${PN}-0.21.2-avoid-adding-O2-to-cflags-gentoo-bug-943226.patch"
)
src_configure() {

View File

@@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 638acd5..0c225b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -635,7 +635,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" OR "x${CMAKE_CXX_COMPILER_FRONT
list(APPEND BLEND2D_PRIVATE_CFLAGS_DBG -GS) # [+] Buffer security-check.
list(APPEND BLEND2D_PRIVATE_CFLAGS_REL -GS-) # [-] Buffer security-check.
- list(APPEND BLEND2D_PRIVATE_CFLAGS_REL -O2) # [+] Favor speed over size.
list(APPEND BLEND2D_PRIVATE_CFLAGS_REL -Oi) # [+] Generate Intrinsic Functions.
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -655,7 +654,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang")
list(APPEND BLEND2D_PRIVATE_CFLAGS -fno-math-errno) # [-] Disable math functions setting errno (performance reasons).
list(APPEND BLEND2D_PRIVATE_CFLAGS -fno-threadsafe-statics) # [-] Don't add guards when initializing statics (we don't need it).
list(APPEND BLEND2D_PRIVATE_CFLAGS -fno-exceptions -fno-rtti) # [-] Disable exceptions and RTTI (we never throw, we don't need RTTI).
- list(APPEND BLEND2D_PRIVATE_CFLAGS_REL -O2) # [+] Compiling with -O2 in release mode is what we generally want.
list(APPEND BLEND2D_PRIVATE_CFLAGS_REL -fmerge-all-constants) # [+] We don't need unique address per constant (merging improves library size).
# -fno-semantic-interposition is not available on apple - the compiler issues a warning, which is not detected.