public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-gfx/bonzomatic/
Date: Sun,  9 Apr 2023 10:05:18 +0000 (UTC)	[thread overview]
Message-ID: <1680965763.42eb3126a0e3af3f61ec866738ab01700c2de2c8.ceamac@gentoo> (raw)

commit:     42eb3126a0e3af3f61ec866738ab01700c2de2c8
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Apr  8 14:51:33 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 14:56:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42eb3126

media-gfx/bonzomatic: add 2022.08.20

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 media-gfx/bonzomatic/Manifest                          |  1 +
 ...omatic-9999.ebuild => bonzomatic-2022.08.20.ebuild} | 18 +++++++++++++-----
 media-gfx/bonzomatic/bonzomatic-9999.ebuild            | 18 +++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/media-gfx/bonzomatic/Manifest b/media-gfx/bonzomatic/Manifest
index aafdf0bbe..d94cbe5f3 100644
--- a/media-gfx/bonzomatic/Manifest
+++ b/media-gfx/bonzomatic/Manifest
@@ -1 +1,2 @@
 DIST bonzomatic-2022.02.05.tar.gz 2721552 BLAKE2B 0c89a88e82c0eeb20d3b40f2107590ae37168a16327431d1e296c6e9cb0ae6dc661d669a0b4c91c8cd9124e2001defbf0bcf4840161efb64e20ee9b2fe93f495 SHA512 5a1ed8c2dd1b2f45de5a9cb3b859b6d599d833114a8bab95b25ac1f3ad62b536371fffd4e19ee317b79190afd1bacaa2a46000c9c5f17ff239068d13e6630bd1
+DIST bonzomatic-2022.08.20.tar.gz 8883259 BLAKE2B 698695e0925fa0dc43a195fce0e622a2000781682fdbf7e3fdb90c174c32a937bb42aa2a2823f5ec3f2ad322309f98dd43eecaa517d81db5180ecfac12087cfa SHA512 0a9718f3d99bedcdbc3b60467d8a15846c48e8ef8583e793140077215b59d69fbd8ac7b7644ca811e810c5cf8b15c7c6cb2ec21f40b0493a69f93805cc24b8fd

diff --git a/media-gfx/bonzomatic/bonzomatic-9999.ebuild b/media-gfx/bonzomatic/bonzomatic-2022.08.20.ebuild
similarity index 82%
copy from media-gfx/bonzomatic/bonzomatic-9999.ebuild
copy to media-gfx/bonzomatic/bonzomatic-2022.08.20.ebuild
index adba07b55..3e2ebc2b2 100644
--- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-2022.08.20.ebuild
@@ -20,14 +20,14 @@ fi
 
 LICENSE="Unlicense"
 SLOT="0"
-IUSE="system-glfw system-glew system-stb wayland"
+IUSE="system-glfw system-glew system-miniaudio system-stb wayland"
 
-# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# TODO: 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
 # kissfft: Bonzomatic targets non-existent `kissfft` pkg-config name
 #	system-kissfft? ( sci-libs/kissfft )
-DEPEND="
+RDEPEND="
 	system-glfw? ( media-libs/glfw )
 	!system-glfw? (
 		wayland? (
@@ -57,17 +57,25 @@ DEPEND="
 	media-libs/alsa-lib
 	media-libs/fontconfig
 "
-RDEPEND="${DEPEND}"
+# miniaudio is headers-only
+DEPEND="
+	${RDEPEND}
+	system-miniaudio? ( media-libs/miniaudio:0.10= )
+"
 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_MINIAUDIO=$(usex system-miniaudio)
 		-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
 		-DBONZOMATIC_USE_SYSTEM_KISSFFT=OFF
 	)
 
+	if use !system-glfw; then
+		mycmakeargs+=( -DGLFW_USE_WAYLAND="$(usex wayland)" )
+	fi
+
 	cmake_src_configure
 }

diff --git a/media-gfx/bonzomatic/bonzomatic-9999.ebuild b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
index adba07b55..3e2ebc2b2 100644
--- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
@@ -20,14 +20,14 @@ fi
 
 LICENSE="Unlicense"
 SLOT="0"
-IUSE="system-glfw system-glew system-stb wayland"
+IUSE="system-glfw system-glew system-miniaudio system-stb wayland"
 
-# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# TODO: 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
 # kissfft: Bonzomatic targets non-existent `kissfft` pkg-config name
 #	system-kissfft? ( sci-libs/kissfft )
-DEPEND="
+RDEPEND="
 	system-glfw? ( media-libs/glfw )
 	!system-glfw? (
 		wayland? (
@@ -57,17 +57,25 @@ DEPEND="
 	media-libs/alsa-lib
 	media-libs/fontconfig
 "
-RDEPEND="${DEPEND}"
+# miniaudio is headers-only
+DEPEND="
+	${RDEPEND}
+	system-miniaudio? ( media-libs/miniaudio:0.10= )
+"
 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_MINIAUDIO=$(usex system-miniaudio)
 		-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
 		-DBONZOMATIC_USE_SYSTEM_KISSFFT=OFF
 	)
 
+	if use !system-glfw; then
+		mycmakeargs+=( -DGLFW_USE_WAYLAND="$(usex wayland)" )
+	fi
+
 	cmake_src_configure
 }


             reply	other threads:[~2023-04-09 10:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-09 10:05 Viorel Munteanu [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-04-09 10:05 [gentoo-commits] repo/proj/guru:master commit in: media-gfx/bonzomatic/ Viorel Munteanu
2023-04-09 10:05 Viorel Munteanu
2023-04-09 10:05 Viorel Munteanu
2022-07-03 12:17 Andrew Ammerlaan
2022-05-24 14:51 Florian Schmaus
2022-05-24 14:51 Florian Schmaus
2022-04-12 19:35 Ronny Gutbrod
2021-06-13  8:49 Haelwenn Monnier
2021-05-08  6:14 [gentoo-commits] repo/proj/guru:dev " Haelwenn Monnier
2021-05-08  6:16 ` [gentoo-commits] repo/proj/guru:master " Haelwenn Monnier
2021-04-20 18:55 Andrew Ammerlaan
2021-04-18  8:59 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-04-18  9:10 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-04-15 12:51 Andrew Ammerlaan
2021-04-06  9:03 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1680965763.42eb3126a0e3af3f61ec866738ab01700c2de2c8.ceamac@gentoo \
    --to=ceamac@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox