public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/, app-misc/tracker-miners/files/
@ 2019-02-27 13:21 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-02-27 13:21 UTC (permalink / raw
  To: gentoo-commits

commit:     29e83345c868ec128c9411452b2a03a6084d3b1b
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 13:18:44 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 13:20:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e83345

app-misc/tracker-miners: bump to 2.1.6, workaround gst sandbox issues

Disables guarantee_metadata option by default, otherwise mainly just
most of the patches we needed for 2.1.5 are included now, plus
translation updates.
Workaround gstreamer sandbox issues by avoiding the gst-inspect
checking and patching the detection result to true or false, depending
on if gstreamer is used or not. Theoretically the test should succeed
always with ffmpeg, but not bothering to figure out if there is some
USE flags on ffmpeg needed to ensure that or not, etc, so just skipping
them with ffmpeg for the time being.

Closes: https://bugs.gentoo.org/678442
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 +
 .../files/2.1.6-cue-meson-fixes.patch              |  67 ++++++++++
 .../tracker-miners/tracker-miners-2.1.6.ebuild     | 146 +++++++++++++++++++++
 3 files changed, 214 insertions(+)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 30724f741a2..b60566f68f5 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1 +1,2 @@
 DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605
+DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2

diff --git a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
new file mode 100644
index 00000000000..07d6ae9b649
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
@@ -0,0 +1,67 @@
+From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik <ernestask@gnome.org>
+Date: Sun, 7 Oct 2018 11:40:41 +0300
+Subject: [PATCH 1/2] build: Fix libcue version comparison
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It currently performs a string comparison, as opposed to using
+version_compare(), which leads to results like
+“unknown >= 2.0.0 == True” when the dependency was not found.
+
+Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32
+
+(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 4273638dd..c30ada4ed 100644
+--- a/meson.build
++++ b/meson.build
+@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
+ conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
+ conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
+ conf.set('HAVE_LIBCUE', libcue.found())
+-conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
++conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
+ conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
+ conf.set('HAVE_LIBEXIF', libexif.found())
+ conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
+-- 
+2.17.0
+
+
+From ff6a076330ba1b5a383196795b18e2c069ac54c6 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Sun, 7 Oct 2018 23:42:28 +0200
+Subject: [PATCH 2/2] build: Fix breakage when libcue isn't found
+
+Commit 6e281037a5f0abc introduced a regression on systems where libcue
+is not available.
+
+Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
+
+(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index c30ada4ed..28072646a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
+ conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
+ conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
+ conf.set('HAVE_LIBCUE', libcue.found())
+-conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
++conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
+ conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
+ conf.set('HAVE_LIBEXIF', libexif.found())
+ conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
+-- 
+2.17.0
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
new file mode 100644
index 00000000000..5153b47c8e8
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.1.0:=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	!gstreamer? (
+		ffmpeg? (
+			libav? ( media-video/libav:0= )
+			!libav? ( media-video/ffmpeg:0= ) ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	flac? ( >=media-libs/flac-1.2.1 )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	vorbis? ( >=media-libs/libvorbis-0.22 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	taglib? ( >=media-libs/taglib-1.6 )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
+			media-plugins/gst-plugins-openh264:1.0 ) ) )
+"
+# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29)
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-cue-meson-fixes.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		$(meson_use test functional_tests)
+		-Dminer_apps=true
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		-Dcue=$(usex cue enabled disabled)
+		-Dexif=$(usex exif enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dgif=$(usex gif enabled disabled)
+		-Dgsf=$(usex gsf enabled disabled)
+		-Diptc=$(usex iptc enabled disabled)
+		-Diso=$(usex iso enabled disabled)
+		-Djpeg=$(usex jpeg enabled disabled)
+		-Dpdf=$(usex pdf enabled disabled)
+		-Dplaylist=$(usex playlist enabled disabled)
+		-Dpng=enabled
+		-Draw=$(usex raw enabled disabled)
+		-Dtaglib=$(usex taglib enabled disabled)
+		-Dtiff=$(usex tiff enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dxml=$(usex xml enabled disabled)
+		-Dxmp=$(usex xmp enabled disabled)
+		-Dxps=$(usex xps enabled disabled)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/, app-misc/tracker-miners/files/
@ 2020-12-23 21:38 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-12-23 21:38 UTC (permalink / raw
  To: gentoo-commits

commit:     15071bf1c50b95c626054e03422def09d4580ac6
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 21:38:04 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 21:38:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15071bf1

app-misc/tracker-miners: bump to 2.3.5 for glib-2.66 compat

* glib-2.66 started using statx syscall for some operations that
  tracker-miners uses, causing SIGSYS aborts on ~arch systems. This
  version allows statx in tracker-miners sandbox, but also makes it
  not autostart in the first place, therefore:
* Keep autostart as we don't have tracker-3 yet (and grab a patch to
  have the build work better with it enabled). When we add tracker-3,
  we need to revbump tracker-miners to disable autostart and drop the
  tracker-miners-3 blocker
* Prepare app-misc/tracker dep atom for upcoming parallel-installable
  tracker-3

Closes: https://bugs.gentoo.org/754315
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 +
 .../files/2.3.5-fix-autostart-build.patch          |  80 ++++++++++
 .../tracker-miners/tracker-miners-2.3.5.ebuild     | 162 +++++++++++++++++++++
 3 files changed, 243 insertions(+)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 3c7d6656ac9..cb04f715094 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1,3 @@
 DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
 DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B f52c46123c95252f8f16df824ff7498a8f44698cea13fa78653d7733590bef0a502139fea686b4fd9012f7569a6f946e1dbf8e053a16c474230c733d37103a3f SHA512 ceddddfa6c3151b5caeb197a4ae4dbe24fa2674e807bf66a9cc72227b60ee295171b52c2edb35236a3fbf9d8803678f55f8b990864a7a3a32bf362b0739d03ba
+DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9

diff --git a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
new file mode 100644
index 00000000000..85f201bcf05
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
@@ -0,0 +1,80 @@
+From e7b6d5f8b7541a4693c61be5d210fad85a5c9d06 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Sat, 12 Sep 2020 13:37:11 +0200
+Subject: [PATCH] build: Fix -Dautostart=true
+
+Meson doesn't seem to like that we use install_data() with custom target
+results. Make this option toggle the "install" keyword argument in the
+custom target itself.
+---
+ src/miners/fs/meson.build       | 10 +++-------
+ src/miners/rss/meson.build      | 10 +++-------
+ src/tracker-extract/meson.build | 10 +++-------
+ 3 files changed, 9 insertions(+), 21 deletions(-)
+
+diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
+index a770516c9..5a23bd06c 100644
+--- a/src/miners/fs/meson.build
++++ b/src/miners/fs/meson.build
+@@ -54,13 +54,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-miner-fs-desktop-file',
+     input: desktop_file_untranslated,
+     output: 'tracker-miner-fs.desktop',
+-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++    install: get_option('autostart'),
++    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
+index f540befe2..0bf0bb765 100644
+--- a/src/miners/rss/meson.build
++++ b/src/miners/rss/meson.build
+@@ -31,13 +31,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-miner-rss-desktop-file',
+     input: desktop_file_untranslated,
+     output: 'tracker-miner-rss.desktop',
+-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++    install: get_option('autostart'),
++    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
+index 239907179..aec37bfcc 100644
+--- a/src/tracker-extract/meson.build
++++ b/src/tracker-extract/meson.build
+@@ -189,13 +189,9 @@ desktop_file_untranslated = configure_file(
+ desktop_file = custom_target('tracker-extract-desktop-file',
+   input: desktop_file_untranslated,
+   output: 'tracker-extract.desktop',
+-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
+-
+-if get_option('autostart')
+-  install_data(desktop_file,
+-      install: true,
+-      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+-endif
++  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
++  install: get_option('autostart'),
++  install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+ 
+ if install_systemd_user_services
+   configure_file(
+-- 
+2.27.0
+

diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
new file mode 100644
index 00000000000..a6259ef3ba7
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.5.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:0=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.3.5; might be properly gone by 3.0
+RDEPEND="${RDEPEND}
+	!>=app-misc/tracker-miners-2.99
+" # Incompatible revision for (upcoming) parallel-installable tracker-miners-3 due to autostart; a revision that disables autostart and drops the blocker to be added together with v3
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-autostart-build.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dautostart=true # turn to false to co-exist with tracker-miners-3
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/, app-misc/tracker-miners/files/
@ 2022-03-27  5:07 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-03-27  5:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e9c107ac11d4b9725cc2219a31d35d59d2d26a9b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 05:07:27 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 05:07:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c107ac

app-misc/tracker-miners: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 -
 .../files/2.3.5-fix-autostart-build.patch          |  80 -----------
 .../tracker-miners/tracker-miners-2.3.5-r1.ebuild  | 159 ---------------------
 3 files changed, 240 deletions(-)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 02ab7b7bb733..5be38922a013 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,4 +1,3 @@
-DIST tracker-miners-2.3.5.tar.xz 3128428 BLAKE2B a45c642fb03433a6cf12d0904a82498aa6645f97ac70b1cfe04cc3b739b33b5d3fe307cd96f45a5a4af8927f029b4eade60195d2f72c1a684aa26ee723025d8a SHA512 13da1106bc1bc8a550093c4d1bf4336a205f636e0487dc9d42cee9ce2666eca73ead479fd04f03ccf15acb4e3b27a1c898860f63bdfa69ca74b02aa041731fa9
 DIST tracker-miners-3.2.1.tar.xz 4074476 BLAKE2B dfadb33f70462f8373d526ed7fce63553808b7b38ae444dcc67c2f9a0b5f4821526491ced9e43608793ef3190cb200a5fc1a7dee24ead02001b600cbb09931b9 SHA512 d3767f714cbda1688aecced96c6e9b6c51e69018db872e0427c98b09aacea3274b446dd85df1196dd4b24358dcabe6780abec9cc9f44af70261ef6bc74b78c2c
 DIST tracker-miners-3.2.2.tar.xz 4073752 BLAKE2B f2fe63cb6ea0704152305c8922d6a557cb24dd507d9ea00e8d800de50bd04ad1f373503ecd8b734c6dc74568a8ec370b2a8b29b6ca4d8512d420a938b1b179df SHA512 03508ef2bbfe3030c4afaaea740739b91e4b1c1dde364f801cf7deeb2358abde3561f7e1b43eeae97acbb010f7fcc063d7cd46578089cf1e1fc736d219c91b62
 DIST tracker-miners-3.3.0.tar.xz 7243888 BLAKE2B 3dcbb03808e823e46141ddc13c074a5e066d1b41b32291b8ad1d1ff7896ee6c7c1f09b1792555324ad54ea55481a5641c0426b09e7960506ff77717f756300ad SHA512 ef28abf48633125e2386cc6c9cc4afbc8c203cfd6fcd31eb6928eb6132e033be232e1141655b5d517e66170c5abb3799f9ea3c76f4b5db66e18524aea59f3969

diff --git a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch b/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
deleted file mode 100644
index 85f201bcf051..000000000000
--- a/app-misc/tracker-miners/files/2.3.5-fix-autostart-build.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From e7b6d5f8b7541a4693c61be5d210fad85a5c9d06 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Sat, 12 Sep 2020 13:37:11 +0200
-Subject: [PATCH] build: Fix -Dautostart=true
-
-Meson doesn't seem to like that we use install_data() with custom target
-results. Make this option toggle the "install" keyword argument in the
-custom target itself.
----
- src/miners/fs/meson.build       | 10 +++-------
- src/miners/rss/meson.build      | 10 +++-------
- src/tracker-extract/meson.build | 10 +++-------
- 3 files changed, 9 insertions(+), 21 deletions(-)
-
-diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
-index a770516c9..5a23bd06c 100644
---- a/src/miners/fs/meson.build
-+++ b/src/miners/fs/meson.build
-@@ -54,13 +54,9 @@ desktop_file_untranslated = configure_file(
- desktop_file = custom_target('tracker-miner-fs-desktop-file',
-     input: desktop_file_untranslated,
-     output: 'tracker-miner-fs.desktop',
--    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
--
--if get_option('autostart')
--  install_data(desktop_file,
--      install: true,
--      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
--endif
-+    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
-+    install: get_option('autostart'),
-+    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
- 
- if install_systemd_user_services
-   configure_file(
-diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
-index f540befe2..0bf0bb765 100644
---- a/src/miners/rss/meson.build
-+++ b/src/miners/rss/meson.build
-@@ -31,13 +31,9 @@ desktop_file_untranslated = configure_file(
- desktop_file = custom_target('tracker-miner-rss-desktop-file',
-     input: desktop_file_untranslated,
-     output: 'tracker-miner-rss.desktop',
--    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
--
--if get_option('autostart')
--  install_data(desktop_file,
--      install: true,
--      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
--endif
-+    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
-+    install: get_option('autostart'),
-+    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
- 
- if install_systemd_user_services
-   configure_file(
-diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
-index 239907179..aec37bfcc 100644
---- a/src/tracker-extract/meson.build
-+++ b/src/tracker-extract/meson.build
-@@ -189,13 +189,9 @@ desktop_file_untranslated = configure_file(
- desktop_file = custom_target('tracker-extract-desktop-file',
-   input: desktop_file_untranslated,
-   output: 'tracker-extract.desktop',
--  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'])
--
--if get_option('autostart')
--  install_data(desktop_file,
--      install: true,
--      install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
--endif
-+  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
-+  install: get_option('autostart'),
-+  install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
- 
- if install_systemd_user_services
-   configure_file(
--- 
-2.27.0
-

diff --git a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
deleted file mode 100644
index 804672ef7215..000000000000
--- a/app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.2.0:0=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-meta:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS}
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| ( media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0 )
-	) )
-"
-# intltool-merge manually called in meson.build in 2.3.5
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-autostart-build.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
-		#$(meson_use test functional_tests)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature cue)
-		$(meson_feature exif)
-		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dautostart=false # false to co-exist with tracker-miners-3
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/, app-misc/tracker-miners/files/
@ 2022-12-06  1:19 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-12-06  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     2cae136399009d446544fa8711ed278d5813843e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 19:27:30 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 01:19:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cae1363

app-misc/tracker-miners: Version bump to 3.4.2

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 +
 ...tests-Run-png-region-of-interest-only-if-.patch |  35 +++++
 .../tracker-miners/tracker-miners-3.4.2.ebuild     | 173 +++++++++++++++++++++
 3 files changed, 209 insertions(+)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 6793bc500c49..a3919a338c57 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1,3 @@
 DIST tracker-miners-3.4.0.tar.xz 7250524 BLAKE2B 9112c078899a7ab1aaab06d1c3ca0244410f21e13b724f1815e5334733bb851cf50c05ed424c80e62b2cfc5d7f16a1a065eeb6cb6a4befdb2d776cb7808e1cbc SHA512 0abafd3692c24683282f52e33a6b4d063a9d938b2f1b6dcb636409102890f6ebd9f33a8e406a482c1d16d26ebcf58874651d04f0c488b9d83e188feb6e5b1f91
 DIST tracker-miners-3.4.1.tar.xz 7244576 BLAKE2B a9f00a0f57b1af1a53b2552d4a1570a4c5576537c48eee9ebe2428e06170ff099e8876ec933bfe9f47adc69e7c61552e886aa2c3149bd3e02f37be8df844083d SHA512 2bd0b8450e1df40b4fa35b17f4209eba4f0d91a603b2d2f7b5bd6da07bcb60755b36d72b3b567ae6bf2d97c3a4294c8f14b1115825886c3f61528a092aa268bb
+DIST tracker-miners-3.4.2.tar.xz 7244308 BLAKE2B d7d24cf985181f1ab8be2e45b5f22ac32752a90cb4d5a5e74f172c1c1b8d75aaf99882ba1067bdac82670d9d98d2e4498965198770c1e1c626f3d81be329a89e SHA512 a63ebd12af1febe371f1e10e001f378ba57ccc7babe2b504157771ced6464d0c33e386512faa47383d89aa597fb5748dad82d17e9cb68def957b57ed29c47817

diff --git a/app-misc/tracker-miners/files/3.4.2-functional-tests-Run-png-region-of-interest-only-if-.patch b/app-misc/tracker-miners/files/3.4.2-functional-tests-Run-png-region-of-interest-only-if-.patch
new file mode 100644
index 000000000000..1367e384db25
--- /dev/null
+++ b/app-misc/tracker-miners/files/3.4.2-functional-tests-Run-png-region-of-interest-only-if-.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/423
+
+From f6ed245afd3c387bd347fa00e35e34e95b991da2 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 5 Dec 2022 19:13:21 -0500
+Subject: [PATCH] functional-tests: Run png-region-of-interest only if exempi
+ is found
+
+---
+ tests/functional-tests/meson.build | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
+index ef4dcab65..c33b620f8 100644
+--- a/tests/functional-tests/meson.build
++++ b/tests/functional-tests/meson.build
+@@ -81,10 +81,11 @@ if libgif.found()
+ endif
+ 
+ if libpng.found()
+-  extractor_tests += [
+-    'images/png-basic',
+-    'images/png-region-of-interest',
+-  ]
++  extractor_tests += 'images/png-basic'
++
++  if exempi.found()
++    extractor_tests += 'images/png-region-of-interest'
++  endif
+ endif
+ 
+ if gexiv2.found()
+-- 
+2.37.4
+

diff --git a/app-misc/tracker-miners/tracker-miners-3.4.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.4.2.ebuild
new file mode 100644
index 000000000000..d8f5d45ac104
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-3.4.2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.70:2
+	>=app-misc/tracker-3.4.0:3
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0
+		>=media-plugins/gst-plugins-meta-1.20:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	iso? ( >=sys-libs/libosinfo-1.10.0-r1 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	networkmanager? ( net-misc/networkmanager )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| (
+				media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0
+			)
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-functional-tests-Run-png-region-of-interest-only-if-.patch
+)
+
+python_check_deps() {
+	python_has_version -b \
+		"dev-python/pygobject[${PYTHON_USEDEP}]" \
+		"dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Dman=true
+		-Dextract=true
+		$(meson_use test functional_tests)
+		$(meson_use test tests_tap_protocol)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature cue)
+		$(meson_feature exif)
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-12-06  1:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-23 21:38 [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/, app-misc/tracker-miners/files/ Mart Raudsepp
  -- strict thread matches above, loose matches on Subject: below --
2022-12-06  1:19 Matt Turner
2022-03-27  5:07 Matt Turner
2019-02-27 13:21 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox