diff options
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/cmus/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/cmus/Manifest | 19 | ||||
| -rw-r--r-- | media-sound/cmus/cmus-2.4.2.ebuild | 90 | ||||
| -rw-r--r-- | media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch | 130 |
4 files changed, 240 insertions, 7 deletions
diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog index 30960e3aa95e..935419b43100 100644 --- a/media-sound/cmus/ChangeLog +++ b/media-sound/cmus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/cmus # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.47 2011/07/17 10:33:46 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.48 2011/09/30 08:04:32 radhermit Exp $ + +*cmus-2.4.2 (30 Sep 2011) + + 30 Sep 2011; Tim Harder <radhermit@gentoo.org> +cmus-2.4.2.ebuild, + +files/cmus-2.4.2-ffmpeg.patch: + Version bump (bug #378445). *cmus-2.4.1 (17 Jul 2011) diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest index ddad8b7ca3bb..638d49b55a9a 100644 --- a/media-sound/cmus/Manifest +++ b/media-sound/cmus/Manifest @@ -1,19 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX cmus-2.3.4-detect_mp4.h.patch 883 RMD160 501845ed81350bd6b99872b38289d573e335d146 SHA1 90863c07b35d157304b6f5a4b6e03f03256c8407 SHA256 41dad941beef8f6e8e0b86c42523d4caecb0935296a9a39037667b9ac4941f0b +AUX cmus-2.4.2-ffmpeg.patch 3387 RMD160 7bc71b1d57dd799729b2a807c8cc3034fab399b8 SHA1 863d039319acb7d41d062069375d6797b7b88c83 SHA256 09c6e2e72e8332414a074d6de48a3be92ee1dcf4c10e8065d9d58b0c3f4a70a0 DIST cmus-v2.3.2.tar.bz2 167078 RMD160 bef8227ce02cb3c2c09e6014246a784ae4b3f5fc SHA1 fdfb96f0c53373475ecd05139ebfcb3fd4613a18 SHA256 27d7d17e00945e70c14e33f9d46608e0ba7fee0513b2714feec157e46f90ca46 DIST cmus-v2.4.0.tar.bz2 202970 RMD160 3c169d33e756b4fd18730227e091a7ebe2237a8f SHA1 cbd80d1ff12be5dbf9a3b8b6494381f8b3073761 SHA256 42a1ea7597d7388e50a1534ad1f51636ce05cf31a939e01b4901a539f7348803 DIST cmus-v2.4.1.tar.bz2 203515 RMD160 977bd55cda7d7f22dfe2511c58e4acd213455a98 SHA1 918c637becdcbca3652b836b38b164eb852fa896 SHA256 402f2f17ca2e961e1b3426733db25edc2dcdbc6d1aa4dfb32ddadb05f6c37934 +DIST cmus-v2.4.2.tar.bz2 204285 RMD160 3fbe7f9c5fb2f8cd21672769c7b551b099fd007f SHA1 12573e96e03435eca9b8a4aaeeb13a2da66f40a4 SHA256 1f54d94574f0f7f9beca34908b16141f8eb89070728305d8906b8dc19cca0c31 EBUILD cmus-2.3.2.ebuild 2334 RMD160 55277d3736e82f0b78bf4d1fcbc9ef9fa412133c SHA1 9b9a112287d5594a1b5a9779ee04ab4b4c47aa7b SHA256 bb2e894dcd1bd36c4261f8cb5b0728f62fb6cd2e60fcfc20a48cd357da6dc075 EBUILD cmus-2.4.0.ebuild 2385 RMD160 3e64ec230dbba76a539f0566a335fdb94c2464b8 SHA1 094fd615472d0146e995efac815e8fc996524346 SHA256 a38c280f7589b38a55cc7c323be0f69f4ed3fbf48518c6b49131230c8df7c979 EBUILD cmus-2.4.1.ebuild 2385 RMD160 e14fa5c09d8a58bd106724a23b6a6bae67c29210 SHA1 f9a1b3ab4c1ce554768455843b1354ed17b67b7b SHA256 8daa101198004a83b54734d14806b476fbadac6e2b4d4606117ab4b5ae8f90ae -MISC ChangeLog 7288 RMD160 3938cb6a454ca27002462f08d32a5f4821ac065f SHA1 a7ace6e8b8d39c9f7abd68290132236a773479da SHA256 d71943fede35975c3c099820b23ad91e44a26f2785d4c3b6d03416fb8badf049 +EBUILD cmus-2.4.2.ebuild 2379 RMD160 51ccb47e9d9bbba847f0bbce7d8329e8e5c38d65 SHA1 bf78f5c35ee5bb16173fa32f2da667dcd0a386d3 SHA256 d754918bbbdd3d4654e1d95a90a7fb5f095494b5b0368c4e2b68b56b373453ee +MISC ChangeLog 7453 RMD160 760e950d2bd8ee200fb29cdd8aa5e05260f44deb SHA1 4635887b31436db98b68b557d3a6248735a3ea04 SHA256 68a4a36d7de092d6a99f1279220c67924c9855b7b2d13663189fb1fc61395822 MISC metadata.xml 429 RMD160 b012d0b87dd5b8301c599ad13a0f9b41032f970d SHA1 4239c00ab77d094867e9430c7e31e335d24669ed SHA256 4433bda20d42a74320957493f0f7cf2ddfc70e6f06875f136fe1d70c64c2e28b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4iup0ACgkQNQqtfCuFneMWBwCfedfy6m6NZwYv8Q10vI9AN7pW -W9QAn3cvRi/qYhZTCvlDMO7APNi1VBUI -=wXoh +iQEcBAEBCgAGBQJOhXgZAAoJEEqz6FtPBkyjt6gH/jgAYcxU654DeAMfgbAQCbRk +lSEjpoyOppwVh/TG1zvLbKj40SNah8N8uF0m8aQUWBxMfHzNEVxIZcpFCT+3SWP2 +guuBIf7u4zdZSnAXilNH14VitVuzp+T6qqiD/LrSZnsjLDeZ97VFwB6Zp911P9RR +QPpEEcf8XCggBj9wdvD5omrKBTRgBceD74pCaemgacMMKopvo2hGcTrGMPu3xroc +ulk8pBYdjBLF+xhjwqAq3DHEKtaetpS28+xhqv2lyYzfc1asDWRZmUtGXtA+OvWZ +ktr14g2wrByI+tzVY//g1w2L6nRBe4gU8hk+oNncuv+QOhmSJFaAPz1Kz+hv8es= +=Wr2h -----END PGP SIGNATURE----- diff --git a/media-sound/cmus/cmus-2.4.2.ebuild b/media-sound/cmus/cmus-2.4.2.ebuild new file mode 100644 index 000000000000..747b100a7f29 --- /dev/null +++ b/media-sound/cmus/cmus-2.4.2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.1 2011/09/30 08:04:32 radhermit Exp $ + +EAPI=4 +inherit eutils multilib + +MY_P=${PN}-v${PV} + +DESCRIPTION="A ncurses based music player with plugin support for many formats" +HOMEPAGE="http://cmus.sourceforge.net/" +SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss +pidgin pulseaudio unicode vorbis wavpack wma zsh-completion" + +CDEPEND="sys-libs/ncurses[unicode?] + aac? ( media-libs/faad2 ) + alsa? ( >=media-libs/alsa-lib-1.0.11 ) + ao? ( media-libs/libao ) + flac? ( media-libs/flac ) + mad? ( >=media-libs/libmad-0.14 ) + mikmod? ( media-libs/libmikmod ) + modplug? ( >=media-libs/libmodplug-0.7 ) + mp4? ( >=media-libs/libmp4v2-1.9 ) + musepack? ( >=media-sound/musepack-tools-444 ) + pulseaudio? ( media-sound/pulseaudio ) + vorbis? ( >=media-libs/libvorbis-1.0 ) + wavpack? ( media-sound/wavpack ) + wma? ( virtual/ffmpeg )" +DEPEND="${CDEPEND} + dev-util/pkgconfig" +RDEPEND="${CDEPEND} + zsh-completion? ( app-shells/zsh ) + pidgin? ( net-im/pidgin + dev-python/dbus-python )" + +S=${WORKDIR}/${MY_P} + +my_config() { + local value + use ${1} && value=a || value=n + myconf="${myconf} ${2}=${value}" +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-ffmpeg.patch +} + +src_configure() { + local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n" + + use debug && debuglevel=2 + + my_config flac CONFIG_FLAC + my_config mad CONFIG_MAD + my_config modplug CONFIG_MODPLUG + my_config mikmod CONFIG_MIKMOD + my_config musepack CONFIG_MPC + my_config vorbis CONFIG_VORBIS + my_config wavpack CONFIG_WAVPACK + my_config mp4 CONFIG_MP4 + my_config aac CONFIG_AAC + my_config wma CONFIG_FFMPEG + my_config pulseaudio CONFIG_PULSE + my_config alsa CONFIG_ALSA + my_config ao CONFIG_AO + my_config oss CONFIG_OSS + + ./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \ + libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die +} + +src_install() { + default + + use examples || rm -rf "${D}"/usr/share/doc/${PF}/examples + + if use zsh-completion; then + insinto /usr/share/zsh/site-functions + doins contrib/_cmus + fi + + if use pidgin; then + newbin contrib/cmus-updatepidgin.py cmus-updatepidgin + fi +} diff --git a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch new file mode 100644 index 000000000000..c1ca17e72391 --- /dev/null +++ b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch @@ -0,0 +1,130 @@ +--- cmus-v2.4.2/ffmpeg.c.orig ++++ cmus-v2.4.2/ffmpeg.c +@@ -21,6 +21,7 @@ + #include "xmalloc.h" + #include "debug.h" + #include "utils.h" ++#include "comment.h" + #include "config/ffmpeg.h" + + #include <stdio.h> +@@ -32,6 +33,9 @@ + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> + #include <libavformat/avio.h> ++#ifndef AVUTIL_MATHEMATICS_H ++#include <libavutil/mathematics.h> ++#endif + #endif + + #if (LIBAVFORMAT_VERSION_INT < ((52<<16)+(31<<8)+0)) +@@ -52,10 +56,19 @@ + #endif + #endif + ++#if (LIBAVUTIL_VERSION_INT < ((51<<16)+(5<<8)+0)) ++#define AV_DICT_IGNORE_SUFFIX AV_METADATA_IGNORE_SUFFIX ++#define av_dict_get av_metadata_get ++#define AVDictionaryEntry AVMetadataTag ++#endif ++ + struct ffmpeg_input { + AVPacket pkt; + int curr_pkt_size; + uint8_t *curr_pkt_buf; ++ ++ unsigned long curr_size; ++ unsigned long curr_duration; + }; + + struct ffmpeg_output { +@@ -166,18 +179,26 @@ + int stream_index = -1; + AVCodec *codec; + AVCodecContext *cc = NULL; +- AVFormatContext *ic; ++ AVFormatContext *ic = NULL; + + ffmpeg_init(); + ++#if (LIBAVFORMAT_VERSION_INT < ((53<<16)+(2<<8)+0)) + err = av_open_input_file(&ic, ip_data->filename, NULL, 0, NULL); ++#else ++ err = avformat_open_input(&ic, ip_data->filename, NULL, NULL); ++#endif + if (err < 0) { + d_print("av_open failed: %d\n", err); + return -IP_ERROR_FILE_FORMAT; + } + + do { ++#if (LIBAVFORMAT_VERSION_INT < ((53<<16)+(3<<8)+0)) + err = av_find_stream_info(ic); ++#else ++ err = avformat_find_stream_info(ic, NULL); ++#endif + if (err < 0) { + d_print("unable to find stream info: %d\n", err); + err = -IP_ERROR_FILE_FORMAT; +@@ -208,7 +229,11 @@ + if (codec->capabilities & CODEC_CAP_TRUNCATED) + cc->flags |= CODEC_FLAG_TRUNCATED; + ++#if (LIBAVCODEC_VERSION_INT < ((53<<16)+(6<<8)+0)) + if (avcodec_open(cc, codec) < 0) { ++#else ++ if (avcodec_open2(cc, codec, NULL) < 0) { ++#endif + d_print("could not open codec: %d, %s\n", cc->codec_id, cc->codec_name); + err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; + break; +@@ -299,6 +324,8 @@ + } + input->curr_pkt_size = input->pkt.size; + input->curr_pkt_buf = input->pkt.data; ++ input->curr_size += input->pkt.size; ++ input->curr_duration += input->pkt.duration; + continue; + } + +@@ -409,7 +436,7 @@ + char buff[16]; + int i = 0; + +- *comments = xnew0(struct keyval, NUM_FFMPEG_KEYS + 1); ++ *comments = keyvals_new(NUM_FFMPEG_KEYS); + + i = set_comment(*comments, i, "artist", ic->author); + i = set_comment(*comments, i, "album", ic->album); +@@ -427,9 +454,9 @@ + } + #else + GROWING_KEYVALS(c); +- AVMetadataTag *tag = NULL; ++ AVDictionaryEntry *tag = NULL; + +- while ((tag = av_metadata_get(ic->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { ++ while ((tag = av_dict_get(ic->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + if (tag && tag->value[0]) + comments_add_const(&c, tag->key, tag->value); + } +@@ -472,15 +499,15 @@ + }; + + const int ip_priority = 30; +-#ifdef USE_FALLBACK_IP +-const char *const ip_extensions[] = { "any", NULL }; +-#else + const char *const ip_extensions[] = { + "ac3", "aif", "aifc", "aiff", "ape", "au", "mka", "shn", "tta", "wma", + /* also supported by other plugins */ + "aac", "fla", "flac", "m4a", "m4b", "mp+", "mp2", "mp3", "mp4", "mpc", + "mpp", "ogg", "wav", "wv", ++#ifdef USE_FALLBACK_IP ++ "*", ++#endif + NULL + }; +-#endif + const char *const ip_mime_types[] = { NULL }; ++const char * const ip_options[] = { NULL }; |