| 1 |
commit: fa5a90b58a64a24730d51462510acedb9490b0c1 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 31 18:25:24 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 31 18:26:06 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5a90b5 |
| 7 |
|
| 8 |
x11-libs/cairo: drop opengl backend |
| 9 |
|
| 10 |
Dropped entirely upstream in https://gitlab.freedesktop.org/cairo/cairo/-/commit/47a932bffc16323b58e3c8f9bc3fe0d821838a84 |
| 11 |
and caused build failures with USE=-X. |
| 12 |
|
| 13 |
As discussed in #gentoo-desktop. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/879045 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../{cairo-9999.ebuild => cairo-1.17.6-r1.ebuild} | 22 ++-------------------- |
| 19 |
x11-libs/cairo/cairo-9999.ebuild | 22 ++-------------------- |
| 20 |
2 files changed, 4 insertions(+), 40 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild |
| 23 |
similarity index 81% |
| 24 |
copy from x11-libs/cairo/cairo-9999.ebuild |
| 25 |
copy to x11-libs/cairo/cairo-1.17.6-r1.ebuild |
| 26 |
index 74987be53131..4803af7d4c3d 100644 |
| 27 |
--- a/x11-libs/cairo/cairo-9999.ebuild |
| 28 |
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild |
| 29 |
@@ -1,4 +1,4 @@ |
| 30 |
-# Copyright 1999-2022 Gentoo Authors |
| 31 |
+# Copyright 1999-2023 Gentoo Authors |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
EAPI=8 |
| 35 |
@@ -18,11 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" |
| 36 |
HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" |
| 37 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
| 38 |
SLOT="0" |
| 39 |
-IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test" |
| 40 |
-REQUIRED_USE=" |
| 41 |
- gles2-only? ( !opengl ) |
| 42 |
- gles3? ( gles2-only ) |
| 43 |
-" |
| 44 |
+IUSE="X aqua debug +glib gtk-doc test" |
| 45 |
RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
@@ -33,9 +29,7 @@ RDEPEND=" |
| 49 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
| 50 |
>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] |
| 51 |
debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) |
| 52 |
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) |
| 53 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 54 |
- opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] ) |
| 55 |
X? ( |
| 56 |
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
| 57 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 58 |
@@ -74,18 +68,6 @@ multilib_src_configure() { |
| 59 |
$(meson_use gtk-doc gtk_doc) |
| 60 |
) |
| 61 |
|
| 62 |
- if use opengl; then |
| 63 |
- emesonargs+=(-Dgl-backend=gl) |
| 64 |
- elif use gles2-only; then |
| 65 |
- if use gles3; then |
| 66 |
- emesonargs+=(-Dgl-backend=glesv3) |
| 67 |
- else |
| 68 |
- emesonargs+=(-Dgl-backend=glesv2) |
| 69 |
- fi |
| 70 |
- else |
| 71 |
- emesonargs+=(-Dgl-backend=disabled) |
| 72 |
- fi |
| 73 |
- |
| 74 |
meson_src_configure |
| 75 |
} |
| 76 |
|
| 77 |
|
| 78 |
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild |
| 79 |
index 74987be53131..4803af7d4c3d 100644 |
| 80 |
--- a/x11-libs/cairo/cairo-9999.ebuild |
| 81 |
+++ b/x11-libs/cairo/cairo-9999.ebuild |
| 82 |
@@ -1,4 +1,4 @@ |
| 83 |
-# Copyright 1999-2022 Gentoo Authors |
| 84 |
+# Copyright 1999-2023 Gentoo Authors |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
|
| 87 |
EAPI=8 |
| 88 |
@@ -18,11 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" |
| 89 |
HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" |
| 90 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
| 91 |
SLOT="0" |
| 92 |
-IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test" |
| 93 |
-REQUIRED_USE=" |
| 94 |
- gles2-only? ( !opengl ) |
| 95 |
- gles3? ( gles2-only ) |
| 96 |
-" |
| 97 |
+IUSE="X aqua debug +glib gtk-doc test" |
| 98 |
RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib |
| 99 |
|
| 100 |
RDEPEND=" |
| 101 |
@@ -33,9 +29,7 @@ RDEPEND=" |
| 102 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
| 103 |
>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}] |
| 104 |
debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) |
| 105 |
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) |
| 106 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 107 |
- opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] ) |
| 108 |
X? ( |
| 109 |
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
| 110 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 111 |
@@ -74,18 +68,6 @@ multilib_src_configure() { |
| 112 |
$(meson_use gtk-doc gtk_doc) |
| 113 |
) |
| 114 |
|
| 115 |
- if use opengl; then |
| 116 |
- emesonargs+=(-Dgl-backend=gl) |
| 117 |
- elif use gles2-only; then |
| 118 |
- if use gles3; then |
| 119 |
- emesonargs+=(-Dgl-backend=glesv3) |
| 120 |
- else |
| 121 |
- emesonargs+=(-Dgl-backend=glesv2) |
| 122 |
- fi |
| 123 |
- else |
| 124 |
- emesonargs+=(-Dgl-backend=disabled) |
| 125 |
- fi |
| 126 |
- |
| 127 |
meson_src_configure |
| 128 |
} |
Archives