gentoo auto-resync : 21:04:2024 - 12:05:28

3 files changed, 8 insertions, 108 deletions

diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 0755e4ccc81d..094db70df91b 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,6 +1,5 @@
-AUX 1.0.4-tests-Add-test-setup-for-valgrind.patch 2536 BLAKE2B c8dfaa634c29025cf80f3b358413923a2a46db3ca9ad540d2a212524559d67d3f03b8be1d7a01a0b9ed17a8394c48052ba1041d25557a0190811abb15d452adc SHA512 d907fbc02dc1280fd5ffc422133f3e727c5993650e2579094e2e678db877087144560de597b7209d49771f8a5d253e0cfe7004344ddf6b8136ab55e894984613
-DIST libshumate-1.0.5.tar.xz 112008 BLAKE2B e20e53fdcd34aa67853f68d72801e7ef7dfcb39670f67f0bfab76cc04a0dc4e92b614b5a588560de64c85406b63a105b5ba19854cf1189a5a3c03f097c93556e SHA512 73beffb8eea95b279d297294ce96a39883856d280eeda1215b908d5b7ac86aff49bbd9c07065ffb394657497997b1994712de6526efd9076f9a5feb1c17b9532
 DIST libshumate-1.1.3.tar.xz 299644 BLAKE2B f07a583e1fd142a0601c725840e84397ed04962f828cbc15217dcdc0d767015664a06252879416e9422cb32154406dae2742ffb511404c5923ce9acab7efae0c SHA512 163cce5c9aca2f3c52da3ecb3b4a651798e314d38a145ed4c69b0510303c72a0934c24084036ca2dfaab8b008753a37f7116b0bd2907cddc78a2aceee4f847d2
-EBUILD libshumate-1.0.5.ebuild 1605 BLAKE2B 68f9eb4d1caca5aa8df08fa5d42cddc51d9820a78595dd92ae64cc8cc557ead659037a7070736f828ac8a427cb7ee336495497245b4ce1bf3714616fe4e9f833 SHA512 b7e743c4959c9b2b22dbf13bf82a48d855c15ab98dce98cd1eb2529bd0c643bf879364f0f4eac6cfc1a89bd39076f4ea3054a92ade37cc21877387ded4c130e9
+DIST libshumate-1.1.4.tar.xz 299700 BLAKE2B 1f60b0807d99c8ea675be2ca85ada1929c51aa1a5f27bb5565ddba062626c4bde447f95ad4b7e02b6d3f57af1365501e64b5bca18dc566b3bf0ae1f47d5c638f SHA512 f2bb90255a43fbdf9b17bd69260c9054378959900adbc26db9b7417f98595f1d5c9221db4f31b78a546f7bd30d95175f4210fc7db11db6704d7de4c9ad000619
 EBUILD libshumate-1.1.3.ebuild 1608 BLAKE2B 7ba44ffb6b282e97b5c25fa9eaeaf09d8ea0448664b8d9e1a3e646f0a4c130af9ff83f5f0fdebcbe3030a80ce0fbff7827f5d2a2085e023bd49172360f6e6353 SHA512 c9f976ad26fdf93d058c64100f9db65fd9f9242fa146a7f551dec1ea5749a22581d2a51518689daf7800ed1be173cc77b5cf88852546c7e2f23c5ae7831c7f0e
+EBUILD libshumate-1.1.4.ebuild 1611 BLAKE2B 5dc2303798124fa9f570b592951c3b7820cde4847c4e7d1d6ae6877c7a811088597bc8fa4e5c40083c487afb38d78035a27c22dfe5c2d532a2329a61a226623a SHA512 25a71dfb501c443f83bc1486bf7fa6532eb04d28401bce4f54bbaae83cfd7d43660ebe2fa7d8e5565590332cd5712f181c8b1a8488080bccf3f3b50a02b8d0f6
 MISC metadata.xml 445 BLAKE2B 58a069a9ded7b8fab96c93fd3b11e1fd7b4ae4a58966f5bbeedb560547005a56f62167bc31aa5c05ca68f1855e12c2d915825922d5b6504e359893e0786579a5 SHA512 3e5352258641f4a9e6722777971cc3fb02359e831708c1749f2d77c7b15d147adbf54097d311435f5220cd49bab9e298b3379f4a59c0f4563a6706f608343299
diff --git a/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch b/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch
deleted file mode 100644
index fa3a0ea30abc..000000000000
--- a/media-libs/libshumate/files/1.0.4-tests-Add-test-setup-for-valgrind.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/158/
-
-From f4f806207cc59c21331d1542f6629e85a59ea1db Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 1 Dec 2022 20:48:57 -0500
-Subject: [PATCH] tests: Add test setup for valgrind
-
-valgrind is great, but it often does not support the latest instruction
-sets used by core libraries (e.g. AVX instructions used in glibc). That
-leads to failures that are unrelated to libshumate. For example:
-
-  6/7 viewport            FAIL            0.16s   killed by signal 4 SIGILL
-  [...]
-  vex amd64->IR: unhandled instruction bytes: 0xC4 0xE1 0xF9 0x90 0xD 0xDE 0xE8 0x1 0x0 0x41
-  vex amd64->IR:   REX=0 REX.W=1 REX.R=0 REX.X=0 REX.B=0
-  vex amd64->IR:   VEX=1 VEX.L=0 VEX.nVVVV=0x0 ESC=0F
-  vex amd64->IR:   PFX.66=1 PFX.F2=0 PFX.F3=0
-
-Categorizing these tests under a 'valgrind' setup allows distributions
-to easily disable them.
----
- tests/meson.build | 38 +++++++++++++++++---------------------
- 1 file changed, 17 insertions(+), 21 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index eadf54f..362e87d 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -6,21 +6,18 @@ test_env = [
-   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
- ]
-
--valgrind_tests = [
--  'coordinate',
--  'memory-cache',
--  'viewport',
--]
--
- tests = [
-+  'coordinate',
-   'file-cache',
--  'marker',
-   'map',
-+  'marker',
-   'marker-layer',
-+  'memory-cache',
-+  'viewport',
- ]
-
- if get_option('vector_renderer')
--  valgrind_tests += [
-+  tests += [
-     'vector-expression',
-     'vector-style',
-     'vector-value',
-@@ -29,21 +26,20 @@ endif
-
- subdir('data')
-
-+# Allow the tests to be easily run under valgrind using --setup=valgrind
- valgrind = find_program('valgrind', required: false)
-
- if valgrind.found()
--  foreach test : valgrind_tests
--    executable = executable(
--      test,
--      test_resources,
--      '@0@.c'.format(test),
--      dependencies: [libshumate_dep],
--    )
--
--    test(test, valgrind, args: ['--leak-check=full', '--error-exitcode=1', executable], env: test_env)
--  endforeach
--else
--  tests += valgrind_tests
-+  add_test_setup('valgrind',
-+    exclude_suites: [ 'no-valgrind', 'flaky' ],
-+    exe_wrapper: [
-+      valgrind,
-+      '--leak-check=full',
-+      '--error-exitcode=1',
-+    ],
-+    env: test_env,
-+    timeout_multiplier: 20,
-+  )
- endif
-
- foreach test : tests
-@@ -55,4 +51,4 @@ foreach test : tests
-   )
-
-   test(test, executable, env: test_env)
--endforeach
-\ No newline at end of file
-+endforeach
---
-2.39.3
-
diff --git a/media-libs/libshumate/libshumate-1.0.5.ebuild b/media-libs/libshumate/libshumate-1.1.4.ebuild
index cb85cd4ff4fa..94e5f6d11dba 100644
--- a/media-libs/libshumate/libshumate-1.0.5.ebuild
+++ b/media-libs/libshumate/libshumate-1.1.4.ebuild
@@ -10,10 +10,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GN
 
 SLOT="1.0/1"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
-IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release
+IUSE="gtk-doc +introspection sysprof vala" # vector-renderer is still experimental, maybe put in at a later release
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
@@ -28,16 +28,14 @@ RDEPEND="
 #	dev-libs/protobuf-c
 # )
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
 BDEPEND="
 	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
 	vala? ( $(vala_depend) )
 "
 
-PATCHES=(
-	"${FILESDIR}"/1.0.4-tests-Add-test-setup-for-valgrind.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use introspection gir)
@@ -47,6 +45,7 @@ src_configure() {
 		# $(meson_use vector-renderer vector_renderer)
 		-Dvector_renderer=false
 		-Dlibsoup3=true
+		$(meson_feature sysprof)
 	)
 	meson_src_configure
 }