| 1 |
commit: 3223d181adbf119d3578fd2df9773c16f927c80a |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 11 11:00:48 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 11 11:33:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3223d181 |
| 7 |
|
| 8 |
gui-libs/egl-wayland: tidy older versions |
| 9 |
|
| 10 |
Notably EAPI7->8 for 1.1.7 and rely on newer libglvnd to drop |
| 11 |
append-cppflags workaround, no need for a revbump in this case. |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild | 13 +++---------- |
| 16 |
gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild | 6 +++--- |
| 17 |
2 files changed, 6 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild |
| 20 |
index be21463cf525..5b4dc823c52e 100644 |
| 21 |
--- a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild |
| 22 |
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild |
| 23 |
@@ -1,9 +1,9 @@ |
| 24 |
# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=7 |
| 28 |
+EAPI=8 |
| 29 |
|
| 30 |
-inherit flag-o-matic meson |
| 31 |
+inherit meson |
| 32 |
|
| 33 |
DESCRIPTION="EGLStream-based Wayland external platform" |
| 34 |
HOMEPAGE="https://github.com/NVIDIA/egl-wayland" |
| 35 |
@@ -19,20 +19,13 @@ RDEPEND=" |
| 36 |
DEPEND=" |
| 37 |
${RDEPEND} |
| 38 |
gui-libs/eglexternalplatform |
| 39 |
- media-libs/libglvnd" |
| 40 |
+ >=media-libs/libglvnd-1.3.4" |
| 41 |
BDEPEND="dev-util/wayland-scanner" |
| 42 |
|
| 43 |
PATCHES=( |
| 44 |
"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch |
| 45 |
) |
| 46 |
|
| 47 |
-src_configure() { |
| 48 |
- # EGLStream is not intended for X11, always build without (bug #777558) |
| 49 |
- append-cppflags -DEGL_NO_X11 |
| 50 |
- |
| 51 |
- meson_src_configure |
| 52 |
-} |
| 53 |
- |
| 54 |
src_install() { |
| 55 |
meson_src_install |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild |
| 59 |
index 62302305e3f4..984ad1e0b540 100644 |
| 60 |
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild |
| 61 |
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild |
| 62 |
@@ -5,12 +5,12 @@ EAPI=8 |
| 63 |
|
| 64 |
inherit meson |
| 65 |
|
| 66 |
-MY_COMMIT="582b2d345abaa0e313cf16c902e602084ea59551" |
| 67 |
+EGLWAYLAND_HASH="582b2d345abaa0e313cf16c902e602084ea59551" |
| 68 |
|
| 69 |
DESCRIPTION="EGLStream-based Wayland external platform" |
| 70 |
HOMEPAGE="https://github.com/NVIDIA/egl-wayland" |
| 71 |
-SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 72 |
-S="${WORKDIR}/${PN}-${MY_COMMIT}" |
| 73 |
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${EGLWAYLAND_HASH}.tar.gz -> ${P}.tar.gz" |
| 74 |
+S="${WORKDIR}/${PN}-${EGLWAYLAND_HASH}" |
| 75 |
|
| 76 |
LICENSE="MIT" |
| 77 |
SLOT="0" |
Archives