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

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

[Sebastian Pipping]

commit:     5416bbf3b610ccfcd9ee84fb0ef831744f49762c
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 19:08:29 2018 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 17 19:26:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5416bbf3

media-libs/babl: 0.1.48 + sse3 + sync 9999

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-libs/babl/Manifest                           |  1 +
 .../babl/{babl-9999.ebuild => babl-0.1.48.ebuild}  | 12 +++++++---
 media-libs/babl/babl-9999.ebuild                   |  9 ++++++--
 .../babl/files/babl-0.1.48-configure-cflags.patch  | 26 ++++++++++++++++++++++
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 4e87d2d4820..9fad6aafb59 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -10,3 +10,4 @@ DIST babl-0.1.40.tar.bz2 653272 BLAKE2B 4e5694db5a6d29c2faeada7046cacc511623bf54
 DIST babl-0.1.42.tar.bz2 653385 BLAKE2B 62b33ccafb8bff2e7bbe06ea38692e715defe545b3651988bb160e52283a7080f49ccabc2cf71c7f51160e9a5a12121e4a5953471535e91de08d6733993b84a7 SHA512 0c37944d273b3818a7bb316d3086d48966daa6b401b4e6c0cb9ff52c8d69a80d8b632fe236110f376ab107d349fa4383b20f22cac31889ba50e48ab25d5c42d6
 DIST babl-0.1.44.tar.bz2 653829 BLAKE2B 8014d66886645c67291ffbe218b95bf492512cb80fe4337ffdf714723cc4221850e71c97b8208d4242bb90855e8121047d2c683560d0eba2d0077620acb8395f SHA512 bb86d3676e12217c042464c74e22f9243d3a9c26bf4f78b0df991f40e341e02165e58284077c743489eda69274e3afd4d5b2c5312e28cc290eebaf4e8e86a9e9
 DIST babl-0.1.46.tar.bz2 653887 BLAKE2B dacfb2c4761a454012532dd74a31aa425a7aa989a98b9862c69c4f74fe6238a6b4d7af32358711f53c40094c3a0e4995c105a97282418eb30fc78b429c92a605 SHA512 a62d78d49565cfb5c3187353f31d7793156ae318e2a29b7430ca08272ea98b9101afb602d73c5cc87bc9f20a4469bc08bf8c6c197529260ae0e41d183f300648
+DIST babl-0.1.48.tar.bz2 659945 BLAKE2B 7daa742f27f39dee9ec1ff6955082585246ecd4532e83b664e28d219151d74cdea7856dc45ee26468c85fce5d2400399f02074b6ee7ee7fce65158e17d782607 SHA512 1fc9e2c60980b3e0531ba0418231e988ea5d96ebf5a22b96dc57536e17d45bfe8816408707179438df5c7e487b62421b968ffad491a97d54221f236198b53471

diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-0.1.48.ebuild
similarity index 86%
copy from media-libs/babl/babl-9999.ebuild
copy to media-libs/babl/babl-0.1.48.ebuild
index 8c2968e647f..fa9642d79c1 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-0.1.48.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=6
 
-inherit eutils
+inherit ltprune
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://git.gnome.org/babl"
 	SRC_URI=""
 else
+	inherit autotools
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
@@ -19,7 +20,7 @@ HOMEPAGE="http://www.gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -27,9 +28,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-cflags.patch
+)
+
 src_prepare() {
 	default
-	[[ ${PV} == *9999* ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
@@ -46,6 +51,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
 		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
 }
 

diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 8c2968e647f..f4b8834a2f5 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils
+inherit ltprune
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.48-configure-cflags.patch
+)
+
 src_prepare() {
 	default
 	[[ ${PV} == *9999* ]] && eautoreconf
@@ -46,6 +50,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
 		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
 }
 

diff --git a/media-libs/babl/files/babl-0.1.48-configure-cflags.patch b/media-libs/babl/files/babl-0.1.48-configure-cflags.patch
new file mode 100644
index 00000000000..089a82f0e00
--- /dev/null
+++ b/media-libs/babl/files/babl-0.1.48-configure-cflags.patch
@@ -0,0 +1,26 @@
+From 17d85b43750bc4cdfde71ab6b1d5f41acc89f2ed Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 17 May 2018 20:50:29 +0200
+Subject: [PATCH] configure.ac: No longer enforce -Ofast
+
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 924b0df..7933ead 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -161,9 +161,6 @@ CFLAGS="$CFLAGS $extra_warnings"
+ BABL_DETECT_CFLAGS(extra_warnings, '-Wold-style-definition')
+ CFLAGS="$CFLAGS $extra_warnings"
+ 
+-BABL_DETECT_CFLAGS(extra_warnings, '-Ofast' )
+-CFLAGS="$CFLAGS $extra_warnings"
+-
+ fi
+ 
+ AC_PATH_PROG(RSVG, rsvg-convert, no)
+-- 
+2.17.0
+

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

[Sam James]

commit:     c46124b30e8e1c5d9ce6a9f017c024116c34c5af
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Jul 13 19:36:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 02:45:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c46124b3

media-libs/babl: 0.1.92-r1. Fix universal_nonlinear_rgb_u8_converter_sse2

Thanks-to: Alexander Bezrukov <phmagic <AT> mail.ru>
Closes: https://bugs.gentoo.org/857708
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/26393
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/babl/babl-0.1.92-r1.ebuild              | 68 ++++++++++++++++++++++
 ...universal_nonlinear_rgb_u8_converter_sse2.patch | 17 ++++++
 2 files changed, 85 insertions(+)

diff --git a/media-libs/babl/babl-0.1.92-r1.ebuild b/media-libs/babl/babl-0.1.92-r1.ebuild
new file mode 100644
index 000000000000..b3532109b4db
--- /dev/null
+++ b/media-libs/babl/babl-0.1.92-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="https://gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}_universal_nonlinear_rgb_u8_converter_sse2.patch" # Bug 857708
+)
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+
+	sed -i -e 's/Description/description/' meson.build || die # bug 843266
+}
+
+src_configure() {
+	use vala && vala_setup
+
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		-Dwith-docs=false
+		$(meson_use introspection enable-gir)
+		$(meson_use lcms with-lcms)
+		$(meson_use vala enable-vapi)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}

diff --git a/media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch b/media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch
new file mode 100644
index 000000000000..79ff6ab7843a
--- /dev/null
+++ b/media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch
@@ -0,0 +1,17 @@
+Fix alignment of vector of floats in babl-rgb-converter.c
+Bug: https://bugs.gentoo.org/857708
+Signed-off-by: Alexander Bezrukov <phmagic@mail.ru>
+
+diff -ur a/babl/base/babl-rgb-converter.c b/babl/base/babl-rgb-converter.c
+--- a/babl/base/babl-rgb-converter.c
++++ b/babl/base/babl-rgb-converter.c
+@@ -306,7 +306,8 @@
+   uint8_t *rgb_in_u8 = (void*)src_char;
+   uint8_t *rgb_out_u8 = (void*)dst_char;
+ 
+-  float rgba_out[4*samples];
++  // The alignment is necessary for SIMD intrinsics in babl_matrix_mul_vectorff_buf4_sse2()
++  float __attribute__ ((aligned (16))) rgba_out[4*samples];
+ 
+   for (i = 0; i < samples; i++)
+   {