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 A5EFB15800F for ; Tue, 17 Jan 2023 04:31:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D481EE07AE; Tue, 17 Jan 2023 04:31:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3224E07AE for ; Tue, 17 Jan 2023 04:31:51 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5706340B98 for ; Tue, 17 Jan 2023 04:31:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD8E5851 for ; Tue, 17 Jan 2023 04:31:48 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1673929838.c99836435627140c122b30fc14212c980f5c565c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-mixer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild X-VCS-Directories: media-libs/sdl2-mixer/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c99836435627140c122b30fc14212c980f5c565c X-VCS-Branch: master Date: Tue, 17 Jan 2023 04:31:48 +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: 391c2b03-dd8b-4766-92e7-a1e6c2ac9a44 X-Archives-Hash: 28f74a8aeaebd7c3975fe34c62560195 commit: c99836435627140c122b30fc14212c980f5c565c Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jan 17 04:01:12 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jan 17 04:30:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9983643 media-libs/sdl2-mixer: actually enable ogg/flac in 2.6.2 ebuild does --enable-music-ogg/flac and then disables it: $(use_enable vorbis music-ogg) --disable-music-ogg $(use_enable flac music-flac) --disable-music-flac Formerly these were for ogg-shared (used to link with rather than dlopen) but the options were renamed and mis-adjusted. Haven't looked in-depth at this package but at least try to ensure libvorbis/flac get used. Signed-off-by: Ionen Wolkens gentoo.org> .../{sdl2-mixer-2.6.2.ebuild => sdl2-mixer-2.6.2-r1.ebuild} | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild similarity index 89% rename from media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild rename to media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild index ad55760aeb5b..35995b532df6 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild @@ -34,9 +34,7 @@ RDEPEND=" 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}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) + !tremor? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) ) " DEPEND="${RDEPEND}" @@ -61,10 +59,15 @@ multilib_src_configure() { $(use_enable fluidsynth music-midi-fluidsynth) --disable-music-midi-fluidsynth-shared $(use_enable vorbis music-ogg) + $(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 + --disable-music-ogg-tremor-shared $(use_enable flac music-flac) - --disable-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