[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2022-03-29  0:22 Ronny Gutbrod
  0 siblings, 0 replies; 15+ messages in thread
From: Ronny Gutbrod @ 2022-03-29  0:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ab60e471e906e5ac8b529cf7e964c1e875b0dccd
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Mar 27 18:22:04 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sun Mar 27 21:28:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ab60e471

media-libs/imgui: add 1.87

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/imgui/Manifest          |   1 +
 media-libs/imgui/imgui-1.87.ebuild | 157 +++++++++++++++++++++++++++++++++++++
 media-libs/imgui/metadata.xml      |   9 +++
 3 files changed, 167 insertions(+)

diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest
index 6b3f46883..9bbf158f0 100644
--- a/media-libs/imgui/Manifest
+++ b/media-libs/imgui/Manifest
@@ -1 +1,2 @@
 DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c
+DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2

diff --git a/media-libs/imgui/imgui-1.87.ebuild b/media-libs/imgui/imgui-1.87.ebuild
new file mode 100644
index 000000000..0b811f029
--- /dev/null
+++ b/media-libs/imgui/imgui-1.87.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bloat-free graphical user interface library for C++"
+HOMEPAGE="https://github.com/ocornut/imgui"
+SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="allegro examples freetype glfw glut opengl sdl vulkan"
+
+RDEPEND="
+	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="virtual/pkgconfig"
+
+REQUIRED_USE="
+	|| (
+		allegro
+		|| ( glfw glut sdl )
+		|| ( opengl vulkan )
+	)
+	examples? (
+		allegro
+		glfw
+		glut
+		opengl
+		sdl
+		vulkan
+	)
+"
+
+src_prepare() {
+	rm -r examples/libs || die
+	rm -r misc/*/*.ttf || die
+	rm -r misc/single_file || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+	append-cppflags "-DIMGUI_USE_WCHAR32"
+	append-cxxflags "-I${S} -I${S}/backends -I${S}/misc/freetype -fPIC -fpermissive"
+	local PKGCONF="$(tc-getPKG_CONFIG)" || die
+
+	use allegro && append-libs "-lallegro -lallegro_main -lallegro_primitives"
+	if use freetype; then
+		append-cppflags "-DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE"
+		append-cxxflags "$(${PKGCONF} --cflags freetype2)" || die
+		append-libs "$(${PKGCONF} --libs freetype2)" || die
+	fi
+	if use glfw; then
+		append-libs "$(${PKGCONF} --libs glfw3)" || die
+		append-cxxflags "$(${PKGCONF} --cflags glfw3)" || die
+	fi
+	if use glut; then
+		append-libs "$(${PKGCONF} --libs freeglut)" || die
+		append-cxxflags "$(${PKGCONF} --cflags freeglut)" || die
+	fi
+	use opengl && append-libs "-lGL"
+	if use sdl; then
+		append-libs "-ldl $(sdl2-config --libs)" || die
+		append-cxxflags "$(sdl2-config --cflags)" || die
+	fi
+	if use vulkan; then
+		append-libs "$(${PKGCONF} --libs vulkan)" || die
+		append-cxxflags "$(${PKGCONF} --cflags vulkan)" || die
+		append-cppflags "-DImTextureID=ImU64" || die
+	fi
+}
+
+src_compile() {
+	set -x || die
+
+	for i in imgui{,_draw,_demo,_tables,_widgets}; do
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c ${i}.cpp -o ${i}.o || die
+	done
+
+	if use freetype; then
+		pushd misc/freetype || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_freetype.cpp -o imgui_freetype.o || die
+		popd || die
+		pushd misc/fonts || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIE binary_to_compressed_c.cpp -o binary_to_compressed_c || die
+		popd || die
+	fi
+
+	pushd backends || die
+	if use allegro; then
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_allegro5.cpp -o imgui_impl_allegro5.o || die
+	fi
+	if use glfw; then
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_glfw.cpp -o imgui_impl_glfw.o || die
+	fi
+	if use glut; then
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_glut.cpp -o imgui_impl_glut.o || die
+	fi
+	if use opengl; then
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_opengl2.cpp -o imgui_impl_opengl2.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_opengl3.cpp -o imgui_impl_opengl3.o || die
+	fi
+	if use sdl; then
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_sdl.cpp -o imgui_impl_sdl.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_sdlrenderer.cpp -o imgui_impl_sdlrenderer.o || die
+	fi
+	if use vulkan; then
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_vulkan.cpp -o imgui_impl_vulkan.o || die
+	fi
+	popd || die
+	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -Wl,-soname,libimgui.so *.o backends/*.o misc/freetype/*.o -o libimgui.so ${LIBS} || die
+
+	if use examples; then
+		mkdir ex || die
+		for f in allegro5 glfw_opengl{2,3} glfw_vulkan null sdl_opengl{2,3} sdl_{sdlrenderer,vulkan} glut_opengl2 ; do
+			${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIE examples/example_${f}/main.cpp "-L${S}" -limgui ${LIBS} -o "${S}/ex/example_${f}" || die
+		done
+	fi
+
+	set +x || die
+}
+
+src_install() {
+	dolib.so libimgui.so
+	dodoc docs/*
+	insinto "/usr/include/imgui"
+	doins *.h
+	doins -r misc/*/*.h
+	doins backends/*.h
+	insinto "/usr/share/${PN}/backends"
+	doins -r backends/vulkan
+	exeinto "/usr/libexec/${PN}"
+	use freetype && doexe misc/fonts/binary_to_compressed_c
+	rm -rf misc/{fonts,freetype} || die
+	dodoc -r misc
+
+	if use examples; then
+		exeinto "/usr/libexec/${PN}/examples"
+		doexe ex/*
+		dodoc -r examples
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}

diff --git a/media-libs/imgui/metadata.xml b/media-libs/imgui/metadata.xml
index 25bcc732f..2a6d52b5d 100644
--- a/media-libs/imgui/metadata.xml
+++ b/media-libs/imgui/metadata.xml
@@ -10,4 +10,13 @@
         <bugs-to>https://github.com/ocornut/imgui/issues</bugs-to>
         <remote-id type="github">ocornut/imgui</remote-id>
     </upstream>
+    <use>
+        <flag name="allegro">Enable allegro backend and renderer</flag>
+        <flag name="freetype">Use FreeType to build and rasterize the font atlas</flag>
+        <flag name="glfw">Enable glfw backend</flag>
+        <flag name="glut">Enable glut backen</flag>
+        <flag name="opengl">Enable opengl renderer</flag>
+        <flag name="sdl">Enable sdl backend</flag>
+        <flag name="vulkan">Enable vulkan renderer</flag>
+    </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2022-04-04 14:49 Andrew Ammerlaan
  0 siblings, 0 replies; 15+ messages in thread
From: Andrew Ammerlaan @ 2022-04-04 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5c020d8f944c29c170388836cabd1f2e3cb46854
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr  3 17:29:14 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 23:48:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5c020d8f

media-libs/imgui: explicitly link the build objects

Closes: https://bugs.gentoo.org/836695
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 .../{imgui-1.87.ebuild => imgui-1.87-r1.ebuild}    | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/media-libs/imgui/imgui-1.87.ebuild b/media-libs/imgui/imgui-1.87-r1.ebuild
similarity index 71%
rename from media-libs/imgui/imgui-1.87.ebuild
rename to media-libs/imgui/imgui-1.87-r1.ebuild
index 0b811f029..4339ad386 100644
--- a/media-libs/imgui/imgui-1.87.ebuild
+++ b/media-libs/imgui/imgui-1.87-r1.ebuild
@@ -87,13 +87,17 @@ src_configure() {
 src_compile() {
 	set -x || die
 
+	local objects=()
+
 	for i in imgui{,_draw,_demo,_tables,_widgets}; do
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c ${i}.cpp -o ${i}.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c ${i}.cpp -o ${i}.o || die
+		objects+=( ${i}.o )
 	done
 
 	if use freetype; then
 		pushd misc/freetype || die
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_freetype.cpp -o imgui_freetype.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_freetype.cpp -o imgui_freetype.o || die
+		objects+=( misc/freetype/imgui_freetype.o )
 		popd || die
 		pushd misc/fonts || die
 		${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIE binary_to_compressed_c.cpp -o binary_to_compressed_c || die
@@ -102,27 +106,33 @@ src_compile() {
 
 	pushd backends || die
 	if use allegro; then
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_allegro5.cpp -o imgui_impl_allegro5.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_allegro5.cpp -o imgui_impl_allegro5.o || die
+		objects+=( backends/imgui_impl_allegro5.o )
 	fi
 	if use glfw; then
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_glfw.cpp -o imgui_impl_glfw.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_glfw.cpp -o imgui_impl_glfw.o || die
+		objects+=( backends/imgui_impl_glfw.o )
 	fi
 	if use glut; then
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_glut.cpp -o imgui_impl_glut.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_glut.cpp -o imgui_impl_glut.o || die
+		objects+=( backends/imgui_impl_glut.o )
 	fi
 	if use opengl; then
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_opengl2.cpp -o imgui_impl_opengl2.o || die
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_opengl3.cpp -o imgui_impl_opengl3.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_opengl2.cpp -o imgui_impl_opengl2.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_opengl3.cpp -o imgui_impl_opengl3.o || die
+		objects+=( backends/imgui_impl_opengl2.o backends/imgui_impl_opengl3.o )
 	fi
 	if use sdl; then
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_sdl.cpp -o imgui_impl_sdl.o || die
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_sdlrenderer.cpp -o imgui_impl_sdlrenderer.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_sdl.cpp -o imgui_impl_sdl.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_sdlrenderer.cpp -o imgui_impl_sdlrenderer.o || die
+		objects+=( backends/imgui_impl_sdl.o backends/imgui_impl_sdlrenderer.o )
 	fi
 	if use vulkan; then
-		${CXX} ${CXXFLAGS} ${CPPFLAGS} -c imgui_impl_vulkan.cpp -o imgui_impl_vulkan.o || die
+		${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_vulkan.cpp -o imgui_impl_vulkan.o || die
+		objects+=( backends/imgui_impl_vulkan.o )
 	fi
 	popd || die
-	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -Wl,-soname,libimgui.so *.o backends/*.o misc/freetype/*.o -o libimgui.so ${LIBS} || die
+	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -Wl,-soname,libimgui.so ${objects[@]} -o libimgui.so ${LIBS} || die
 
 	if use examples; then
 		mkdir ex || die


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2022-04-21 17:46 Arthur Zamarin
  0 siblings, 0 replies; 15+ messages in thread
From: Arthur Zamarin @ 2022-04-21 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     28d9358f121be9efa10fd2b266684d950fdc37e5
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Apr 21 00:51:58 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 00:51:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=28d9358f

media-libs/imgui: change required use logic

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/imgui/imgui-1.87-r2.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/media-libs/imgui/imgui-1.87-r2.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild
index f51097b79..0df42793d 100644
--- a/media-libs/imgui/imgui-1.87-r2.ebuild
+++ b/media-libs/imgui/imgui-1.87-r2.ebuild
@@ -45,12 +45,14 @@ PATCHES=( "${FILESDIR}/c${P}-fix-cmake.patch" )
 REQUIRED_USE="
 	|| (
 		allegro
-		|| (
-			glfw
-			glut
-			sdl
-		)
-		|| ( opengl vulkan )
+		glfw
+		glut
+		sdl
+	)
+	|| (
+		allegro
+		opengl
+		vulkan
 	)
 	examples? (
 		allegro


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2022-04-23 17:49 Haelwenn Monnier
  0 siblings, 0 replies; 15+ messages in thread
From: Haelwenn Monnier @ 2022-04-23 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7a70b14fb2c37af39205928d7d75a222e1cbb028
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Apr 23 13:25:06 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Apr 23 13:25:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7a70b14f

media-libs/imgui: do not require every use for the examples

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/imgui/imgui-1.87-r4.ebuild | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r4.ebuild
index 7bb3f6e42..0c83b5cdf 100644
--- a/media-libs/imgui/imgui-1.87-r4.ebuild
+++ b/media-libs/imgui/imgui-1.87-r4.ebuild
@@ -52,14 +52,6 @@ REQUIRED_USE="
 		opengl
 		vulkan
 	)
-	examples? (
-		allegro
-		glfw
-		glut
-		opengl
-		sdl
-		vulkan
-	)
 "
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2022-05-30  6:39 Florian Schmaus
  0 siblings, 0 replies; 15+ messages in thread
From: Florian Schmaus @ 2022-05-30  6:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6b48afde8b2110300a0be496a1c0703b043cc4be
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun May 29 21:09:07 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun May 29 21:09:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b48afde

media-libs/imgui: add subslot

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/imgui/Manifest                                       | 4 ++--
 media-libs/imgui/{imgui-1.87-r5.ebuild => imgui-1.87-r6.ebuild} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest
index 582ac2320..6c720b19b 100644
--- a/media-libs/imgui/Manifest
+++ b/media-libs/imgui/Manifest
@@ -1,3 +1,3 @@
-DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda
+DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda
 DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c
-DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2
+DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2

diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r6.ebuild
similarity index 97%
rename from media-libs/imgui/imgui-1.87-r5.ebuild
rename to media-libs/imgui/imgui-1.87-r6.ebuild
index 927b7feae..375292309 100644
--- a/media-libs/imgui/imgui-1.87-r5.ebuild
+++ b/media-libs/imgui/imgui-1.87-r6.ebuild
@@ -11,12 +11,12 @@ HOMEPAGE="
 	https://github.com/cimgui/cimgui
 "
 SRC_URI="
-	https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz -> c${P}.tar.gz
+	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"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="allegro bindings examples freetype glfw glut opengl sdl vulkan"
 S="${WORKDIR}/c${P}"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-02-08  9:29 David Roman
  0 siblings, 0 replies; 15+ messages in thread
From: David Roman @ 2024-02-08  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     e8c090f40a9bfdb2d9a3e45f3bbbb19410aa4229
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb  7 17:49:44 2024 +0000
Commit:     David Roman <davidroman96 <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
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-02-09  0:30 David Roman
  0 siblings, 0 replies; 15+ messages in thread
From: David Roman @ 2024-02-09  0:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a611f2adab19140609c45e7c35ee2da9ec8d0805
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Feb  8 11:06:59 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Feb  8 11:08:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a611f2ad

media-libs/imgui: fix typo in LICENSE

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-libs/imgui/imgui-1.87-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/imgui/imgui-1.87-r8.ebuild b/media-libs/imgui/imgui-1.87-r8.ebuild
index 01d08089c8..207cbbefce 100644
--- a/media-libs/imgui/imgui-1.87-r8.ebuild
+++ b/media-libs/imgui/imgui-1.87-r8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 	https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz -> c${P}.gh.tar.gz
 "
 
-LICENSE="MIT"multilib
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="allegro bindings examples freetype glfw glut opengl sdl vulkan"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-02-17  2:40 Rui Huang
  0 siblings, 0 replies; 15+ messages in thread
From: Rui Huang @ 2024-02-17  2:40 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-05-10  0:33 Haelwenn Monnier
  0 siblings, 0 replies; 15+ messages in thread
From: Haelwenn Monnier @ 2024-05-10  0:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2e700d20812620d6542256852fa51786b0dca557
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu May  9 16:02:53 2024 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu May  9 16:02:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2e700d20

media-libs/imgui: fix metadata indentation

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-libs/imgui/metadata.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/imgui/metadata.xml b/media-libs/imgui/metadata.xml
index a32bd51ac0..fe2a667a00 100644
--- a/media-libs/imgui/metadata.xml
+++ b/media-libs/imgui/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gonegrier.duarte@gmail.com</email>
-		<name>Gonçalo Negrier Duarte</name>
-	</maintainer>
+    <maintainer type="person">
+        <email>gonegrier.duarte@gmail.com</email>
+        <name>Gonçalo Negrier Duarte</name>
+    </maintainer>
     <upstream>
         <bugs-to>https://github.com/ocornut/imgui/issues</bugs-to>
         <remote-id type="github">ocornut/imgui</remote-id>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-05-13 17:48 Julien Roy
  0 siblings, 0 replies; 15+ messages in thread
From: Julien Roy @ 2024-05-13 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ee5b4f2b1382d3bbe10a2d24239d91f2a7ebf995
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sun May 12 19:25:47 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun May 12 19:26:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ee5b4f2b

media-libs/imgui: add missing dev-util/webgpu-headers dependency

Closes: https://bugs.gentoo.org/931827
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-libs/imgui/imgui-1.89.9-r1.ebuild | 1 +
 media-libs/imgui/imgui-1.90.6.ebuild    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-libs/imgui/imgui-1.89.9-r1.ebuild b/media-libs/imgui/imgui-1.89.9-r1.ebuild
index bed80af29a..917ecd30c0 100644
--- a/media-libs/imgui/imgui-1.89.9-r1.ebuild
+++ b/media-libs/imgui/imgui-1.89.9-r1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sdl_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	webgpu? ( dev-util/webgpu-headers )
 "
 DEPEND="
 	${RDEPEND}

diff --git a/media-libs/imgui/imgui-1.90.6.ebuild b/media-libs/imgui/imgui-1.90.6.ebuild
index bed80af29a..917ecd30c0 100644
--- a/media-libs/imgui/imgui-1.90.6.ebuild
+++ b/media-libs/imgui/imgui-1.90.6.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sdl_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	webgpu? ( dev-util/webgpu-headers )
 "
 DEPEND="
 	${RDEPEND}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-06-03  0:06 Julien Roy
  0 siblings, 0 replies; 15+ messages in thread
From: Julien Roy @ 2024-06-03  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     37b101b2cff8a5a65b028c942f77e8e46a88b7a6
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Tue May 28 10:06:39 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun Jun  2 22:11:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37b101b2

media-libs/imgui: add 1.90.7, drop 1.90.6

* since multilib support is introduce let close BUG:838850

Closes: https://bugs.gentoo.org/838850
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-libs/imgui/Manifest                                     | 2 +-
 media-libs/imgui/{imgui-1.90.6.ebuild => imgui-1.90.7.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest
index 26ede1938..86bd464c5 100644
--- a/media-libs/imgui/Manifest
+++ b/media-libs/imgui/Manifest
@@ -1,2 +1,2 @@
 DIST imgui-1.89.9.tar.gz 1609452 BLAKE2B d5f361acf4318b05066720e9da2ed06db760c482440fc7fb2ca95ce5dd88d9a9a010697c831d3e188baec69819c0a0925e98134c191d5e1856ab43e4dbf9b64f SHA512 42021b06b611b58222b09fab8db2c34e992c3dc4fbaa175e09833c66c90d04b4a4e7def16a732535335c0ac5ff014d235835511a5d9a76d32b4395b302146919
-DIST imgui-1.90.6.tar.gz 1677600 BLAKE2B 2dba4e461e5d771f6764a9a4ff281c0e5ceb1b9467c0640171a4c86dc5a53a172815f2dd10241cb5148549035e6db44f6a20f219c7ce95bac6e1afd9b72402a4 SHA512 c9ff56ec6f8eb05b5034bb0b886568e843743a4313e36613db214f6080506703d5ed2ee606c88cd8957e73575e2b0e39deb52e1ac0c1a6e0a9fe38bca5e6dc0e
+DIST imgui-1.90.7.tar.gz 1686062 BLAKE2B 52267f09c2997a8726e58e2d38bd90747ee9cb364228908e1538b7ef2f72cf84b63f024834c16db5aab55879948fda9958fa723ca7640a713909756874351350 SHA512 8cdec45c8b58b3768a2216af2a1cba3d0e772ac48420b57057a4a8eda5766c121b4a8457a81b5896defe00b822c40d6aac6ee2b31f4133f2b9a02b231b1529d2

diff --git a/media-libs/imgui/imgui-1.90.6.ebuild b/media-libs/imgui/imgui-1.90.7.ebuild
similarity index 100%
rename from media-libs/imgui/imgui-1.90.6.ebuild
rename to media-libs/imgui/imgui-1.90.7.ebuild


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-06-04 12:26 David Roman
  0 siblings, 0 replies; 15+ messages in thread
From: David Roman @ 2024-06-04 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c1e7d7e60047deb138bb00ebd84108deb62556e2
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:00:21 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Jun  3 15:00:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c1e7d7e6

media-libs/imgui: fix pkgdev issues

There was a typo in metadata.xml.
Also underscores are not allowed in flag names.

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 media-libs/imgui/imgui-1.89.9-r3.ebuild | 8 ++++----
 media-libs/imgui/imgui-1.90.7-r2.ebuild | 8 ++++----
 media-libs/imgui/metadata.xml           | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/imgui/imgui-1.89.9-r3.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild
index 50baf8ec3..e03ac218f 100644
--- a/media-libs/imgui/imgui-1.89.9-r3.ebuild
+++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.t
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="allegro5 glfw sdl2 sdl3 sdl2_renderer sdl3_renderer opengl vulkan webgpu"
+IUSE="allegro5 glfw sdl2 sdl3 sdl2-renderer sdl3-renderer opengl vulkan webgpu"
 
 RDEPEND="
 	dev-libs/stb:=
@@ -25,7 +25,7 @@ RDEPEND="
 	allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
 	glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sdl2_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sdl2-renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	opengl? ( || (
 	>=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}]
 		<media-libs/mesa-24.1.0_rc1[gles2,egl,${MULTILIB_USEDEP}]
@@ -61,9 +61,9 @@ multilib_src_configure() {
 		$(meson_feature vulkan)
 		$(meson_feature glfw)
 		$(meson_feature sdl2)
-		$(meson_feature sdl2_renderer)
+		$(meson_feature sdl2-renderer)
 		-Dsdl3=disabled
-		-Dsdl3_renderer=disabled
+		-Dsdl3-renderer=disabled
 		$(meson_feature webgpu)
 		-Dosx=disabled
 		-Dwin=disabled

diff --git a/media-libs/imgui/imgui-1.90.7-r2.ebuild b/media-libs/imgui/imgui-1.90.7-r2.ebuild
index 50baf8ec3..e03ac218f 100644
--- a/media-libs/imgui/imgui-1.90.7-r2.ebuild
+++ b/media-libs/imgui/imgui-1.90.7-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.t
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="allegro5 glfw sdl2 sdl3 sdl2_renderer sdl3_renderer opengl vulkan webgpu"
+IUSE="allegro5 glfw sdl2 sdl3 sdl2-renderer sdl3-renderer opengl vulkan webgpu"
 
 RDEPEND="
 	dev-libs/stb:=
@@ -25,7 +25,7 @@ RDEPEND="
 	allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
 	glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sdl2_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sdl2-renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	opengl? ( || (
 	>=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}]
 		<media-libs/mesa-24.1.0_rc1[gles2,egl,${MULTILIB_USEDEP}]
@@ -61,9 +61,9 @@ multilib_src_configure() {
 		$(meson_feature vulkan)
 		$(meson_feature glfw)
 		$(meson_feature sdl2)
-		$(meson_feature sdl2_renderer)
+		$(meson_feature sdl2-renderer)
 		-Dsdl3=disabled
-		-Dsdl3_renderer=disabled
+		-Dsdl3-renderer=disabled
 		$(meson_feature webgpu)
 		-Dosx=disabled
 		-Dwin=disabled

diff --git a/media-libs/imgui/metadata.xml b/media-libs/imgui/metadata.xml
index 6273590a2..77d26eee4 100644
--- a/media-libs/imgui/metadata.xml
+++ b/media-libs/imgui/metadata.xml
@@ -15,9 +15,9 @@
         <flag name="opengl">Enable opengl renderer</flag>
         <flag name="vulkan">Enable vulkan renderer</flag>
         <flag name="sdl2">Enable SDL2 backend</flag>
-		<flag name="sdl2_renderer">Enable SDL2 renderer backend</flag>
+        <flag name="sdl2-renderer">Enable SDL2 renderer backend</flag>
         <flag name="sdl3">Enable SDL3 backend</flag>
-        <flag name="sdl2_renderer">Enable SDL3 renderer backend</flag>
+        <flag name="sdl3-renderer">Enable SDL3 renderer backend</flag>
         <flag name="webgpu">Enable webgpu renderer backend</flag>
     </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
  2024-06-04 16:00 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
@ 2024-06-04 16:06 ` Viorel Munteanu
  0 siblings, 0 replies; 15+ messages in thread
From: Viorel Munteanu @ 2024-06-04 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     97adccd54889d60a15dd188fc959fc1b93f24215
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 15:59:30 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 16:00:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=97adccd5

media-libs/imgui: fix sdl USE flags

I did some search & replace damage last time, fix it.

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 media-libs/imgui/imgui-1.89.9-r3.ebuild | 4 ++--
 media-libs/imgui/imgui-1.90.7-r2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/imgui/imgui-1.89.9-r3.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild
index e03ac218f..50508ae0e 100644
--- a/media-libs/imgui/imgui-1.89.9-r3.ebuild
+++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild
@@ -61,9 +61,9 @@ multilib_src_configure() {
 		$(meson_feature vulkan)
 		$(meson_feature glfw)
 		$(meson_feature sdl2)
-		$(meson_feature sdl2-renderer)
+		$(meson_feature sdl2-renderer sdl2_renderer)
 		-Dsdl3=disabled
-		-Dsdl3-renderer=disabled
+		-Dsdl3_renderer=disabled
 		$(meson_feature webgpu)
 		-Dosx=disabled
 		-Dwin=disabled

diff --git a/media-libs/imgui/imgui-1.90.7-r2.ebuild b/media-libs/imgui/imgui-1.90.7-r2.ebuild
index e03ac218f..50508ae0e 100644
--- a/media-libs/imgui/imgui-1.90.7-r2.ebuild
+++ b/media-libs/imgui/imgui-1.90.7-r2.ebuild
@@ -61,9 +61,9 @@ multilib_src_configure() {
 		$(meson_feature vulkan)
 		$(meson_feature glfw)
 		$(meson_feature sdl2)
-		$(meson_feature sdl2-renderer)
+		$(meson_feature sdl2-renderer sdl2_renderer)
 		-Dsdl3=disabled
-		-Dsdl3-renderer=disabled
+		-Dsdl3_renderer=disabled
 		$(meson_feature webgpu)
 		-Dosx=disabled
 		-Dwin=disabled


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-06-05 13:18 Viorel Munteanu
  0 siblings, 0 replies; 15+ messages in thread
From: Viorel Munteanu @ 2024-06-05 13:18 UTC (permalink / raw
  To: gentoo-commits

commit:     625a50e4f44ad11c983721e0c397ae41cd912f41
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 13:16:50 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 13:16:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=625a50e4

media-libs/imgui: update dependency on media-libs/mesa

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 media-libs/imgui/imgui-1.89.9-r3.ebuild | 4 ++--
 media-libs/imgui/imgui-1.90.7-r2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/imgui/imgui-1.89.9-r3.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild
index 50508ae0e..40da284df 100644
--- a/media-libs/imgui/imgui-1.89.9-r3.ebuild
+++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sdl2-renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	opengl? ( || (
-	>=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}]
-		<media-libs/mesa-24.1.0_rc1[gles2,egl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2,egl(+),${MULTILIB_USEDEP}]
 	) )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	webgpu? ( dev-util/webgpu-headers )

diff --git a/media-libs/imgui/imgui-1.90.7-r2.ebuild b/media-libs/imgui/imgui-1.90.7-r2.ebuild
index 50508ae0e..40da284df 100644
--- a/media-libs/imgui/imgui-1.90.7-r2.ebuild
+++ b/media-libs/imgui/imgui-1.90.7-r2.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
 	sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	sdl2-renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
 	opengl? ( || (
-	>=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}]
-		<media-libs/mesa-24.1.0_rc1[gles2,egl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}]
+		<media-libs/mesa-24.1.0_rc1[gles2,egl(+),${MULTILIB_USEDEP}]
 	) )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	webgpu? ( dev-util/webgpu-headers )


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/
@ 2024-09-06  8:52 David Roman
  0 siblings, 0 replies; 15+ messages in thread
From: David Roman @ 2024-09-06  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     edd312b9d300fad25275034390ea7036fecc0144
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Sep  5 19:04:19 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Sep  5 19:20:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edd312b9

media-libs/imgui: add 1.91.1, drop 1.90.7-r2

Closes: https://bugs.gentoo.org/937368
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 media-libs/imgui/Manifest                                        | 2 +-
 media-libs/imgui/{imgui-1.90.7-r2.ebuild => imgui-1.91.1.ebuild} | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest
index 86bd464c5..d986cffbc 100644
--- a/media-libs/imgui/Manifest
+++ b/media-libs/imgui/Manifest
@@ -1,2 +1,2 @@
 DIST imgui-1.89.9.tar.gz 1609452 BLAKE2B d5f361acf4318b05066720e9da2ed06db760c482440fc7fb2ca95ce5dd88d9a9a010697c831d3e188baec69819c0a0925e98134c191d5e1856ab43e4dbf9b64f SHA512 42021b06b611b58222b09fab8db2c34e992c3dc4fbaa175e09833c66c90d04b4a4e7def16a732535335c0ac5ff014d235835511a5d9a76d32b4395b302146919
-DIST imgui-1.90.7.tar.gz 1686062 BLAKE2B 52267f09c2997a8726e58e2d38bd90747ee9cb364228908e1538b7ef2f72cf84b63f024834c16db5aab55879948fda9958fa723ca7640a713909756874351350 SHA512 8cdec45c8b58b3768a2216af2a1cba3d0e772ac48420b57057a4a8eda5766c121b4a8457a81b5896defe00b822c40d6aac6ee2b31f4133f2b9a02b231b1529d2
+DIST imgui-1.91.1.tar.gz 1747226 BLAKE2B c129003702ec5be1286090dedb80cd3d984a926d945bbaba73be227f9f3c16442eec5b33e9f7a961a478fecc8a9b0742e5fcb7df625a011572ff4ce14747b03d SHA512 acdbde3a29a498178fcc40e04a3c037d9333347022349f37ea2470388dd3bdee52b2f4a364bacaee25345fe2fd3cf740915fbff264fcbf5160ba55368e8825eb

diff --git a/media-libs/imgui/imgui-1.90.7-r2.ebuild b/media-libs/imgui/imgui-1.91.1.ebuild
similarity index 97%
rename from media-libs/imgui/imgui-1.90.7-r2.ebuild
rename to media-libs/imgui/imgui-1.91.1.ebuild
index 40da284df..d653025e2 100644
--- a/media-libs/imgui/imgui-1.90.7-r2.ebuild
+++ b/media-libs/imgui/imgui-1.91.1.ebuild
@@ -21,6 +21,7 @@ IUSE="allegro5 glfw sdl2 sdl3 sdl2-renderer sdl3-renderer opengl vulkan webgpu"
 
 RDEPEND="
 	dev-libs/stb:=
+	media-libs/libglvnd[${MULTILIB_USEDEP}]
 	media-libs/glew[${MULTILIB_USEDEP}]
 	allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] )
 	glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-09-06  8:52 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-10  0:33 [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/ Haelwenn Monnier
  -- strict thread matches above, loose matches on Subject: below --
2024-09-06  8:52 David Roman
2024-06-05 13:18 Viorel Munteanu
2024-06-04 16:00 [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2024-06-04 16:06 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2024-06-04 12:26 David Roman
2024-06-03  0:06 Julien Roy
2024-05-13 17:48 Julien Roy
2024-02-17  2:40 Rui Huang
2024-02-09  0:30 David Roman
2024-02-08  9:29 David Roman
2022-05-30  6:39 Florian Schmaus
2022-04-23 17:49 Haelwenn Monnier
2022-04-21 17:46 Arthur Zamarin
2022-04-04 14:49 Andrew Ammerlaan
2022-03-29  0:22 Ronny Gutbrod

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox