diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-01 17:05:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-01 17:05:43 +0000 |
| commit | 1b75c3bef9fe8585ca958d07bfc98e10851f9575 (patch) | |
| tree | 2fce7d2832308140acb0eb02a9ea1ea6fda4de1a /media-sound | |
| parent | Also import PATH for Prefix, bug #361089 by Asfand Yar Qazi (diff) | |
| download | historical-1b75c3bef9fe8585ca958d07bfc98e10851f9575.tar.gz historical-1b75c3bef9fe8585ca958d07bfc98e10851f9575.tar.bz2 historical-1b75c3bef9fe8585ca958d07bfc98e10851f9575.zip | |
Add patch to compile with new ffmpeg api.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/moc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/moc/Manifest | 11 | ||||
| -rw-r--r-- | media-sound/moc/files/moc-ffmpeg.patch | 26 | ||||
| -rw-r--r-- | media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild | 6 |
4 files changed, 41 insertions, 8 deletions
diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog index 384bd1301672..31900948d94e 100644 --- a/media-sound/moc/ChangeLog +++ b/media-sound/moc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/moc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.85 2011/04/28 18:04:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.86 2011/05/01 17:05:43 scarabeus Exp $ + + 01 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + moc-2.5.0_alpha4_p20110428.ebuild, +files/moc-ffmpeg.patch: + Add patch to compile with new ffmpeg api. *moc-2.5.0_alpha4_p20110428 (28 Apr 2011) diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest index aa06200f5e76..bf3a4d5e365a 100644 --- a/media-sound/moc/Manifest +++ b/media-sound/moc/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX moc-ffmpeg.patch 934 RMD160 d6deae46945b55ebd77d03985ba36fca8f29f5b9 SHA1 f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d SHA256 bb334b6555e76f2f8d3087abe59b97907300db72a683a723eac2f8feaa1e4bce DIST moc-2.5.0-alpha4.tar.bz2 520919 RMD160 d2dec23ad586b35a7350bacfb3eb9b3033abbfc4 SHA1 ca55b3bed0f3f3f352ca43078208ab63e20f40fc SHA256 a1ece00c17ce0ebbd387c0412b08f038dd07cf226726c26367cbc982ce3363b4 DIST moc-2.5.0_alpha4_p20110428.tar.xz 222744 RMD160 43bc9f98a3db20637edcaef2af22dd91fbd504d7 SHA1 fcfb0521bb18aa3fdd3fe40e33885b57da53e62e SHA256 ebc103a62a02b0926053d70b3709ca48ab2b21fbe4014ed15fc6ae9c4113f54a EBUILD moc-2.5.0_alpha4.ebuild 2016 RMD160 8a8219ca2d42497444e0875819310b4d02487f78 SHA1 0ca1444c2566847c94e14a8b65a75835e678595f SHA256 9c822db29a17ed8dab912cd8c2a1c91534f16d392644bb8c52adb58c0789b8f4 -EBUILD moc-2.5.0_alpha4_p20110428.ebuild 2008 RMD160 af08357a31d4c401d640962acd95ffb3856e7e42 SHA1 5983e420fad7951d63d387cc6eea323eb63bbac7 SHA256 310c77d7bd167259f68b6d4423a670b2423aaa34b01eb7f7a67fa45fbd5ae4c5 -MISC ChangeLog 12090 RMD160 a1b8c01a99524ed820e859a1549c09fe541f9da4 SHA1 83137b01312578235e06e2ae2a186f10b0b23252 SHA256 785905e1227059357a2bcea4f9867c6cfe675e25a0f0e7e230e9b6ea50f12c61 +EBUILD moc-2.5.0_alpha4_p20110428.ebuild 2060 RMD160 9b7c3c344ef07fb9914bae5ed5ed60ab927289ae SHA1 252f357202ceee112496e28a9645dd6b82f494ca SHA256 ce17c07b68632d9998dc35e6ec962c121bb034681c283c02909fe91b5c93ed7c +MISC ChangeLog 12252 RMD160 0414f59430c10aac4df8ee7a16079a4be7a3e156 SHA1 f814db0b70ca6cfa47b7bcf4d8beb14d7affecb4 SHA256 f5479fb5885b2aa4ef0a885803f8e9cb3b67eefc9978107b0e08c7d122ed48a4 MISC metadata.xml 244 RMD160 0f687a8096aa4afe69e958cf8cc4eb62361694d2 SHA1 14fe5a7bc2710d0240e9208786b24f409e71b179 SHA256 3f55674c364d24e3977d896f3bc95745716c55817511c3fc7282523da0aca164 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk25rB8ACgkQHB6c3gNBRYc+fwCbBvFEEE6BzZIIh4kjasEole1a -ZF8An2GVfKZQF9AS3lGqWgXTK38DpVyb -=J9xv +iEYEARECAAYFAk29kqAACgkQHB6c3gNBRYdfpQCfXs/bK69Ps13DpygTA7xMhqFk +zFEAoKNI/oKR+KVMOul6o1I2M+jSy2J6 +=MVHm -----END PGP SIGNATURE----- diff --git a/media-sound/moc/files/moc-ffmpeg.patch b/media-sound/moc/files/moc-ffmpeg.patch new file mode 100644 index 000000000000..7554ea14e3d8 --- /dev/null +++ b/media-sound/moc/files/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include <ffmpeg/avformat.h> + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } diff --git a/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild b/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild index b0784acf7486..b2886c9694c8 100644 --- a/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild +++ b/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild,v 1.1 2011/04/28 18:04:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild,v 1.2 2011/05/01 17:05:43 scarabeus Exp $ EAPI=4 -inherit autotools +inherit autotools eutils DESCRIPTION="Music On Console - ncurses interface for playing audio files" HOMEPAGE="http://moc.daper.net" @@ -40,6 +40,8 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { + epatch \ + "${FILESDIR}/${PN}-ffmpeg.patch" eautoreconf } |