gentoo auto-resync : 05:10:2022 - 01:18:42

6 files changed, 72 insertions, 39 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index eb2f0b32b4c6..26d0ec397144 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 9c65ea9f1ba1..28d3bd7e14f5 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,6 +3,7 @@ DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab
 DIST babl-0.1.96.tar.xz 312184 BLAKE2B 6ee307054cf4d1e0f434a6070189ed143c60056decb59184f880b26863c8177d0c69294254651923f7dfb897555939602e6f4384e7561a839a3cf80ae9468859 SHA512 771d68b80f1123baa38256e4b1d7946284cd88997b2ab7c7092a74120e91ea5ee7ab4c001686ae4b3e363b6465484f185a64f9c75515a55d3ffb81fecbeaca42
 EBUILD babl-0.1.92-r1.ebuild 1923 BLAKE2B 6d1c10dee304bfd6c40d431ec1fc0db206668a38ac2fdcbea816cd6fa75889f773d781b85e87043f246a81d9b2c51625c8201b291c38c80474d7ed940b412d03 SHA512 45679b51b69ae403bda0753af41f4890702dff5b530daaf763c8fb95f634f56c9dd5c56bcc69b86c670dd4dc838539ade13597616ed6c84423463e3af800b134
 EBUILD babl-0.1.92.ebuild 1829 BLAKE2B 6b63020df7b902a92183e79000d342c13821ad3e87f005159cae04071750abe2f82f7fa7fd09a0cec6f94a65d6481522f08703ed6d1049133de3fbd2984ac2a4 SHA512 cad47bf1d01849165c502789f232d46c23c0d9bebec5725881ec1bc7cf0f1086f5f7bca804e0833bc06ab7a177e8ae754fe75670e0e8b602ee16932125480606
+EBUILD babl-0.1.96-r1.ebuild 1910 BLAKE2B 332b3e7e754593c6a012d0c370ff2e77e876a7be9ec3d1825d603c6c201c1b6e9c5cdaa281680a8526741be34154e087ac57bc68e4c6a7f0e3c57c887cf1bd34 SHA512 d3d6b11ca0e465b657015a7e36eef6566611fd18e98d0163e2383d32d8f75dce629e8eeff8f08e16650cffb741cab6a95a48a453f6de69bfb5c02d405036af29
 EBUILD babl-0.1.96.ebuild 1765 BLAKE2B ec23a9899c545e20f64a56f5d3b73be99790c449a2ff4e6ae7bd2cd084a5f7a11a9c099958db0bcd74691b87ab81e2b2197c4a4cfbc59f93f4bde1300c885db3 SHA512 2f25c45d9c5b06f8e6e4d51d20df1a466177087a2fe89eae3b14ca58df68a64206eb3ec131604e5bea90c0c87afeb6cf9ba4467df5c3c15a54bf43245c5dfaf7
 EBUILD babl-9999.ebuild 1765 BLAKE2B ec23a9899c545e20f64a56f5d3b73be99790c449a2ff4e6ae7bd2cd084a5f7a11a9c099958db0bcd74691b87ab81e2b2197c4a4cfbc59f93f4bde1300c885db3 SHA512 2f25c45d9c5b06f8e6e4d51d20df1a466177087a2fe89eae3b14ca58df68a64206eb3ec131604e5bea90c0c87afeb6cf9ba4467df5c3c15a54bf43245c5dfaf7
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.96-r1.ebuild b/media-libs/babl/babl-0.1.96-r1.ebuild
new file mode 100644
index 000000000000..c313961dff14
--- /dev/null
+++ b/media-libs/babl/babl-0.1.96-r1.ebuild
@@ -0,0 +1,69 @@
+# 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://download.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}"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+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
+}
+
+src_install() {
+	meson_src_install
+
+	# Bug 871690
+	dosym -r /usr/"$(get_libdir)"/pkgconfig/babl.pc /usr/"$(get_libdir)"/pkgconfig/babl-0.1.pc
+}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index e30d45fdba65..37815a7a7d73 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,11 +1,9 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
-DIST intel-gmmlib-22.1.7.tar.gz 818408 BLAKE2B b7123b571bfdb2f363bb7824264b9c2ad85c5e58f2978c0fa20010c8a890157bf10da7c772b9ad987078784bf37192ec0e8e14b73980af15329609649e817fd6 SHA512 0dbf972ecd61f84b9932eb6735c73e424861f7841bee8a5e76cd4d8d28ebf7641e475f9cdb1015b4f20aca08591f8f52631ebc209efa339753b47b3a121a38fb
 DIST intel-gmmlib-22.1.8.tar.gz 818360 BLAKE2B 5a7dadaead925eddfe52770c73eea92b8f071b498a2ed8d23928c93ba3d0284d9046339b7eb641918b17bf13bbcffc071ba71ba47cc53760258b1bb39f175e17 SHA512 4520105c7ceaae30e592acce7bae65841ecdb5d74c888cf03a2308a94a63d998941665794933c8247dbae841d13386ee99b365de0c6a5676acc960386c19ca2c
 DIST intel-gmmlib-22.2.0.tar.gz 820145 BLAKE2B 6b7966c71a24344f4525cb676aae12c7947d1101bbe46938336deeb769f5728aec4a11ce2b346fc55bc3d752c67e2f375e7008f8bb11a7fc49e91231ed09a1a9 SHA512 57ed8bb08755befeb27e096249cc31afbae7ff0ccfb0eb2ae4de38b38e6c3454a1e145f11a509b6dcae45d1a8ee7b75021353f7b1857b3e32366e84310337e44
-EBUILD gmmlib-22.1.7.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
-EBUILD gmmlib-22.1.8.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
+EBUILD gmmlib-22.1.8.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
 EBUILD gmmlib-22.2.0.ebuild 796 BLAKE2B 229b1cfde21427a045a0bbf7b93428bdd4173e447055201feb6d808b7406101de1a67f4a228ffb4206ec7b3941dcb894a9a91dd0d7777954640de1615c0a8429 SHA512 11ad5fbe1a2975e13233434673ccb36960f4a7517a5b0a45c8e35aa8a77e886a89c8e304c87d7e0e0d2eba250f12170eca460b0789ab5c9eea780c7fe641fa6e
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B e3b152fddf160615a384564528294e34a3e974cbca2c449c5f0c8eb35be42b0a5effca7c5f5206e0e557f1b3e97631285da731dededed27e61581bb0994236aa SHA512 c5c5798eb82b6ad5872c0b52888cb2ee3effd989b0aa1fa8b3c000c3f9842d8789e350b718d2a78c9ca465b63b90b2873eadae0528ebda3a9435b1729388b849
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-22.1.7.ebuild b/media-libs/gmmlib/gmmlib-22.1.7.ebuild
deleted file mode 100644
index 74db95043d2b..000000000000
--- a/media-libs/gmmlib/gmmlib-22.1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-${P}"
-
-KEYWORDS="amd64"
-LICENSE="MIT"
-SLOT="0/12.1"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.1.8.ebuild b/media-libs/gmmlib/gmmlib-22.1.8.ebuild
index 598b7721fb10..74db95043d2b 100644
--- a/media-libs/gmmlib/gmmlib-22.1.8.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.1"
 IUSE="+custom-cflags test"