[PR PATCH] chafa: update to 1.14.2

[PR PATCH] chafa: update to 1.14.2

[tranzystorekk]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is a new pull request by tranzystorekk against master on the void-packages repository

https://github.com/tranzystorekk/void-packages chafa
https://github.com/void-linux/void-packages/pull/51467

chafa: update to 1.14.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/51467.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chafa-51467.patch --]
[-- Type: text/x-diff, Size: 4107 bytes --]

From 5d000e579509dfe2a2d6b0e6db2880f9e07a9dd9 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Fri, 26 Jul 2024 14:29:14 +0200
Subject: [PATCH] chafa: update to 1.14.2

---
 srcpkgs/chafa/patches/i686-intrinsics.patch | 62 ---------------------
 srcpkgs/chafa/template                      |  4 +-
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/chafa/patches/i686-intrinsics.patch

diff --git a/srcpkgs/chafa/patches/i686-intrinsics.patch b/srcpkgs/chafa/patches/i686-intrinsics.patch
deleted file mode 100644
index e28e0bf86dff22..00000000000000
--- a/srcpkgs/chafa/patches/i686-intrinsics.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From af21bcd1ea595debd71a77e1e75ed185a31bf26c Mon Sep 17 00:00:00 2001
-From: Hans Petter Jansson <hpj@hpjansson.org>
-Date: Wed, 19 Jun 2024 23:26:23 +0200
-Subject: [PATCH] avx2: Fix compilation on 32-bit x86
-
-Fixes #203 (GitHub).
----
- chafa/internal/chafa-avx2.c | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/chafa/internal/chafa-avx2.c b/chafa/internal/chafa-avx2.c
-index ae20830..7f11687 100644
---- a/chafa/internal/chafa-avx2.c
-+++ b/chafa/internal/chafa-avx2.c
-@@ -21,9 +21,21 @@
- 
- #include <emmintrin.h>
- #include <immintrin.h>
-+#include <smmintrin.h>
- #include "chafa.h"
- #include "internal/chafa-private.h"
- 
-+/* _mm_extract_epi64() (pextrq) is not available in 32-bit mode. Work around
-+ * it. This needs to be a macro, as the compiler expects an integer constant
-+ * for n. */
-+#if defined __x86_64__ && !defined __ILP32__
-+# define extract_128_epi64(i, n) _mm_extract_epi64 ((i), (n))
-+#else
-+# define extract_128_epi64(i, n) \
-+    ((((guint64) _mm_extract_epi32 ((i), (n) * 2 + 1)) << 32) \
-+     | _mm_extract_epi32 ((i), (n) * 2))
-+#endif
-+
- gint
- calc_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair,
-                  const guint32 *sym_mask_u32)
-@@ -96,14 +108,14 @@ calc_colors_avx2 (const ChafaPixel *pixels, ChafaColorAccum *accums_out,
-     accum_bg_128 = _mm_add_epi16 (_mm256_extracti128_si256 (accum_bg, 0),
-                                   _mm256_extracti128_si256 (accum_bg, 1));
-     ((guint64 *) accums_out) [0] =
--        (guint64) _mm_extract_epi64 (accum_bg_128, 0)
--        + (guint64) _mm_extract_epi64 (accum_bg_128, 1);
-+        extract_128_epi64 (accum_bg_128, 0)
-+        + extract_128_epi64 (accum_bg_128, 1);
- 
-     accum_fg_128 = _mm_add_epi16 (_mm256_extracti128_si256 (accum_fg, 0),
-                                   _mm256_extracti128_si256 (accum_fg, 1));
-     ((guint64 *) accums_out) [1] =
--        (guint64) _mm_extract_epi64 (accum_fg_128, 0)
--        + (guint64) _mm_extract_epi64 (accum_fg_128, 1);
-+        extract_128_epi64 (accum_fg_128, 0)
-+        + extract_128_epi64 (accum_fg_128, 1);
- }
- 
- /* 32768 divided by index. Divide by zero is defined as zero. */
-@@ -143,5 +155,5 @@ chafa_color_accum_div_scalar_avx2 (ChafaColorAccum *accum, guint16 divisor)
-     accum_128 = _mm_loadl_epi64 ((const __m128i *) accum);
-     divisor_128 = _mm_set1_epi16 (invdiv16 [divisor]);
-     accum_128 = _mm_mulhrs_epi16 (accum_128, divisor_128);
--    *((guint64 *) accum) = _mm_extract_epi64 (accum_128, 0);
-+    *((guint64 *) accum) = extract_128_epi64 (accum_128, 0);
- }
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index a1e0e87f1faa90..ddf72dacc93a42 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,6 +1,6 @@
 # Template file for 'chafa'
 pkgname=chafa
-version=1.14.1
+version=1.14.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-man"
@@ -12,7 +12,7 @@ license="LGPL-3.0-or-later"
 homepage="https://hpjansson.org/chafa/"
 changelog="https://raw.githubusercontent.com/hpjansson/chafa/master/NEWS"
 distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=24707f59e544cec85d7a1993854672136b05271f86954248c5d8a42e221f6f25
+checksum=8a28d308074e25597e21bf280747461ac695ae715f2f327eb0e0f0435967f8b3
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) ;;

Re: [PR PATCH] [Merged]: chafa: update to 1.14.2

[tranzystorekk]

[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]

There's a merged pull request on the void-packages repository

chafa: update to 1.14.2
https://github.com/void-linux/void-packages/pull/51467

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

cc @maxice8

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: chafa: update to 1.14.2

[maxice8]

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by maxice8 on void-packages repository

https://github.com/void-linux/void-packages/pull/51467#issuecomment-2253524897

Comment:
LGTM 👍