[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/files/, media-libs/libjpeg-turbo/

[Sam James]

commit:     5461f1137c410777343daf6c6f688ab8d5422116
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 19:25:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 19:25:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5461f113

media-libs/libjpeg-turbo: add patch for arm64 writable sections

Bug: https://bugs.gentoo.org/814206
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libjpeg-turbo-2.1.1-arm64-relro.patch      | 20 ++++++++++++++++++++
 ...2.1.1-r1.ebuild => libjpeg-turbo-2.1.1-r2.ebuild} |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
new file mode 100644
index 00000000000..7784ae513d1
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
@@ -0,0 +1,20 @@
+https://github.com/libjpeg-turbo/libjpeg-turbo/commit/129f0cb76346ceede8f4d8d87dea8acb0809056c
+
+From: DRC <information@×××××××××××××.org>
+Date: Wed, 25 Aug 2021 12:07:58 -0500
+Subject: [PATCH] Neon/AArch64: Don't put GAS functions in .rodata
+
+Regression introduced by 240ba417aa4b3174850d05ea0d22dbe5f80553c1
+
+Closes #546
+--- a/simd/arm/aarch64/jsimd_neon.S
++++ b/simd/arm/aarch64/jsimd_neon.S
+@@ -182,6 +182,8 @@ Ljsimd_huff_encode_one_block_neon_consts:
+     .byte    4,   5,   6,   7, 255, 255, 255, 255, \
+            255, 255, 255, 255, 255, 255, 255, 255  /* L7 : 1 line OK */
+ 
++.text
++
+ 
+ /*****************************************************************************/
+ 

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
similarity index 97%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r1.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
index 9fa04496082..f8495413e2e 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
@@ -41,6 +41,11 @@ RDEPEND="${COMMON_DEPEND}
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 
+PATCHES=(
+	# Upstream patch
+	"${FILESDIR}"/${P}-arm64-relro.patch
+)
+
 src_prepare() {
 	local FILE
 	ln -snf ../debian/extra/*.c . || die