commit: f97fc556d39ba367e147c5339952d18780c96d0d
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat May 8 06:12:59 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat May 8 06:14:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f97fc556
media-gfx/bonzomatic: Fix dependencies for vendored glfw and glew
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild | 30 ++++++++++++++++++++---
media-gfx/bonzomatic/bonzomatic-9999.ebuild | 30 ++++++++++++++++++++---
media-gfx/bonzomatic/metadata.xml | 1 +
3 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
b/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
index 441dd7340..ee701bf37 100644
--- a/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
@@ -20,27 +20,49 @@ fi
LICENSE="Unlicense"
SLOT="0"
-IUSE="system-glfw system-glew system-stb system-kissfft"
+IUSE="system-glfw system-glew system-stb system-kissfft wayland"
# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# !system-glfw copied from media-libs/glfw-3.3.3::gentoo
+# !system-glew copied from media-libs/glew-2.2.0::gentoo
DEPEND="
system-glfw? ( media-libs/glfw )
+ !system-glfw? (
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[egl,wayland]
+ dev-libs/wayland-protocols
+ )
+ !wayland? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXi
+ )
+ )
system-glew? ( media-libs/glew:= )
+ !system-glew? (
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXi-1.7.2
+ >=x11-libs/libXmu-1.1.1-r1
+ )
system-stb? ( dev-libs/stb )
system-kissfft? ( sci-libs/kissfft )
virtual/opengl
virtual/glu
media-libs/alsa-lib
media-libs/fontconfig
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXcursor
"
RDEPEND="${DEPEND}"
+BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"
src_configure() {
local mycmakeargs=(
-DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
+ -DGLFW_USE_WAYLAND="$(usex wayland)"
-DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
-DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft)
diff --git a/media-gfx/bonzomatic/bonzomatic-9999.ebuild
b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
index 441dd7340..ee701bf37 100644
--- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
@@ -20,27 +20,49 @@ fi
LICENSE="Unlicense"
SLOT="0"
-IUSE="system-glfw system-glew system-stb system-kissfft"
+IUSE="system-glfw system-glew system-stb system-kissfft wayland"
# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# !system-glfw copied from media-libs/glfw-3.3.3::gentoo
+# !system-glew copied from media-libs/glew-2.2.0::gentoo
DEPEND="
system-glfw? ( media-libs/glfw )
+ !system-glfw? (
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[egl,wayland]
+ dev-libs/wayland-protocols
+ )
+ !wayland? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXi
+ )
+ )
system-glew? ( media-libs/glew:= )
+ !system-glew? (
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXi-1.7.2
+ >=x11-libs/libXmu-1.1.1-r1
+ )
system-stb? ( dev-libs/stb )
system-kissfft? ( sci-libs/kissfft )
virtual/opengl
virtual/glu
media-libs/alsa-lib
media-libs/fontconfig
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXcursor
"
RDEPEND="${DEPEND}"
+BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"
src_configure() {
local mycmakeargs=(
-DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
+ -DGLFW_USE_WAYLAND="$(usex wayland)"
-DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
-DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft)
diff --git a/media-gfx/bonzomatic/metadata.xml
b/media-gfx/bonzomatic/metadata.xml
index 555bdeb3f..812aa7482 100644
--- a/media-gfx/bonzomatic/metadata.xml
+++ b/media-gfx/bonzomatic/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<use>
<flag name="system-glfw">Use the systems installed version of
GLFW (upstream-unsupported)</flag>
+ <flag name="wayland">Build non-system-glfw for wayland instead
of X11</flag>
<flag name="system-glew">Use the systems installed version of
GLEW (upstream-unsupported)</flag>
<flag name="system-stb">Use the systems installed version of
STB (upstream-unsupported)</flag>
<flag name="system-kissfft">Use the systems installed version
of Kissfft (upstream-unsupported)</flag>
