1 |
commit: f87e81997e158c6fed35169a281f88b4385c509a |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 17 17:45:59 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 17 17:51:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87e8199 |
7 |
|
8 |
media-libs/cogl: drop unnecessary test deps with tests restricted |
9 |
|
10 |
Bug: https://bugs.gentoo.org/692212 |
11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
media-libs/cogl/cogl-1.22.2.ebuild | 39 ++++++++++++-------------------------- |
15 |
media-libs/cogl/cogl-1.22.4.ebuild | 37 +++++++++++------------------------- |
16 |
2 files changed, 23 insertions(+), 53 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild |
19 |
index 0a029d23e07..c3702f70dec 100644 |
20 |
--- a/media-libs/cogl/cogl-1.22.2.ebuild |
21 |
+++ b/media-libs/cogl/cogl-1.22.2.ebuild |
22 |
@@ -1,9 +1,9 @@ |
23 |
-# Copyright 1999-2018 Gentoo Authors |
24 |
+# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
|
29 |
-inherit gnome2 multilib virtualx |
30 |
+inherit gnome2 multilib |
31 |
|
32 |
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" |
33 |
HOMEPAGE="https://www.cogl3d.org/" |
34 |
@@ -12,7 +12,7 @@ LICENSE="MIT BSD" |
35 |
SLOT="1.0/20" # subslot = .so version |
36 |
|
37 |
# doc and profile disable for now due to bugs #484750 and #483332 |
38 |
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile |
39 |
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile |
40 |
REQUIRED_USE=" |
41 |
wayland? ( gles2 ) |
42 |
|| ( gles2 opengl ) |
43 |
@@ -52,9 +52,6 @@ DEPEND="${COMMON_DEPEND} |
44 |
>=dev-util/gtk-doc-am-1.13 |
45 |
>=sys-devel/gettext-0.19 |
46 |
virtual/pkgconfig |
47 |
- test? ( |
48 |
- app-eselect/eselect-opengl |
49 |
- media-libs/mesa[classic] ) |
50 |
" |
51 |
|
52 |
# Need classic mesa swrast for tests, llvmpipe causes a test failure |
53 |
@@ -66,14 +63,14 @@ src_prepare() { |
54 |
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ |
55 |
-i Makefile.am Makefile.in || die |
56 |
|
57 |
- if ! use test ; then |
58 |
- # For some reason the configure switch will not completely disable |
59 |
- # tests being built |
60 |
- sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ |
61 |
- -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ |
62 |
- -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ |
63 |
- -i Makefile.am Makefile.in || die |
64 |
- fi |
65 |
+ #if ! use test ; then |
66 |
+ # For some reason the configure switch will not completely disable |
67 |
+ # tests being built |
68 |
+ sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ |
69 |
+ -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ |
70 |
+ -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ |
71 |
+ -i Makefile.am Makefile.in || die |
72 |
+ #fi |
73 |
|
74 |
gnome2_src_prepare |
75 |
} |
76 |
@@ -101,25 +98,13 @@ src_configure() { |
77 |
$(use_enable introspection) \ |
78 |
$(use_enable kms kms-egl-platform) \ |
79 |
$(use_enable pango cogl-pango) \ |
80 |
- $(use_enable test unit-tests) \ |
81 |
+ --disable-unit-tests \ |
82 |
$(use_enable wayland wayland-egl-platform) \ |
83 |
$(use_enable wayland wayland-egl-server) \ |
84 |
--disable-profile |
85 |
# $(use_enable profile) |
86 |
} |
87 |
|
88 |
-src_test() { |
89 |
- # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails |
90 |
- # NOTE: recheck if this is needed after every mesa bump |
91 |
- if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then |
92 |
- ewarn "Skipping tests because a binary OpenGL library is enabled. To" |
93 |
- ewarn "run tests for ${PN}, you need to enable the Mesa library:" |
94 |
- ewarn "# eselect opengl set xorg-x11" |
95 |
- return |
96 |
- fi |
97 |
- virtx emake check LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" |
98 |
-} |
99 |
- |
100 |
src_install() { |
101 |
if use examples; then |
102 |
insinto /usr/share/doc/${PF}/examples |
103 |
|
104 |
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild |
105 |
index 7061df2b3cd..2191b69cd4a 100644 |
106 |
--- a/media-libs/cogl/cogl-1.22.4.ebuild |
107 |
+++ b/media-libs/cogl/cogl-1.22.4.ebuild |
108 |
@@ -3,7 +3,7 @@ |
109 |
|
110 |
EAPI=6 |
111 |
|
112 |
-inherit gnome2 multilib virtualx |
113 |
+inherit gnome2 multilib |
114 |
|
115 |
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" |
116 |
HOMEPAGE="https://www.cogl3d.org/" |
117 |
@@ -12,7 +12,7 @@ LICENSE="MIT BSD" |
118 |
SLOT="1.0/20" # subslot = .so version |
119 |
|
120 |
# doc and profile disable for now due to bugs #484750 and #483332 |
121 |
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile |
122 |
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile |
123 |
REQUIRED_USE=" |
124 |
wayland? ( gles2 ) |
125 |
|| ( gles2 opengl ) |
126 |
@@ -52,9 +52,6 @@ DEPEND="${COMMON_DEPEND} |
127 |
>=dev-util/gtk-doc-am-1.13 |
128 |
>=sys-devel/gettext-0.19 |
129 |
virtual/pkgconfig |
130 |
- test? ( |
131 |
- app-eselect/eselect-opengl |
132 |
- media-libs/mesa[classic] ) |
133 |
" |
134 |
|
135 |
# Need classic mesa swrast for tests, llvmpipe causes a test failure |
136 |
@@ -66,14 +63,14 @@ src_prepare() { |
137 |
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ |
138 |
-i Makefile.am Makefile.in || die |
139 |
|
140 |
- if ! use test ; then |
141 |
- # For some reason the configure switch will not completely disable |
142 |
- # tests being built |
143 |
- sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ |
144 |
- -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ |
145 |
- -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ |
146 |
- -i Makefile.am Makefile.in || die |
147 |
- fi |
148 |
+ #if ! use test ; then |
149 |
+ # For some reason the configure switch will not completely disable |
150 |
+ # tests being built |
151 |
+ sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ |
152 |
+ -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ |
153 |
+ -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ |
154 |
+ -i Makefile.am Makefile.in || die |
155 |
+ #fi |
156 |
|
157 |
gnome2_src_prepare |
158 |
} |
159 |
@@ -101,25 +98,13 @@ src_configure() { |
160 |
$(use_enable introspection) \ |
161 |
$(use_enable kms kms-egl-platform) \ |
162 |
$(use_enable pango cogl-pango) \ |
163 |
- $(use_enable test unit-tests) \ |
164 |
+ --disable-unit-tests \ |
165 |
$(use_enable wayland wayland-egl-platform) \ |
166 |
$(use_enable wayland wayland-egl-server) \ |
167 |
--disable-profile |
168 |
# $(use_enable profile) |
169 |
} |
170 |
|
171 |
-src_test() { |
172 |
- # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails |
173 |
- # NOTE: recheck if this is needed after every mesa bump |
174 |
- if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then |
175 |
- ewarn "Skipping tests because a binary OpenGL library is enabled. To" |
176 |
- ewarn "run tests for ${PN}, you need to enable the Mesa library:" |
177 |
- ewarn "# eselect opengl set xorg-x11" |
178 |
- return |
179 |
- fi |
180 |
- virtx emake check LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" |
181 |
-} |
182 |
- |
183 |
src_install() { |
184 |
if use examples; then |
185 |
insinto /usr/share/doc/${PF}/examples |