From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A8891582EF for ; Tue, 11 Mar 2025 09:04:48 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 64CDE343128 for ; Tue, 11 Mar 2025 09:04:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A336C110475; Tue, 11 Mar 2025 09:04:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 bobolink.gentoo.org (Postfix) with ESMTPS id 967EC110475 for ; Tue, 11 Mar 2025 09:04:10 +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 49F14343144 for ; Tue, 11 Mar 2025 09:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 660DD28DD for ; Tue, 11 Mar 2025 09:04:07 +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: <1741683803.32a39b07ef8aaee4f30bb731cac5fe7faa1617ba.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/moc/moc-2.6_alpha3-r8.ebuild X-VCS-Directories: media-sound/moc/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 32a39b07ef8aaee4f30bb731cac5fe7faa1617ba X-VCS-Branch: master Date: Tue, 11 Mar 2025 09:04:07 +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: fd7fb457-3d3f-4219-bd1f-273c12d5ecb3 X-Archives-Hash: 834efae0e833b0b896ddf3994bdba40a commit: 32a39b07ef8aaee4f30bb731cac5fe7faa1617ba Author: Ionen Wolkens gentoo org> AuthorDate: Sun Mar 9 16:06:49 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Mar 11 09:03:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a39b07 media-sound/moc: migrate to ffmpeg-compat.eclass For what it's worth anyway... more of a proof of concept given ffmpeg-compat-4.4.x likely won't stay around for that long. Seems to work fine, was able to play opus files despite USE=-opus through ffmpeg. This package will still need to be properly handled to avoid last-rites (does have a few users). I know there are ffmpeg-6+ patches going around, or could also remove/mask USE=ffmpeg, but not planning to handle this package myself. Bug: https://bugs.gentoo.org/834393 Closes: https://github.com/gentoo/gentoo/pull/40942 Signed-off-by: Ionen Wolkens gentoo.org> media-sound/moc/moc-2.6_alpha3-r8.ebuild | 110 +++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/media-sound/moc/moc-2.6_alpha3-r8.ebuild b/media-sound/moc/moc-2.6_alpha3-r8.ebuild new file mode 100644 index 000000000000..d7a76b1fd0f4 --- /dev/null +++ b/media-sound/moc/moc-2.6_alpha3-r8.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools ffmpeg-compat + +MY_P=${PN}-${PV/_/-} +DESCRIPTION="Music On Console - ncurses interface for playing audio files" +HOMEPAGE="https://moc.daper.net" +SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack + oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack" + +RDEPEND=" + >=dev-libs/libltdl-2 + dev-libs/popt + sys-libs/ncurses:=[unicode(+)?] + aac? ( media-libs/faad2 ) + alsa? ( >=media-libs/alsa-lib-1.0.11 ) + cache? ( >=sys-libs/db-4.1:= ) + curl? ( >=net-misc/curl-7.15.1 ) + ffmpeg? ( media-video/ffmpeg-compat:4= ) + flac? ( >=media-libs/flac-1.1.3:= ) + jack? ( virtual/jack ) + libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) + mad? ( + media-libs/libmad + sys-libs/zlib + media-libs/libid3tag:= + ) + magic? ( sys-apps/file ) + modplug? ( >=media-libs/libmodplug-0.7 ) + musepack? ( + media-sound/musepack-tools + media-libs/taglib:= + ) + sid? ( >=media-libs/libsidplay-2.1.1 ) + sndfile? ( >=media-libs/libsndfile-1.0.0 ) + sndio? ( media-sound/sndio ) + speex? ( >=media-libs/speex-1.0.0 ) + timidity? ( + >=media-libs/libtimidity-0.1.0 + media-sound/timidity++ + ) + vorbis? ( + >=media-libs/libogg-1.0 + tremor? ( media-libs/tremor ) + !tremor? ( >=media-libs/libvorbis-1.0 ) + ) + wavpack? ( >=media-sound/wavpack-4.31 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/ffmpeg4.patch" + "${FILESDIR}/${P}-stdint_uint_types.patch" +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + ffmpeg_compat_setup 4 # (bug #834393) + + local myconf=( + --without-rcc + $(use_enable debug) + $(use_enable cache) + $(use_with oss) + $(use_with alsa) + $(use_with jack) + $(use_with sndio) + $(use_with magic) + $(use_with unicode ncursesw) + $(use_with libsamplerate samplerate) + $(use_with aac) + $(use_with ffmpeg) + $(use_with flac) + $(use_with modplug) + $(use_with mad mp3) + $(use_with musepack) + $(use_with sid sidplay2) + $(use_with sndfile) + $(use_with speex) + $(use_with timidity) + $(use_with vorbis vorbis $(usev tremor)) + $(use_with wavpack) + $(use_with curl) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +}