Thanks, applied as a8c26d07088870ccac9bd58fd30949fc292c6a67. Michael
[sent from post-receive hook] On Sat, 09 Nov 2024 08:07:47 +0100, Christian Melki <[email protected]> wrote: > Minor changes. > https://lists.freedesktop.org/archives/pixman/2024-November/005023.html > > * Some options were removed. Clean up here too. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > [mol: remove applied upstream patch] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/pixman-0.43.4/0001-pixman-Adjust-arm-assembly-for-binutils-change.patch > > b/patches/pixman-0.43.4/0001-pixman-Adjust-arm-assembly-for-binutils-change.patch > deleted file mode 100644 > index e80651324bee..000000000000 > --- > a/patches/pixman-0.43.4/0001-pixman-Adjust-arm-assembly-for-binutils-change.patch > +++ /dev/null > @@ -1,100 +0,0 @@ > -From: Mike Hommey <[email protected]> > -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 34d38f1f05c1..3dfe723a0b70 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 > diff --git a/patches/pixman-0.43.4/series b/patches/pixman-0.43.4/series > deleted file mode 100644 > index 59373fde526f..000000000000 > --- a/patches/pixman-0.43.4/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-pixman-Adjust-arm-assembly-for-binutils-change.patch > -# 7d3a7766153efd4589a851d54eb0d676 - git-ptx-patches magic > diff --git a/rules/pixman.make b/rules/pixman.make > index 5ebbcb059ed8..4c087ba2b4d6 100644 > --- a/rules/pixman.make > +++ b/rules/pixman.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman > # > # Paths and names > # > -PIXMAN_VERSION := 0.43.4 > -PIXMAN_MD5 := ca6767b8056637d690cd17970daf4b18 > +PIXMAN_VERSION := 0.44.0 > +PIXMAN_MD5 := cf9628e53e9e5e992997c19908d6031e > PIXMAN := pixman-$(PIXMAN_VERSION) > PIXMAN_SUFFIX := tar.xz > PIXMAN_URL := $(call ptx/mirror, XORG, > individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)) > @@ -40,8 +40,6 @@ PIXMAN_CONF_OPT := \ > -Dgnu-inline-asm=disabled \ > -Dgnuplot=false \ > -Dgtk=disabled \ > - -Diwmmxt=disabled \ > - -Diwmmxt2=false \ > -Dlibpng=disabled \ > -Dloongson-mmi=disabled \ > -Dmips-dspr2=disabled \
