gentoo auto-resync : 14:07:2022 - 07:39:06

7 files changed, 101 insertions, 2 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f78312b6af99..c57c46130425 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ffce0861a9ed..1f0318327fc6 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,4 +1,6 @@
+AUX babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch 625 BLAKE2B 869ce1637b29f11e69465a2e0b5ed565ded8a0fccc96270f7df004c80545e74b5230c32cccb4e7f951ae8536c1f7ab15e10bdd1611e66ebf6a1cf945ca0f24bd SHA512 dabcbffbe8e1db101ed05f307fb1d49367b7630b619848cd927c414fe5fc1e28a5bb94c2d154942e9bd9a138611b4387ab42ff4a1ab2603e15e4674bf0360755
 DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0
+EBUILD babl-0.1.92-r1.ebuild 1927 BLAKE2B 1fa2ce4bd5ffac9412e1b319d6c328201de87b953aa1df8902b5f297365050fa84e1549af66ebfca5b7889656b828336b5cd8da355b0408e01bae70fae8f4e06 SHA512 ead7168764906bea081db8302d2c6403c0a2f7ea2cc0c2c50e1a1e88627b935f29d929f69379cc15c6fb0c33dc92e3e09e6ee990317ceaea9a2bdfd464260eeb
 EBUILD babl-0.1.92.ebuild 1829 BLAKE2B 6b63020df7b902a92183e79000d342c13821ad3e87f005159cae04071750abe2f82f7fa7fd09a0cec6f94a65d6481522f08703ed6d1049133de3fbd2984ac2a4 SHA512 cad47bf1d01849165c502789f232d46c23c0d9bebec5725881ec1bc7cf0f1086f5f7bca804e0833bc06ab7a177e8ae754fe75670e0e8b602ee16932125480606
 EBUILD babl-9999.ebuild 1760 BLAKE2B ab87ef3372006a2c9907edd13ad0e0f5bb896860188cc3e84a7e97e3c794dbe82c6245653e3d8cc1f48c086186dcefeb9cb9adc81e1c889a3c994b8f35cffeec SHA512 6967e4fd78adcc1799b601aae900d45df2c63717f5b920ee82909335c1842101712544429acbf36c5a4c2c1f54c0d2b1760037f8af3f7af53eaa3b860285314f
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
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++)
+   {
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 2d5a4268ad03..3cd8e386b423 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -3,6 +3,6 @@ DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac659
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
 EBUILD libmtp-1.1.19-r2.ebuild 1710 BLAKE2B 94dc2b986f7d2e8c33a40c5b82846508758dfacde64ab2411e3e58d3aac27b1495442fb1813c4c86d900bf012ea67c08c65f0dc8ea9642cf957b3dd9b79b2733 SHA512 230e50ebb1c614f78c04010a424d3bbef1dbc382685e144337312bf38f5a2de6a5b56c0ed8d2aa763cb1479b0a1cb2556252b6d970c9189072acdae750c84786
 EBUILD libmtp-1.1.19.ebuild 1671 BLAKE2B 10bfcb9527fb3590bf8ad6daad17804abe282dfdd8662024029663fddf3101664b7083d282a5e8ee4eb42bb6f3a2e2ca3d018f8a6d7257447500f1d123754d4d SHA512 13aa3c4a74af67858b0a57f5f754dbc1654a9d83e63a29aecf72e1f887106722ae126fd8a9adc434659e966d9dfb5f9d182c0640e921edf17230a2c464b77976
-EBUILD libmtp-1.1.20.ebuild 1719 BLAKE2B bf05733a42e02fc5109548e6af9bdbeb9f23d7a35df3031176e525aef7b831ef3792575496f6f1cca1f7bea5293f8f4fd14fd6563d5576f5f96a75bd18ff3c31 SHA512 a596419c6b4e7946cccbfa511c6f2817609ebb7c4d17ec11b6843205fd1abcf2fc618bbbfb5672f01ef0a67d8399deb98b67fa47012c52ddf908210b4a93247e
-EBUILD libmtp-9999.ebuild 1661 BLAKE2B a69293877e373fefde0c6fb420dbb66c1fb805624e22a547eee2f541f43fb4ba1756fa1e062829e01683aea13d3bd97efccb320f349b3c94e51de01ba665f298 SHA512 b942f7eb68588be410d8b949060255199e0d2601e11a7e92060d0a00bc92c9e09411caa978a6d939ffecdd6f7412600bedff0e1e7cf29540d8d4cd1e9c5a028e
+EBUILD libmtp-1.1.20.ebuild 1917 BLAKE2B bf554526e729ba781513545d5aaf2de97a5fdf66bc8fdfbc7805998de09d4bd6913c3f74439a179a92f73b773f1ce9d13b8c37138fc73d304b9e48cf4839c510 SHA512 c5491c946f3cfb5cfba7eea99ef4d9b007af034163fb91812075d9ed2e9581d7e78dd4357ba3fcec9c83e4e8384b252823948541b0d2c055c9b02043ae738fa5
+EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
index 5e6a85f46c71..1d3b612f5449 100644
--- a/media-libs/libmtp/libmtp-1.1.20.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.20.ebuild
@@ -9,6 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 	inherit autotools git-r3
 else
+	inherit libtool
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 fi
@@ -50,6 +51,11 @@ src_prepare() {
 			touch config.rpath || die # This is from upstream autogen.sh
 		fi
 		eautoreconf
+	else
+		# Needed to fix -fuse-ld=* filtering (e.g. lld)
+		# Can drop this once copyright year in libtool file included
+		# says >= 2021 (was 2014 at time of writing).
+		elibtoolize
 	fi
 }
 
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index ab7478bda189..c967b9ef0cc5 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -9,6 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
 	inherit autotools git-r3
 else
+	inherit libtool
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 fi
@@ -46,6 +47,11 @@ src_prepare() {
 			touch config.rpath || die # This is from upstream autogen.sh
 		fi
 		eautoreconf
+	else
+		# Needed to fix -fuse-ld=* filtering (e.g. lld)
+		# Can drop this once copyright year in libtool file included
+		# says >= 2021 (was 2014 at time of writing).
+		elibtoolize
 	fi
 }