commit: e8c090f40a9bfdb2d9a3e45f3bbbb19410aa4229
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 17:49:44 2024 +0000
Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Wed Feb 7 17:59:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8c090f4
media-libs/imgui: add multilib support to imgui
* need for mangohud multilib support
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
.../{imgui-1.81.ebuild => imgui-1.81-r1.ebuild} | 16 +++++++--------
.../{imgui-1.87-r7.ebuild => imgui-1.87-r8.ebuild} | 24 +++++++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/media-libs/imgui/imgui-1.81.ebuild
b/media-libs/imgui/imgui-1.81-r1.ebuild
similarity index 76%
rename from media-libs/imgui/imgui-1.81.ebuild
rename to media-libs/imgui/imgui-1.81-r1.ebuild
index 22929f29b3..3c6e5ee7e8 100644
--- a/media-libs/imgui/imgui-1.81.ebuild
+++ b/media-libs/imgui/imgui-1.81-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson
+inherit meson-multilib
MESON_WRAP_VER="1"
@@ -24,12 +24,12 @@ IUSE="opengl vulkan glfw sdl2 marmalade allegro5"
RDEPEND="
dev-libs/stb:=
- media-libs/glew
- allegro5? ( media-libs/allegro:5 )
- glfw? ( media-libs/glfw:0 )
- opengl? ( virtual/opengl )
- sdl2? ( media-libs/libsdl2 )
- vulkan? ( media-libs/vulkan-loader )
+ media-libs/glew[${MULTILIB_USEDEP}]
+ allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
+ glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
"
DEPEND="
${RDEPEND}
@@ -50,7 +50,7 @@ src_unpack() {
unpack imgui-${PV}-${MESON_WRAP_VER}-meson-wrap.zip
}
-src_configure() {
+multilib_src_configure() {
local emesonargs=(
-Ddx9=disabled
-Ddx10=disabled
diff --git a/media-libs/imgui/imgui-1.87-r7.ebuild
b/media-libs/imgui/imgui-1.87-r8.ebuild
similarity index 80%
rename from media-libs/imgui/imgui-1.87-r7.ebuild
rename to media-libs/imgui/imgui-1.87-r8.ebuild
index 49227f0f47..01d08089c8 100644
--- a/media-libs/imgui/imgui-1.87-r7.ebuild
+++ b/media-libs/imgui/imgui-1.87-r8.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit cmake-multilib
DESCRIPTION="Bloat-free graphical user interface library for C++"
HOMEPAGE="
@@ -15,7 +15,7 @@ SRC_URI="
https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz ->
c${P}.gh.tar.gz
"
-LICENSE="MIT"
+LICENSE="MIT"multilib
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="allegro bindings examples freetype glfw glut opengl sdl vulkan"
@@ -23,13 +23,13 @@ S="${WORKDIR}/c${P}"
RDEPEND="
dev-libs/stb:=
- allegro? ( media-libs/allegro:5 )
- freetype? ( media-libs/freetype )
- glfw? ( media-libs/glfw:0 )
- glut? ( media-libs/freeglut )
- opengl? ( virtual/opengl )
- sdl? ( media-libs/libsdl2 )
- vulkan? ( media-libs/vulkan-loader )
+ allegro? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
+ freetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+ glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
+ glut? ( media-libs/freeglut[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
"
DEPEND="
${RDEPEND}
@@ -56,7 +56,7 @@ REQUIRED_USE="
PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" )
-src_prepare() {
+multilib_src_prepare() {
pushd ../ || die
rm -rf "${S}/imgui" || die
mv "${P}" "${S}/imgui" || die
@@ -78,7 +78,7 @@ src_prepare() {
cmake_src_prepare
}
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DIMGUI_ALLEGRO=$(usex allegro)
-DIMGUI_BINDINGS=$(usex bindings)
@@ -93,7 +93,7 @@ src_configure() {
cmake_src_configure
}
-src_install() {
+multilib_src_install() {
cmake_src_install
