commit: fa5a90b58a64a24730d51462510acedb9490b0c1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jan 31 18:25:24 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 31 18:26:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5a90b5
x11-libs/cairo: drop opengl backend Dropped entirely upstream in https://gitlab.freedesktop.org/cairo/cairo/-/commit/47a932bffc16323b58e3c8f9bc3fe0d821838a84 and caused build failures with USE=-X. As discussed in #gentoo-desktop. Closes: https://bugs.gentoo.org/879045 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{cairo-9999.ebuild => cairo-1.17.6-r1.ebuild} | 22 ++-------------------- x11-libs/cairo/cairo-9999.ebuild | 22 ++-------------------- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild similarity index 81% copy from x11-libs/cairo/cairo-9999.ebuild copy to x11-libs/cairo/cairo-1.17.6-r1.ebuild index 74987be53131..4803af7d4c3d 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,11 +18,7 @@ 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 gles2-only gles3 +glib gtk-doc opengl test" -REQUIRED_USE=" - gles2-only? ( !opengl ) - gles3? ( gles2-only ) -" +IUSE="X aqua debug +glib gtk-doc test" RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib RDEPEND=" @@ -33,9 +29,7 @@ RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) - gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -74,18 +68,6 @@ multilib_src_configure() { $(meson_use gtk-doc gtk_doc) ) - if use opengl; then - emesonargs+=(-Dgl-backend=gl) - elif use gles2-only; then - if use gles3; then - emesonargs+=(-Dgl-backend=glesv3) - else - emesonargs+=(-Dgl-backend=glesv2) - fi - else - emesonargs+=(-Dgl-backend=disabled) - fi - meson_src_configure } diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 74987be53131..4803af7d4c3d 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,11 +18,7 @@ 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 gles2-only gles3 +glib gtk-doc opengl test" -REQUIRED_USE=" - gles2-only? ( !opengl ) - gles3? ( gles2-only ) -" +IUSE="X aqua debug +glib gtk-doc test" RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib RDEPEND=" @@ -33,9 +29,7 @@ RDEPEND=" >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) - gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -74,18 +68,6 @@ multilib_src_configure() { $(meson_use gtk-doc gtk_doc) ) - if use opengl; then - emesonargs+=(-Dgl-backend=gl) - elif use gles2-only; then - if use gles3; then - emesonargs+=(-Dgl-backend=glesv3) - else - emesonargs+=(-Dgl-backend=glesv2) - fi - else - emesonargs+=(-Dgl-backend=disabled) - fi - meson_src_configure }
