* [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/files/, media-sound/moc/
@ 2016-01-11 4:03 Tim Harder
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2016-01-11 4:03 UTC (permalink / raw
To: gentoo-commits
commit: a2b3fe98ec10cce3eda211c092eea46e62c2f80b
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 03:50:50 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 03:50:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b3fe98
media-sound/moc: remove old
media-sound/moc/Manifest | 1 -
.../files/moc-2.5.0_beta1-no-automagic-popt.patch | 12 ---
media-sound/moc/moc-2.5.0_beta1-r1.ebuild | 91 ----------------------
3 files changed, 104 deletions(-)
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index c4df553..d5fdb59 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,3 +1,2 @@
-DIST moc-2.5.0-beta1.tar.bz2 570468 SHA256 076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6 SHA512 16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2 WHIRLPOOL 793fa9bdd23da14cc558262335b81560aa82a86c641b2a163af64d80659b652ada83193b0ed2888bfbe0d0b43cb35447ad0b0fa8de394742c0e162d3050520de
DIST moc-2.5.0.tar.bz2 594532 SHA256 d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091 SHA512 ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c WHIRLPOOL 770d4024451c9f153fe16b60819392f677171c1ba08c8d95d9dfd5e1be1a19bfd5a7d9f771aa4ded8c40c0f042865f6e693727fce261464261d4311860fcff58
DIST moc-2.6-alpha1.tar.xz 491660 SHA256 0b0a3515c65b4c47a250e350c663535778239352db859921f5d564ed727a0bbc SHA512 9de2e17e2d7441bb5ae2fa33884d4f569a91e987db39d2b331e8c28ddf0ecca1bdbd6079bebc1770c20d7f062b33069dd8b4a8184a309bf831538cb36f69ed3a WHIRLPOOL 86adcff80f4597e68bcf22ecf21f9eba913e257f8c7cf63d934e3874ea8fd59169652e4571b6f2bb1e54cdce0de6cb3027c494b29c9ae179910366b11b3786f9
diff --git a/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch b/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch
deleted file mode 100644
index 83c071e..0000000
--- a/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- moc-2.5.0-beta1/configure.in
-+++ moc-2.5.0-beta1/configure.in
-@@ -341,9 +341,6 @@
- AC_MSG_ERROR([You need curses/ncurses library and header files.])
- fi
-
--dnl popt
--AC_SEARCH_LIBS([poptGetContext], [popt], , [POPT_MISSING="yes"])
--
- dnl getopt
- AC_CHECK_FUNC(getopt_long,
- [AC_CHECK_HEADERS([getopt.h],,[AC_MSG_ERROR([You need getopt.h.])])],
diff --git a/media-sound/moc/moc-2.5.0_beta1-r1.ebuild b/media-sound/moc/moc-2.5.0_beta1-r1.ebuild
deleted file mode 100644
index c6552af..0000000
--- a/media-sound/moc/moc-2.5.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="http://moc.daper.net"
-SRC_URI="ftp://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
-oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
-
-RDEPEND=">=dev-libs/libltdl-2:0
- sys-libs/ncurses[unicode?]
- aac? ( media-libs/faad2 )
- alsa? ( media-libs/alsa-lib )
- cache? ( >=sys-libs/db-4 )
- curl? ( net-misc/curl )
- ffmpeg? ( virtual/ffmpeg )
- flac? ( media-libs/flac )
- jack? ( media-sound/jack-audio-connection-kit )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
- magic? ( sys-apps/file )
- modplug? ( media-libs/libmodplug )
- musepack? ( media-sound/musepack-tools media-libs/taglib )
- sid? ( >=media-libs/libsidplay-2 )
- sndfile? ( media-libs/libsndfile )
- speex? ( media-libs/speex )
- timidity? ( media-libs/libtimidity media-sound/timidity++ )
- vorbis? (
- media-libs/libogg
- tremor? ( media-libs/tremor )
- !tremor? ( media-libs/libvorbis )
- )
- wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # moc-2.5.0 will require popt, but currently it's an unused, automagic dep
- epatch "${FILESDIR}"/${P}-no-automagic-popt.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable debug)
- $(use_enable cache)
- $(use_with oss)
- $(use_with alsa)
- $(use_with jack)
- $(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)
- --without-rcc
- $(use_with musepack)
- $(use_with sid sidplay2)
- $(use_with sndfile)
- $(use_with speex)
- $(use_with timidity)
- $(use_with vorbis vorbis $(usex tremor tremor ""))
- $(use_with wavpack)
- $(use_with curl)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS NEWS TODO # The rest is installed by doc_DATA from "${S}"/Makefile.am
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/files/, media-sound/moc/
@ 2018-04-22 11:26 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2018-04-22 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 9fe5bba535c6724ba3494323e76a0fe9175ff55e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 11:26:20 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 11:26:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe5bba5
media-sound/moc: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-sound/moc/files/ffmpeg4.patch | 33 +++++++++++++++++++++++++++++++++
media-sound/moc/moc-2.6_alpha3.ebuild | 3 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/media-sound/moc/files/ffmpeg4.patch b/media-sound/moc/files/ffmpeg4.patch
new file mode 100644
index 00000000000..28b68882347
--- /dev/null
+++ b/media-sound/moc/files/ffmpeg4.patch
@@ -0,0 +1,33 @@
+Index: moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- moc-2.6-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -697,7 +697,7 @@ static void *ffmpeg_open_internal (struc
+ * FFmpeg/LibAV in use. For some versions this will be caught in
+ * *_find_stream_info() above and misreported as an unfound codec
+ * parameters error. */
+- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+ decoder_error (&data->error, ERROR_FATAL, 0,
+ "The codec is experimental and may damage MOC: %s",
+ data->codec->name);
+@@ -705,8 +705,8 @@ static void *ffmpeg_open_internal (struc
+ }
+
+ set_downmixing (data);
+- if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+- data->enc->flags |= CODEC_FLAG_TRUNCATED;
++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+ {
+@@ -725,7 +725,7 @@ static void *ffmpeg_open_internal (struc
+
+ data->sample_width = sfmt_Bps (data->fmt);
+
+- if (data->codec->capabilities & CODEC_CAP_DELAY)
++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+ data->delay = true;
+ data->seek_broken = is_seek_broken (data);
+ data->timing_broken = is_timing_broken (data->ic);
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index d68ba88aa23..b2d3b3643bd 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
"
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
src_configure() {
local myconf=(
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-22 11:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-11 4:03 [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/files/, media-sound/moc/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2018-04-22 11:26 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox