1 |
commit: 0dd0dbedfd0b5366161075e56e5a32f67991288f |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 30 22:00:58 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 30 22:01:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd0dbed |
7 |
|
8 |
media-libs/waffle: Drop old versions |
9 |
|
10 |
Bug: https://bugs.gentoo.org/768021 |
11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
12 |
|
13 |
media-libs/waffle/Manifest | 2 - |
14 |
...ate-cmake-config-and-version-files-if-mes.patch | 87 ---------------------- |
15 |
media-libs/waffle/waffle-1.6.1-r1.ebuild | 68 ----------------- |
16 |
media-libs/waffle/waffle-1.6.2.ebuild | 71 ------------------ |
17 |
4 files changed, 228 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest |
20 |
index 648aa7b92f7..fccd4b6aa37 100644 |
21 |
--- a/media-libs/waffle/Manifest |
22 |
+++ b/media-libs/waffle/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f |
25 |
-DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B 62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf SHA512 2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf |
26 |
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2 |
27 |
|
28 |
diff --git a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch |
29 |
deleted file mode 100644 |
30 |
index ef31275de08..00000000000 |
31 |
--- a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch |
32 |
+++ /dev/null |
33 |
@@ -1,87 +0,0 @@ |
34 |
-From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001 |
35 |
-From: Dylan Baker <dylan@×××××××××.com> |
36 |
-Date: Fri, 7 Jun 2019 15:36:09 -0700 |
37 |
-Subject: [PATCH] meson: Generate cmake config and version files if meson is |
38 |
- new enough |
39 |
- |
40 |
-Meson 0.50.0 added a module similar to the pkg-config module for |
41 |
-generating cmake config files. Since the CMake build system provides |
42 |
-these the meson build system should as well. |
43 |
- |
44 |
-v2: - Bump version to 0.50 instead of incorrect 0.49 |
45 |
-v3: - remove TODO comment that this fixes |
46 |
- - Add a definition of set_and_check for meson-generated Config |
47 |
- files. |
48 |
- |
49 |
-Reviewed-by: Eric Engestrom <eric.engestrom@×××××.com> |
50 |
---- |
51 |
- cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++ |
52 |
- meson.build | 2 -- |
53 |
- src/waffle/meson.build | 20 ++++++++++++++++++++ |
54 |
- 3 files changed, 30 insertions(+), 2 deletions(-) |
55 |
- |
56 |
-diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in |
57 |
-index b60b470..4e19755 100644 |
58 |
---- a/cmake/Modules/WaffleConfig.cmake.in |
59 |
-+++ b/cmake/Modules/WaffleConfig.cmake.in |
60 |
-@@ -7,6 +7,16 @@ |
61 |
- |
62 |
- @PACKAGE_INIT@ |
63 |
- |
64 |
-+# This should only be used for meson |
65 |
-+if (NOT DEFINED set_and_check) |
66 |
-+ macro(set_and_check _var _file) |
67 |
-+ set(${_var} "${_file}") |
68 |
-+ if(NOT EXISTS "${_file}") |
69 |
-+ message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") |
70 |
-+ endif() |
71 |
-+ endmacro() |
72 |
-+endif() |
73 |
-+ |
74 |
- set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@") |
75 |
- set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") |
76 |
- set(Waffle_LIBRARIES "@waffle_libname@") |
77 |
-diff --git a/meson.build b/meson.build |
78 |
-index 29fda22..22b7f59 100644 |
79 |
---- a/meson.build |
80 |
-+++ b/meson.build |
81 |
-@@ -231,5 +231,3 @@ endif |
82 |
- if get_option('build-examples') |
83 |
- subdir('examples') |
84 |
- endif |
85 |
-- |
86 |
--# TODO: CMake config file |
87 |
-diff --git a/src/waffle/meson.build b/src/waffle/meson.build |
88 |
-index 322df40..cd68ddf 100644 |
89 |
---- a/src/waffle/meson.build |
90 |
-+++ b/src/waffle/meson.build |
91 |
-@@ -211,6 +211,26 @@ pkg.generate( |
92 |
- description : 'A library for selecting an OpenGL API and windows system at runtime.', |
93 |
- ) |
94 |
- |
95 |
-+if meson.version().version_compare('>= 0.50') |
96 |
-+ cmake = import('cmake') |
97 |
-+ cmake.write_basic_package_version_file( |
98 |
-+ name : 'Waffle', |
99 |
-+ version : meson.project_version(), |
100 |
-+ compatibility : 'SameMajorVersion', |
101 |
-+ ) |
102 |
-+ |
103 |
-+ cmake_conf = configuration_data() |
104 |
-+ cmake_conf.set('waffle_libname', waffle_name) |
105 |
-+ cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir'))) |
106 |
-+ cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir'))) |
107 |
-+ |
108 |
-+ cmake.configure_package_config_file( |
109 |
-+ name : 'Waffle', |
110 |
-+ input : '../../cmake/Modules/WaffleConfig.cmake.in', |
111 |
-+ configuration : cmake_conf, |
112 |
-+ ) |
113 |
-+endif |
114 |
-+ |
115 |
- if get_option('build-tests') |
116 |
- if get_option('default_library') == 'shared' |
117 |
- # The unit tests need to poke at internals of the library, but with a |
118 |
--- |
119 |
-2.24.1 |
120 |
- |
121 |
|
122 |
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild b/media-libs/waffle/waffle-1.6.1-r1.ebuild |
123 |
deleted file mode 100644 |
124 |
index 6bd3d6db745..00000000000 |
125 |
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild |
126 |
+++ /dev/null |
127 |
@@ -1,68 +0,0 @@ |
128 |
-# Copyright 1999-2020 Gentoo Authors |
129 |
-# Distributed under the terms of the GNU General Public License v2 |
130 |
- |
131 |
-EAPI=7 |
132 |
- |
133 |
-if [[ ${PV} = *9999* ]]; then |
134 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" |
135 |
- GIT_ECLASS="git-r3" |
136 |
-else |
137 |
- SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz" |
138 |
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" |
139 |
-fi |
140 |
-inherit meson multilib-minimal ${GIT_ECLASS} |
141 |
- |
142 |
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime" |
143 |
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle" |
144 |
- |
145 |
-LICENSE="BSD-2" |
146 |
-SLOT="0" |
147 |
-IUSE="doc +egl +gbm wayland X" |
148 |
-RESTRICT="test" # gl_basic tests don't work when run from portage |
149 |
- |
150 |
-RDEPEND=" |
151 |
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] |
152 |
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
153 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
154 |
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
155 |
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
156 |
- wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) |
157 |
-" |
158 |
-DEPEND="${RDEPEND} |
159 |
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] |
160 |
-" |
161 |
-BDEPEND=" |
162 |
- dev-libs/libxslt |
163 |
- app-text/docbook-xml-dtd:4.2 |
164 |
-" |
165 |
- |
166 |
-PATCHES=( |
167 |
- "${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch |
168 |
-) |
169 |
- |
170 |
-MULTILIB_CHOST_TOOLS=( |
171 |
- /usr/bin/wflinfo$(get_exeext) |
172 |
-) |
173 |
- |
174 |
-multilib_src_configure() { |
175 |
- local emesonargs=( |
176 |
- $(meson_feature X glx) |
177 |
- $(meson_feature wayland) |
178 |
- $(meson_feature X x11_egl) |
179 |
- $(meson_feature gbm) |
180 |
- $(meson_feature egl surfaceless_egl) |
181 |
- -Dbuild-manpages=true |
182 |
- -Dbuild-tests=false |
183 |
- ) |
184 |
- meson_src_configure |
185 |
-} |
186 |
- |
187 |
-multilib_src_compile() { |
188 |
- meson_src_compile |
189 |
-} |
190 |
- |
191 |
-multilib_src_install() { |
192 |
- meson_src_install |
193 |
- |
194 |
- ! use doc && rm -rf "${D}"/usr/share/doc/waffle1 |
195 |
-} |
196 |
|
197 |
diff --git a/media-libs/waffle/waffle-1.6.2.ebuild b/media-libs/waffle/waffle-1.6.2.ebuild |
198 |
deleted file mode 100644 |
199 |
index a1d9e8bbbf2..00000000000 |
200 |
--- a/media-libs/waffle/waffle-1.6.2.ebuild |
201 |
+++ /dev/null |
202 |
@@ -1,71 +0,0 @@ |
203 |
-# Copyright 1999-2020 Gentoo Authors |
204 |
-# Distributed under the terms of the GNU General Public License v2 |
205 |
- |
206 |
-EAPI=7 |
207 |
- |
208 |
-if [[ ${PV} = *9999* ]]; then |
209 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" |
210 |
- GIT_ECLASS="git-r3" |
211 |
-else |
212 |
- SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" |
213 |
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" |
214 |
- S="${WORKDIR}"/${PN}-v${PV} |
215 |
-fi |
216 |
-inherit meson multilib-minimal ${GIT_ECLASS} |
217 |
- |
218 |
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime" |
219 |
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle" |
220 |
- |
221 |
-LICENSE="BSD-2" |
222 |
-SLOT="0" |
223 |
-IUSE="doc +egl +gbm wayland X" |
224 |
-RESTRICT="test" # gl_basic tests don't work when run from portage |
225 |
- |
226 |
-RDEPEND=" |
227 |
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] |
228 |
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
229 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
230 |
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
231 |
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
232 |
- wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) |
233 |
-" |
234 |
-DEPEND="${RDEPEND} |
235 |
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] |
236 |
-" |
237 |
-BDEPEND=" |
238 |
- dev-libs/libxslt |
239 |
- app-text/docbook-xml-dtd:4.2 |
240 |
-" |
241 |
- |
242 |
-PATCHES=( |
243 |
- "${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch |
244 |
-) |
245 |
- |
246 |
-MULTILIB_CHOST_TOOLS=( |
247 |
- /usr/bin/wflinfo$(get_exeext) |
248 |
-) |
249 |
- |
250 |
-multilib_src_configure() { |
251 |
- local emesonargs=( |
252 |
- $(meson_feature X glx) |
253 |
- $(meson_feature wayland) |
254 |
- $(meson_feature X x11_egl) |
255 |
- $(meson_feature gbm) |
256 |
- $(meson_feature egl surfaceless_egl) |
257 |
- -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false) |
258 |
- -Dbuild-tests=false |
259 |
- ) |
260 |
- meson_src_configure |
261 |
-} |
262 |
- |
263 |
-multilib_src_compile() { |
264 |
- meson_src_compile |
265 |
-} |
266 |
- |
267 |
-multilib_src_install() { |
268 |
- meson_src_install |
269 |
- |
270 |
- ! use doc && rm -rf \ |
271 |
- "${D}"/usr/share/doc/waffle1 \ |
272 |
- "${D}"/usr/share/man/man{3,7} |
273 |
-} |