commit: 189c9e67a7a99091d240ddd42d4b1f3561fcbbfe Author: NRK <nrk <AT> disroot <DOT> org> AuthorDate: Sat Apr 12 09:47:07 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Apr 23 14:44:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189c9e67
x11-libs/cairo: add lzo USE flag Closes: https://bugs.gentoo.org/953549 Closes: https://github.com/gentoo/gentoo/pull/41554 Signed-off-by: NRK <nrk <AT> disroot.org> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/cairo/{cairo-9999.ebuild => cairo-1.18.4-r1.ebuild} | 7 ++++--- x11-libs/cairo/cairo-9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-1.18.4-r1.ebuild similarity index 94% copy from x11-libs/cairo/cairo-9999.ebuild copy to x11-libs/cairo/cairo-1.18.4-r1.ebuild index 5b5de6710465..d7d6ec8b8184 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-1.18.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,13 +17,12 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"; LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug +glib gtk-doc test" +IUSE="X aqua debug +glib gtk-doc lzo test" # Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml # any2ppm tests seem to hang for now. RESTRICT="test !test? ( test )" RDEPEND=" - >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] @@ -31,6 +30,7 @@ RDEPEND=" >=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}] debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -68,6 +68,7 @@ multilib_src_configure() { # Requires poppler-glib (poppler[cairo]) which isn't available in multilib $(meson_native_use_feature test tests) + $(meson_feature lzo) -Dgtk2-utils=disabled $(meson_feature glib) diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 5b5de6710465..d7d6ec8b8184 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,13 +17,12 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"; LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug +glib gtk-doc test" +IUSE="X aqua debug +glib gtk-doc lzo test" # Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml # any2ppm tests seem to hang for now. RESTRICT="test !test? ( test )" RDEPEND=" - >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] @@ -31,6 +30,7 @@ RDEPEND=" >=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}] debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -68,6 +68,7 @@ multilib_src_configure() { # Requires poppler-glib (poppler[cairo]) which isn't available in multilib $(meson_native_use_feature test tests) + $(meson_feature lzo) -Dgtk2-utils=disabled $(meson_feature glib)
