gentoo auto-resync : 10:04:2023 - 23:37:47

8 files changed, 78 insertions, 156 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bea6180443d6..a983d29f7f08 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index c4f10b1f8899..1002488d08d5 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,4 @@
 DIST grilo-0.3.15.tar.xz 241428 BLAKE2B 6b8841924c1b555abfcb852eddcaddaf0ea85dfe2922420e0e06b8fe2ea4fd4d8d5da47b011fd4c2f9c4edbe4fc08b36a3dd3c3779a92a0bd44abef3c3bffd9e SHA512 98616c1600bb7d7f5c92bbdc9b85d57da1e416f9207e60ad9b6c305c989f6d4ff6b21963f8f8c69f0daca68bf9d91b3397addfd0cea62f0553977fc0e69b2c31
+EBUILD grilo-0.3.15-r1.ebuild 2147 BLAKE2B 32ff659195256718f5862d03b84bd8221b47fd40233523a7474bb1d07a1151a89eb235c2b22d8b1dc40555eaee36ca17cf51a4b5b283806a3e2cf56d3c7a8380 SHA512 7649cbe3515987a5c44283e866117f4b8217ac106859df3f2f89033aaa92fc0ca930a9f95e09f4c8e528e7bc2e263e34cea17329c453ee00b874a8e72dcc6711
 EBUILD grilo-0.3.15.ebuild 2150 BLAKE2B 522219662d0ef98dbd24aad322973506f103d225e7f4eb5a288d17f999865d91e82065e1cf8f2b0f9679ca54dbc148067b765924b9f55d2fc7ed27a8881dea00 SHA512 89b7d4928c22662b2d2a736685e46cef7116880a14599faf4c3e1e1f0cc93639cf6bf3f6f03e8f7ec961d7b0fdc99fa49a56af82473d8ef3d1a85b328aa68cb3
 MISC metadata.xml 728 BLAKE2B bf26241647153b434cdf724108342a8415518d5d53487ef449ea382d2b3f3fe33bacf917ddeb65e90d11c7eeefabf3d58510c44b998cadbab3fc8b315bea6422 SHA512 9a871314e746f137125c7bb31f8b9a246fdbf2a9c92f017c1d134019b423d72639db1d5214bd8f06321f7ae4233085aff1d8a3cf7ad748b391ff81f92ff2255f
diff --git a/media-libs/grilo/grilo-0.3.15-r1.ebuild b/media-libs/grilo/grilo-0.3.15-r1.ebuild
new file mode 100644
index 000000000000..bbf0652fc20a
--- /dev/null
+++ b/media-libs/grilo/grilo-0.3.15-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk gtk-doc +introspection +playlist test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
+RDEPEND="
+	>=dev-libs/glib-2.66:2
+	>=net-libs/libsoup-3:3.0[introspection?]
+	playlist? ( >=dev-libs/totem-pl-parser-3.4.1:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+	gtk? (
+		net-libs/liboauth
+		>=x11-libs/gtk+-3.14:3
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3
+	)
+	${PYTHON_DEPS}
+	test? ( sys-apps/dbus )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
+	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
+
+	# Drop explicit unversioned vapigen check
+	sed -i -e "/find_program.*vapigen/d" meson.build || die
+
+	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
+	sed -i -e "/subdir('examples')/d" meson.build || die
+
+	default
+	xdg_environment_reset
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-grl-net=true # Fails to build
+		$(meson_use playlist enable-grl-pls)
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk enable-test-ui)
+		$(meson_use vala enable-vala)
+		-Dsoup3=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 9ee67950d8ae..d10fc76b3d78 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1,9 +1,4 @@
-AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLAKE2B 69c70f8b9dcefb9f1f4696d7911b34d2a4b9abea43a283cbc66faa923d5e566cf04ec996f7073a2440356a2f5889684cdcae2bb42787695b762045948b58ce18 SHA512 6ff92765e21a9f883d5ebbcd647c17f443fe4e47bda32899c7950a63e74427ffe939021adc1bd74f9fb9c72d7c11300cbe46d8ce4ee662036f93c68ee7c5b934
-AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
-AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
-DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
 DIST vidstab-1.1.1.tar.gz 80717 BLAKE2B e2ce03d24358404c617816466ad3fd715999ef4d391617e9cec7923353ba2ce4ac3b3eedce67f3fadf3bd6fdfb2e4516a5b95c3fca9f613e367b1490ec78ae0a SHA512 b27ac95ab5302e9500af5a52cb09f557b9dacbdc4dc57a9781e2f9ae65a6ffea396f9819bca1f6a103f9d1896bf3061f1cb647166b14b8de8e89a1b15f010e5c
-EBUILD vidstab-1.1.0-r2.ebuild 1860 BLAKE2B 44b319f2b9cd52e18a26bbd52f87ac752d30c40d8eaa89e3ab190336af53d834012be025e524ef7039288ef99c3477994b30472daaa5e54c517a3f2b37e6ea68 SHA512 c8c56f5255e2646bc83a29bfac65cb9acb0400345133f235f49691072f7d33b41e47fac3735eb1e15f9bec902ee9dac0b7a49d4d022630bd6fd0b89a2a344f59
 EBUILD vidstab-1.1.1.ebuild 1621 BLAKE2B 4f5faa5bab28e0747b3ef437c4707b4f134a7f624a15b63161d8a00fb89617b235642b5707c7e846c0363ff94d6464b6214715a3659f5d5dc0f9503bd85f9119 SHA512 903d34e5f59be6976429b1d3d6eaa78fb4adc2611853352025f8f84bd61b60d71e99b7ea1cb8c9066561e3aa655cfc09822abdcde74b25b65125cd46b2b9bfbd
 EBUILD vidstab-9999.ebuild 1620 BLAKE2B 9dc117950d5c2180df1d7d180f96b58ebff642fa0c1d6ce55c8f28693003a1a05ebdbe6e8b03cab6ba49b2c03ae03437b20d08a218549a27427e6978304d4e8d SHA512 1c69e752c7dba8fb6f9374a685474429a2f57566ec9a8a094201025948b44627942865d97dfd8a68ea5a8552ac58e9cb486fc300dfafabeb695850e5ebc2ba5d
 MISC metadata.xml 615 BLAKE2B 9260db65c08e6d6284fff960a229259d5d62672b5014697e0503a39f7e48b82955396fec6f608611306b2c586a39532fc61ebde8fe06ad0e9fb8c150f6d914f7 SHA512 8ffb575f589d09954230457a7d7b100a6f5fa9886a0a99bfb6813c0174c74817a3670957b09afedeaf9afe74451e8dd8da55bd1eb6d6fce36c655bce14fb21ac
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
deleted file mode 100644
index 88d260f429ca..000000000000
--- a/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a6438c4b3ea5a00f2896b903a4bda0a4efa241f4 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 12 Feb 2019 16:39:06 -0500
-Subject: [PATCH] Use OpenMP only if available in test_motiondetect
-
-Only call `omp_set_dynamic( 1 );` if `USE_OMP`
-
-Fixes `undefined reference to `omp_set_dynamic'` when not using OpenMP
----
- tests/test_motiondetect.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/test_motiondetect.c b/tests/test_motiondetect.c
-index 0f37def..125f4bd 100644
---- a/tests/test_motiondetect.c
-+++ b/tests/test_motiondetect.c
-@@ -19,7 +19,9 @@ void test_motionDetect(TestData* testdata){
-     int i;
- 
-     int start = timeOfDayinMS();
-+#ifdef USE_OMP
-     omp_set_dynamic( 1 );
-+#endif
-     md.conf.numThreads=threads;
- 
-     for(i=0; i<numruns; i++){
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
deleted file mode 100644
index 1f73c50a49ed..000000000000
--- a/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/georgmartius/vid.stab/pull/69
-
-From dff58ee5a26569a7eeb881d204b428ee5da40746 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Thu, 10 Jan 2019 13:47:10 -0500
-Subject: [PATCH] tests should exit with code 0 on success
-
-Exit code 0 indicates success, anything else indicates failure. Therefore, unittest_summary() should return 0 if no tests failed.
----
- tests/testframework.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testframework.c b/tests/testframework.c
-index a38851c..a889560 100644
---- a/tests/testframework.c
-+++ b/tests/testframework.c
-@@ -36,7 +36,7 @@ int unittest_summary(){
-   fprintf(stderr, "UNIT TESTs succeeded:\t %s%i/%i\033[0m\n",
-           units_failed>0 ? "\033[1;31m" : "\033[1;32m",
-           units_success, units_success + units_failed);
--  return units_failed==0;
-+  return units_failed!=0;
- 
- }
- 
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch
deleted file mode 100644
index fc7deca503e6..000000000000
--- a/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 80932fbd1e77d397a7b503697c78fd888ede396a Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 14 Jan 2019 11:08:30 -0500
-Subject: [PATCH] In tests, use sse2 only if it is available
-
-Use FindSSE and SSE2_FOUND in the same way as done in the main CMakeLists.txt in commit 0f41dfb89ba3fa7d20f45cbeb02cc1ff37c89c27
----
- tests/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 9597141..6812916 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -7,6 +7,8 @@ project (vid.stab)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/")
- 
-+include (FindSSE)
-+
- option(USE_OMP "use parallelization use OMP" ON)
- 
- # Default to debug builds if no explicit build type specified.
-@@ -23,7 +25,9 @@ else()
- add_definitions( -DDISABLE_ORC)
- endif()
- 
-+if(SSE2_FOUND)
- add_definitions( -DUSE_SSE2 -msse2 -ffast-math -fno-show-column ) # -DUSE_SSE2_ASM
-+endif()
- 
- if(USE_OMP)
- add_definitions(-fopenmp -DUSE_OMP)
diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
deleted file mode 100644
index a4d043b2fa01..000000000000
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib toolchain-funcs
-
-DESCRIPTION="Video stabilization library"
-HOMEPAGE="http://public.hronopik.de/vid.stab/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-	S="${WORKDIR}/vid.stab-${PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="openmp cpu_flags_x86_sse2"
-PATCHES=(
-	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
-	"${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch"
-	"${FILESDIR}/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	# USE=cpu_flags_x86_sse2 instead
-	sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
-	sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die
-	# strip some CFLAGS
-	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
-		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
-		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
-	done
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_test() {
-	local mycmakeargs=(
-		-DUSE_OMP="$(usex openmp)"
-		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
-	)
-	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
-	local BUILD_DIR="${BUILD_DIR}/tests"
-	cmake_src_configure
-	cmake_build
-	"${BUILD_DIR}"/tests || die
-}