From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1601032-garchives=archives.gentoo.org@lists.gentoo.org>
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 4777515808B
for <garchives@archives.gentoo.org>; Sat, 17 Feb 2024 02:40:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90F99E29FF;
Sat, 17 Feb 2024 02:40:18 +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 4BF3EE29FF
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Feb 2024 02:40:18 +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 6D73133BEE9
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Feb 2024 02:40:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CAE5014D3
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Feb 2024 02:40:14 +0000 (UTC)
From: "Rui Huang" <vowstar@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rui Huang" <vowstar@gmail.com>
Message-ID: <1708120206.e887b0bb7ed88c35f1e81fcf680ce35cf147d046.vowstar@gentoo>
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: media-libs/imgui/imgui-1.87-r6.ebuild media-libs/imgui/imgui-1.87-r8.ebuild media-libs/imgui/imgui-1.87-r9.ebuild
X-VCS-Directories: media-libs/imgui/
X-VCS-Committer: vowstar
X-VCS-Committer-Name: Rui Huang
X-VCS-Revision: e887b0bb7ed88c35f1e81fcf680ce35cf147d046
X-VCS-Branch: master
Date: Sat, 17 Feb 2024 02:40:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8f9bcd9d-aa4e-4f84-ac2f-ca0ef28ac619
X-Archives-Hash: 1e92e6229324bc99151d6d5982ecd667
commit: e887b0bb7ed88c35f1e81fcf680ce35cf147d046
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Fri Feb 16 21:48:23 2024 +0000
Commit: Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Fri Feb 16 21:50:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e887b0bb
media-libs/imgui: drop 1.87-r6, 1.87-r8, add 1.87-r9
* fix bug with patch applying before imgui folder be added
Closes: https://bugs.gentoo.org/924126
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
media-libs/imgui/imgui-1.87-r6.ebuild | 113 ---------------------
.../{imgui-1.87-r8.ebuild => imgui-1.87-r9.ebuild} | 13 ++-
2 files changed, 10 insertions(+), 116 deletions(-)
diff --git a/media-libs/imgui/imgui-1.87-r6.ebuild b/media-libs/imgui/imgui-1.87-r6.ebuild
deleted file mode 100644
index 3752923094..0000000000
--- a/media-libs/imgui/imgui-1.87-r6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Bloat-free graphical user interface library for C++"
-HOMEPAGE="
- https://github.com/ocornut/imgui
- https://github.com/cimgui/cimgui
-"
-SRC_URI="
- https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
- https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz -> c${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="allegro bindings examples freetype glfw glut opengl sdl vulkan"
-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 )
-"
-DEPEND="
- ${RDEPEND}
- vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
- bindings? ( dev-lang/luajit )
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- || (
- allegro
- glfw
- glut
- sdl
- )
- || (
- allegro
- opengl
- vulkan
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" )
-
-src_prepare() {
- pushd ../ || die
- rm -rf "${S}/imgui" || die
- mv "${P}" "${S}/imgui" || die
- pushd "${S}/imgui" || die
-
- # imgui
- rm -r examples/libs || die
- rm -r misc/*/*.ttf || die
- rm -r misc/single_file || die
-
- cp "${FILESDIR}/${P}-CMakeLists.txt" CMakeLists.txt || die
- cp "${FILESDIR}/imgui.pc.in" imgui.pc.in || die
- sed -e "s|@version@|${PV}|g" -i imgui.pc.in || die
-
- pushd "${S}" || die
- cp "${FILESDIR}/c${P}-CMakeLists.txt" CMakeLists.txt || die
- # remove files to be generated
- rm cimgui.cpp cimgui.h || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DIMGUI_ALLEGRO=$(usex allegro)
- -DIMGUI_BINDINGS=$(usex bindings)
- -DIMGUI_EXAMPLES=$(usex examples)
- -DIMGUI_FREETYPE=$(usex freetype)
- -DIMGUI_GLFW=$(usex glfw)
- -DIMGUI_GLUT=$(usex glut)
- -DIMGUI_OPENGL=$(usex opengl)
- -DIMGUI_SDL=$(usex sdl)
- -DIMGUI_VULKAN=$(usex vulkan)
- )
- cmake_src_configure
-}
-
-src_install() {
-
- cmake_src_install
-
- pushd imgui || die
- # imgui
- rm -rf misc/{fonts,freetype} || die
- dodoc -r misc
-
- popd || die
-
- if use bindings; then
- # cimgui
-
- insinto "/usr/share/doc/${PF}/cimgui"
- doins README.md TODO.txt
- fi
-}
diff --git a/media-libs/imgui/imgui-1.87-r8.ebuild b/media-libs/imgui/imgui-1.87-r9.ebuild
similarity index 92%
rename from media-libs/imgui/imgui-1.87-r8.ebuild
rename to media-libs/imgui/imgui-1.87-r9.ebuild
index 207cbbefce..27dc90b9ae 100644
--- a/media-libs/imgui/imgui-1.87-r8.ebuild
+++ b/media-libs/imgui/imgui-1.87-r9.ebuild
@@ -56,13 +56,20 @@ REQUIRED_USE="
PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" )
-multilib_src_prepare() {
- pushd ../ || die
+src_unpack() {
+ # unpack imgui and cimgui to ${WORKDIR}
+ unpack "${P}.gh.tar.gz"
+ unpack "c${P}.gh.tar.gz"
+
+ # move imgui to the proper location before the patch (Bug #924126)
+ pushd ${WORKDIR} || die
rm -rf "${S}/imgui" || die
mv "${P}" "${S}/imgui" || die
- pushd "${S}/imgui" || die
+}
+multilib_src_prepare() {
# imgui
+ pushd "${S}/imgui" || die
rm -r examples/libs || die
rm -r misc/*/*.ttf || die
rm -r misc/single_file || die