From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2B08158004 for ; Wed, 7 Feb 2024 17:59:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29CC3E29DD; Wed, 7 Feb 2024 17:59:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 130FCE29DD for ; Wed, 7 Feb 2024 17:59:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CFBF343100 for ; Wed, 7 Feb 2024 17:59:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC83314B7 for ; Wed, 7 Feb 2024 17:59:49 +0000 (UTC) From: "Gonçalo Negrier Duarte" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gonçalo Negrier Duarte" Message-ID: <1707328776.e8c090f40a9bfdb2d9a3e45f3bbbb19410aa4229.gonegrier.duarte@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-libs/imgui/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/imgui/imgui-1.81-r1.ebuild media-libs/imgui/imgui-1.81.ebuild media-libs/imgui/imgui-1.87-r7.ebuild media-libs/imgui/imgui-1.87-r8.ebuild X-VCS-Directories: media-libs/imgui/ X-VCS-Committer: gonegrier.duarte X-VCS-Committer-Name: Gonçalo Negrier Duarte X-VCS-Revision: e8c090f40a9bfdb2d9a3e45f3bbbb19410aa4229 X-VCS-Branch: dev Date: Wed, 7 Feb 2024 17:59:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 35f0f4cb-6a8c-4cb1-9918-e75265a7901d X-Archives-Hash: ca7d6821f9508a72984807fe36ca5daa commit: e8c090f40a9bfdb2d9a3e45f3bbbb19410aa4229 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Wed Feb 7 17:49:44 2024 +0000 Commit: Gonçalo Negrier Duarte gmail 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 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