public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/
Date: Sat, 23 Sep 2023 18:06:52 +0000 (UTC)	[thread overview]
Message-ID: <1695491721.dbcafe8f2ac6589c3a08ab6b5c534b9b2e3b150c.chewi@gentoo> (raw)

commit:     dbcafe8f2ac6589c3a08ab6b5c534b9b2e3b150c
Author:     Yuri Konotopov <ykonotopov <AT> gnome <DOT> org>
AuthorDate: Sat Sep 23 17:35:17 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 17:55:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbcafe8f

media-libs/sdl2-mixer: don't force stb_vorbis for OGG Vorbis music

Neither the libvorbis nor the tremor are used for OGG Vorbis music regardless
ebuild use flags because `--enable-music-ogg-stb` is used by default.
Let's disable stb_vorbis to use libvorbis or tremor for OGG Vorbis music.

Signed-off-by: Yuri Konotopov <ykonotopov <AT> gnome.org>
Closes: https://github.com/gentoo/gentoo/pull/33011
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild | 106 +++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..e6a2ad3f0a24
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="SDL2_mixer-${PV}"
+inherit multilib-minimal
+
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://github.com/libsdl-org/SDL_mixer"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="flac fluidsynth midi mod mp3 opus playtools static-libs timidity tremor vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	tremor? ( vorbis )
+"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opusfile-0.2 )
+	vorbis? (
+		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+		!tremor? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-music-cmd
+		$(use_enable wav music-wave)
+		$(use_enable mod music-mod)
+		$(use_enable mod music-mod-modplug)
+		--disable-music-mod-modplug-shared
+		$(use_enable midi music-midi)
+		$(use_enable timidity music-midi-timidity)
+		$(use_enable fluidsynth music-midi-fluidsynth)
+		--disable-music-midi-fluidsynth-shared
+		$(use_enable vorbis music-ogg)
+		--disable-music-ogg-stb
+		$(usex vorbis \
+			$(use_enable !tremor music-ogg-vorbis) \
+			--disable-music-ogg-vorbis)
+		--disable-music-ogg-vorbis-shared
+		$(use_enable tremor music-ogg-tremor)
+		--disable-music-ogg-tremor-shared
+		$(use_enable flac music-flac)
+		$(use_enable flac music-flac-libflac)
+		--disable-music-flac-libflac-shared
+		$(use_enable mp3 music-mp3)
+		$(use_enable mp3 music-mp3-mpg123)
+		--disable-music-mp3-mpg123-shared
+		$(use_enable opus music-opus)
+		--disable-music-opus-shared
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools ; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# bug #412035
+	if use midi && use fluidsynth; then
+		ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+		ewarn "environment variable to the location of a SoundFont file"
+		ewarn "unless the game or application happens to do this for you."
+		if use timidity; then
+			ewarn "Failing to do so will result in Timidity being used instead."
+		else
+			ewarn "Failing to do so will result in silence."
+		fi
+	fi
+}


             reply	other threads:[~2023-09-23 18:06 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-23 18:06 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-19 23:08 [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/ Ionen Wolkens
2023-12-29 23:32 Sam James
2023-03-26 16:54 Arthur Zamarin
2023-03-04  9:34 Arthur Zamarin
2023-03-04  8:50 Arthur Zamarin
2023-03-04  6:15 Arthur Zamarin
2023-03-04  6:00 Arthur Zamarin
2023-03-04  5:47 Arthur Zamarin
2023-03-04  5:47 Arthur Zamarin
2023-02-08  1:04 Sam James
2023-01-17  4:31 Ionen Wolkens
2023-01-07  8:12 Sam James
2022-07-19  1:09 Sam James
2022-06-16 16:30 Sam James
2021-12-30 20:06 Arthur Zamarin
2021-12-30 18:46 Arthur Zamarin
2021-11-29 10:22 Arthur Zamarin
2021-11-29  7:39 Arthur Zamarin
2021-11-19 15:36 Sam James
2020-12-17  3:58 Sam James
2020-11-30 21:12 Sergei Trofimovich
2020-10-06 13:16 Sam James
2020-10-03 12:16 Sergei Trofimovich
2020-09-30 21:15 Sam James
2020-06-10  3:21 Matt Turner
2020-06-09 17:07 Sergei Trofimovich
2020-06-08 16:34 Mart Raudsepp
2020-06-08 14:18 Michał Górny
2020-06-08 13:18 Michał Górny
2020-03-20 21:53 Matt Turner
2019-03-10 22:46 Andreas Sturmlechner
2019-01-02 10:04 Mikle Kolyada
2018-12-31 16:43 Thomas Deutschmann
2018-11-02 16:11 Lars Wendler
2018-09-16 13:15 Mikle Kolyada
2018-09-09  1:12 Thomas Deutschmann
2018-09-01 20:17 Andreas Sturmlechner
2018-09-01 20:17 Andreas Sturmlechner
2018-09-01 14:25 James Le Cuirot
2018-09-01 14:25 James Le Cuirot
2018-07-02 11:22 Jeroen Roovers
2017-10-25  7:47 Lars Wendler
2016-02-14 10:11 Agostino Sarubbo
2016-02-13 15:33 Agostino Sarubbo
2016-01-11  6:51 Michael Sterrett
2016-01-10 15:06 Michael Sterrett
2016-01-06 16:40 Michael Sterrett
2016-01-05  0:36 Michael Sterrett
2016-01-03 18:16 Michael Sterrett

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=1695491721.dbcafe8f2ac6589c3a08ab6b5c534b9b2e3b150c.chewi@gentoo \
    --to=chewi@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