gentoo auto-resync : 30:10:2024 - 03:04:35

3 files changed, 112 insertions, 1 deletions

diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 08bd07b9e903..10d085dc5b07 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,5 @@
+AUX 0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch 3124 BLAKE2B fafcaf9646e07d74acad752af4dd1ece5abeadfb502a2d5b93600a6fa75e33c89d0d614dcfb17e20814bceff6f5339b7cb989cbce51a23dbfaf68a208fcaaed7 SHA512 2cae551cf90fe4fbc36b1ab3f7f682e2e7c18c593b9f2edf390e666ce03c8d32a298d280366bf1fd6da59f8350f85b907e253352989144fef8ff14a8cfa984aa
 DIST pixman-0.43.4.tar.xz 636900 BLAKE2B c31e5700bfadcd72f522af50509a4a6cd7bbf90c918c75b108e50246f1c76e858125138902a222040ada192710ec788deb43eb65085416f3eff88e3ed970933e SHA512 b40fb05bd58dc78f4e4e9b19c86991ab0611b708657c9a7fb42bfe82d57820a0fde01a34b00a0848a41da6c3fb90c2213942a70f435a0e9467631695d3bc7e36
-EBUILD pixman-0.43.4.ebuild 2151 BLAKE2B d95e0432b19f9e656afdb5d9c3fd79200b37c427f9a0cc2d436c84c0127301368dceae2bc184d6765623200b4385c5324795b696d3e81bcedde33219e3a459f6 SHA512 d43fa723c8d02916109332ce97352a5e517317504b211c39ad7a684cb1ff593c14f108742300718848ca1bdaa394269fa5024f7050521e363710c2cf07bf92e5
+EBUILD pixman-0.43.4.ebuild 2238 BLAKE2B 2f594f023a924cd5b4e1089c45ddeeb6b41a7fb926753684c7aac21e1875f1943359f82397520700a893341d5a5d4956c5fb0a94b262a66f47c27d22ca89d143 SHA512 73d380de9fb36d1eef2fd040cdac5edcbe1cc056bf73d57426437932fbdd21667c25a9cff56d559be48ce9d81dec34bdd1716e7a81c2086352b6cb4309c93bf7
 EBUILD pixman-9999.ebuild 2159 BLAKE2B 82a13aa95a9ffe70b9f9525efc831c16aa8235aaf3a83039a8c31be7ac0c7b2fb9374440c6755f3be57195fab1e7525b1b2079508c80055fc570679616501df7 SHA512 6aeadc2ceecedfb7ffe55a43f94e84ad80b9477c9bd6662e5db31d6032bfc03bd7ccee9f2fe9b3b4d27a8c62b535d40197ddaffe345d19bf029e125400a7aa5e
 MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch b/x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch
new file mode 100644
index 000000000000..c59ed7b3e81c
--- /dev/null
+++ b/x11-libs/pixman/files/0.43.4-pixman-Adjust-arm-assembly-for-binutils-change.patch
@@ -0,0 +1,106 @@
+https://bugs.gentoo.org/942441
+
+From 865e6ce00bb79a6b925ed4c2c436e1533e4472aa Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Fri, 12 Jul 2024 11:11:17 -0400
+Subject: [PATCH] pixman: Adjust arm assembly for binutils change
+
+A change in the latest version of binutils broke building pixman for arm.
+
+The binutils change:
+https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
+
+Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/96
+---
+ pixman/pixman-arm-simd-asm.S | 44 ++++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S
+index 34d38f1..3dfe723 100644
+--- a/pixman/pixman-arm-simd-asm.S
++++ b/pixman/pixman-arm-simd-asm.S
+@@ -820,13 +820,13 @@ generate_composite_function \
+ .macro over_white_8888_8888_ca_1pixel_tail
+         mvn     TMP0, WK1
+         teq     WK1, WK1, asr #32
+-        bne     01f
+-        bcc     03f
++        bne     1f
++        bcc     3f
+         mov     WK3, WK1
+-        b       02f
+-01:     over_white_8888_8888_ca_combine WK1, WK3
+-02:     pixst   , 4, 3, DST
+-03:
++        b       2f
++1:      over_white_8888_8888_ca_combine WK1, WK3
++2:      pixst   , 4, 3, DST
++3:
+ .endm
+ 
+ .macro over_white_8888_8888_ca_2pixels_head
+@@ -837,21 +837,21 @@ generate_composite_function \
+         pixld   , 8, 3, DST
+         mvn     TMP0, WK1
+         teq     WK1, WK1, asr #32
+-        bne     01f
++        bne     1f
+         movcs   WK3, WK1
+-        bcs     02f
++        bcs     2f
+         teq     WK2, #0
+-        beq     05f
+-        b       02f
+-01:     over_white_8888_8888_ca_combine WK1, WK3
+-02:     mvn     TMP0, WK2
++        beq     5f
++        b       2f
++1:      over_white_8888_8888_ca_combine WK1, WK3
++2:      mvn     TMP0, WK2
+         teq     WK2, WK2, asr #32
+-        bne     03f
++        bne     3f
+         movcs   WK4, WK2
+-        b       04f
+-03:     over_white_8888_8888_ca_combine WK2, WK4
+-04:     pixst   , 8, 3, DST
+-05:
++        b       4f
++3:      over_white_8888_8888_ca_combine WK2, WK4
++4:      pixst   , 8, 3, DST
++5:
+ .endm
+ 
+ .macro over_white_8888_8888_ca_process_head  cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload
+@@ -1067,9 +1067,9 @@ generate_composite_function \
+   .if \offset != 0
+         ldrb    ORIG_W, [SRC, #\offset]
+   .endif
+-        beq     01f
++        beq     1f
+         teq     STRIDE_M, #0xFF
+-        beq     02f
++        beq     2f
+  .endif
+         uxtb16  SCRATCH, \d                 /* rb_dest */
+         uxtb16  \d, \d, ror #8               /* ag_dest */
+@@ -1079,13 +1079,13 @@ generate_composite_function \
+         uxtab16 \d, \d, \d, ror #8
+         mov     SCRATCH, SCRATCH, ror #8
+         sel     \d, SCRATCH, \d
+-        b       02f
++        b       2f
+  .if \offset == 0
+ 48:     /* Last mov d,#0 of the set - used as part of shortcut for
+          * source values all 0 */
+  .endif
+-01:     mov     \d, #0
+-02:
++1:      mov     \d, #0
++2:
+ .endm
+ 
+ .macro in_reverse_8888_8888_tail  numbytes, reg1, reg2, reg3, reg4
+-- 
+2.45.2
+
diff --git a/x11-libs/pixman/pixman-0.43.4.ebuild b/x11-libs/pixman/pixman-0.43.4.ebuild
index c4dd78757423..f81d1c4ed4d0 100644
--- a/x11-libs/pixman/pixman-0.43.4.ebuild
+++ b/x11-libs/pixman/pixman-0.43.4.ebuild
@@ -23,6 +23,10 @@ SLOT="0"
 IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-pixman-Adjust-arm-assembly-for-binutils-change.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
 }