Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
Date: Thu, 23 Jun 2022 20:12:45
Message-Id: 1656015142.19f87fab275883d611ec8e6cf8102e470f4b18d5.soap@gentoo
1 commit: 19f87fab275883d611ec8e6cf8102e470f4b18d5
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 23 20:12:22 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 23 20:12:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f87fab
7
8 media-libs/cogl: update EAPI 6 -> 8
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 ...cogl-1.22.8-r1.ebuild => cogl-1.22.8-r2.ebuild} | 37 ++++++++++------------
13 1 file changed, 17 insertions(+), 20 deletions(-)
14
15 diff --git a/media-libs/cogl/cogl-1.22.8-r1.ebuild b/media-libs/cogl/cogl-1.22.8-r2.ebuild
16 similarity index 88%
17 rename from media-libs/cogl/cogl-1.22.8-r1.ebuild
18 rename to media-libs/cogl/cogl-1.22.8-r2.ebuild
19 index a5e772c9b85e..89cfdd28232c 100644
20 --- a/media-libs/cogl/cogl-1.22.8-r1.ebuild
21 +++ b/media-libs/cogl/cogl-1.22.8-r2.ebuild
22 @@ -1,29 +1,31 @@
23 # Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=6
27 +EAPI=8
28
29 # Temporarily needed for slibtool patch
30 # It's upstreamed so should be able to drop in future
31 # bug #778041
32 GNOME2_EAUTORECONF="yes"
33 -inherit gnome2 multilib
34 +inherit gnome2
35
36 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
37 HOMEPAGE="https://www.cogl3d.org/"
38
39 LICENSE="MIT BSD"
40 SLOT="1.0/20" # subslot = .so version
41 -
42 +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
43 # doc and profile disable for now due to bugs #484750 and #483332
44 IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
45 REQUIRED_USE="
46 wayland? ( gles2 )
47 || ( gles2 opengl )
48 "
49 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
50 +# Need classic mesa swrast for tests, llvmpipe causes a test failure
51 +# For some reason GL3 conformance test all fails again...
52 +RESTRICT="test"
53
54 -COMMON_DEPEND="
55 +DEPEND="
56 >=dev-libs/glib-2.32:2
57 x11-libs/cairo:=
58 >=x11-libs/gdk-pixbuf-2:2
59 @@ -37,30 +39,26 @@ COMMON_DEPEND="
60 gles2? ( media-libs/mesa[gles2] )
61 gstreamer? (
62 media-libs/gstreamer:1.0
63 - media-libs/gst-plugins-base:1.0 )
64 + media-libs/gst-plugins-base:1.0
65 + )
66 introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
67 kms? (
68 media-libs/mesa[egl(+),gbm(+)]
69 - x11-libs/libdrm:= )
70 + x11-libs/libdrm:=
71 + )
72 pango? ( >=x11-libs/pango-1.20.0[introspection?] )
73 wayland? (
74 >=dev-libs/wayland-1.1.90
75 - media-libs/mesa[egl(+),wayland] )
76 + media-libs/mesa[egl(+),wayland]
77 + )
78 "
79 -# before clutter-1.7, cogl was part of clutter
80 -RDEPEND="${COMMON_DEPEND}
81 - !<media-libs/clutter-1.7
82 -"
83 -DEPEND="${COMMON_DEPEND}
84 +RDEPEND="${DEPEND}"
85 +BDEPEND="
86 dev-util/glib-utils
87 >=sys-devel/gettext-0.19
88 virtual/pkgconfig
89 "
90
91 -# Need classic mesa swrast for tests, llvmpipe causes a test failure
92 -# For some reason GL3 conformance test all fails again...
93 -RESTRICT="test"
94 -
95 PATCHES=(
96 "${FILESDIR}"/${P}-slibtool.patch
97 )
98 @@ -100,7 +98,7 @@ src_configure() {
99 $(use_enable gles2) \
100 $(use_enable gles2 cogl-gles2) \
101 $(use_enable gles2 xlib-egl-platform) \
102 - $(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
103 + $(usev gles2 --with-default-driver=$(usex opengl gl gles2)) \
104 $(use_enable gstreamer cogl-gst) \
105 $(use_enable introspection) \
106 $(use_enable kms kms-egl-platform) \
107 @@ -109,7 +107,6 @@ src_configure() {
108 $(use_enable wayland wayland-egl-platform) \
109 $(use_enable wayland wayland-egl-server) \
110 --disable-profile
111 -# $(use_enable profile)
112 }
113
114 src_install() {
115 @@ -122,5 +119,5 @@ src_install() {
116 gnome2_src_install
117
118 # Remove silly examples-data directory
119 - rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
120 + rm -rvf "${ED}"/usr/share/cogl/examples-data/ || die
121 }