commit: 3b5c35fe09a77a868d9cdf6805d42c27ce397764 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Apr 30 21:39:15 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 30 22:07:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5c35fe
media-libs/libmediaart: add 1.9.7, switch IUSE qt5 -> qt6 NEW in 1.9.7 - 2025-03-02 ========================= * Fix memory leaks and compiler warnings Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/libmediaart/Manifest | 1 + .../libmediaart/files/libmediaart-1.9.7-qt6.patch | 82 ++++++++++++++++++++++ media-libs/libmediaart/libmediaart-1.9.7.ebuild | 55 +++++++++++++++ 3 files changed, 138 insertions(+) diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest index c03fa7f5cae2..1d6f80b4b05c 100644 --- a/media-libs/libmediaart/Manifest +++ b/media-libs/libmediaart/Manifest @@ -1 +1,2 @@ DIST libmediaart-1.9.6.tar.xz 5551220 BLAKE2B 15f17592075461d6199c9a4e0de1a99493b88147410c25e360e71dcb3e9f2d5e733977cf66c8bf900c654e4e9930d551d30832f2d64dcb8b2b5306b6ce085f80 SHA512 93af1a06aa7b12d8fc7573201f51abc41838bd9405bc8cf56d4fcfb5cfa9f7427d8d8ddc2ee36501e938bc8e123d91f590cff2cdb4689e1e6ed2358f7264e887 +DIST libmediaart-1.9.7.tar.xz 5549844 BLAKE2B 5625564d40a05f94724711e401a09a0ae6427a9fde1cf8360c33bdf222a599e17d80c3d68a5af0ff6872320ec1bc683c7924026958ed4b31ef7a6fa0b7925f50 SHA512 b56de8114b4ffe70c02796829f49dc169a9f8e4d3fee58afcc8681d2341488d2222b2cbc222d6ed961c1a8b552f0a2d3080c427e0ce1ccb8dffb8a1c10820129 diff --git a/media-libs/libmediaart/files/libmediaart-1.9.7-qt6.patch b/media-libs/libmediaart/files/libmediaart-1.9.7-qt6.patch new file mode 100644 index 000000000000..6c0eb2d9b2d5 --- /dev/null +++ b/media-libs/libmediaart/files/libmediaart-1.9.7-qt6.patch @@ -0,0 +1,82 @@ +From c86087577b113af78f1a9a8a62a1652f5d0e9434 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 30 Apr 2025 23:37:33 +0200 +Subject: [PATCH] Port to Qt6 + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + libmediaart/meson.build | 2 +- + meson.build | 18 +++++++++--------- + meson_options.txt | 2 +- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/libmediaart/meson.build b/libmediaart/meson.build +index 4f1201c..50de50a 100644 +--- a/libmediaart/meson.build ++++ b/libmediaart/meson.build +@@ -17,7 +17,7 @@ libmediaart_sources = [ + + if image_library_name == 'gdk-pixbuf-2.0' + libmediaart_sources += 'extractpixbuf.c' +-elif image_library_name == 'Qt5Gui' ++elif image_library_name == 'Qt6Gui' + add_languages('cpp', required : true) + libmediaart_sources += 'extractqt.cpp' + else +diff --git a/meson.build b/meson.build +index 7e4e0ec..a1a98fa 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,7 +24,7 @@ glib = dependency('glib-2.0', version: '> ' + glib_required) + gio = dependency('gio-2.0', version: '> ' + glib_required) + gio_unix = dependency('gio-unix-2.0', version: '> ' + glib_required) + gobject = dependency('gobject-2.0', version: '> ' + glib_required) +-qt5 = dependency('qt5', version: '> 5.0.0', modules: 'Gui', required: false) ++qt6 = dependency('qt6', version: '> 6.0.0', modules: 'Gui', required: false) + + ################################################################## + # Choose between backends (GdkPixbuf/Qt/etc) +@@ -42,13 +42,13 @@ elif get_option('image_library') == 'gdk-pixbuf' + endif + + if image_library_name == '' +- if qt5.found() +- if get_option('image_library') == 'auto' or get_option('image_library') == 'qt5' +- image_library = qt5 +- image_library_name = 'Qt5Gui' ++ if qt6.found() ++ if get_option('image_library') == 'auto' or get_option('image_library') == 'qt6' ++ image_library = qt6 ++ image_library_name = 'Qt6Gui' + endif +- elif get_option('image_library') == 'qt5' +- error('qt5 explicitly requested, but not found') ++ elif get_option('image_library') == 'qt6' ++ error('qt6 explicitly requested, but not found') + endif + endif + +@@ -60,8 +60,8 @@ conf = configuration_data() + + conf.set('HAVE_GDKPIXBUF', (image_library_name == 'gdk-pixbuf-2.0'), + description: 'Define if GdkPixbuf is available') +-conf.set('HAVE_QT5', (image_library_name == 'Qt5Gui'), +- description: 'Define Qt5 is available') ++conf.set('HAVE_QT6', (image_library_name == 'Qt6Gui'), ++ description: 'Define Qt6 is available') + conf.set('LIBMEDIAART_VERSION', meson.project_version(), + description: 'Libmediaart version') + +diff --git a/meson_options.txt b/meson_options.txt +index 3146b1f..f421e9b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,4 +1,4 @@ +-option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'], ++option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt6'], + description: 'Which image processing backend to use') + option('introspection', type : 'boolean', value : 'true', + description : 'Enable / disable the GObject-Introspection integration') +-- +2.49.0 + diff --git a/media-libs/libmediaart/libmediaart-1.9.7.ebuild b/media-libs/libmediaart/libmediaart-1.9.7.ebuild new file mode 100644 index 000000000000..52ed9ac7aa9e --- /dev/null +++ b/media-libs/libmediaart/libmediaart-1.9.7.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 meson vala + +DESCRIPTION="Manages, extracts and handles media art caches" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"; + +LICENSE="LGPL-2.1+" +SLOT="2.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="gtk gtk-doc +introspection qt6 test vala" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ^^ ( gtk qt6 ) + vala? ( introspection ) +" + +RDEPEND=" + >=dev-libs/glib-2.38.0:2 + gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) + introspection? ( >=dev-libs/gobject-introspection-1.30:= ) + qt6? ( dev-qt/qtbase:6[gui] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/gobject-introspection-common + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( "${FILESDIR}/${P}-qt6.patch" ) # TODO: upstream + +src_prepare() { + default + use vala && vala_setup +} + +src_configure() { + local image_library + use gtk && image_library=gdk-pixbuf + use qt6 && image_library=qt6 + + local emesonargs=( + -Dimage_library=${image_library} + $(meson_use introspection) + $(meson_use vala vapi) + $(meson_use test tests) + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +}
