diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-21 07:41:47 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-21 07:41:47 +0000 |
commit | 432b95a0e2808cea0b53b8844e5773340971d161 (patch) | |
tree | 84b8613032dd554133709ee3d2809aea56eaee77 /media-sound | |
parent | Version bump (diff) | |
download | historical-432b95a0e2808cea0b53b8844e5773340971d161.tar.gz historical-432b95a0e2808cea0b53b8844e5773340971d161.tar.bz2 historical-432b95a0e2808cea0b53b8844e5773340971d161.zip |
Fix compability with dev-libs/libcdio-paranoia >= 0.90 wrt #452446
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/cmus/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/cmus/Manifest | 14 | ||||
-rw-r--r-- | media-sound/cmus/cmus-2.5.0-r1.ebuild | 97 | ||||
-rw-r--r-- | media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch | 100 |
4 files changed, 214 insertions, 5 deletions
diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog index 55e2b9d232bd..4a33b9e83d42 100644 --- a/media-sound/cmus/ChangeLog +++ b/media-sound/cmus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/cmus # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.60 2013/01/20 22:39:51 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.61 2013/04/21 07:41:34 ssuominen Exp $ + +*cmus-2.5.0-r1 (21 Apr 2013) + + 21 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> +cmus-2.5.0-r1.ebuild, + +files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch: + Fix compability with dev-libs/libcdio-paranoia >= 0.90 wrt #452446 20 Jan 2013; Christian Faulhammer <fauli@gentoo.org> cmus-2.5.0.ebuild: fix cdio issues, bug 452446 diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest index d89c0ba2b7d2..f7dd7ab4ce20 100644 --- a/media-sound/cmus/Manifest +++ b/media-sound/cmus/Manifest @@ -1,16 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch 3080 SHA256 5c28f763c34609a52a613c6c264a301c4cc21cb620d4cd0074786e27dca194c8 SHA512 8670c44c20819c724d1a14b8cc598b7987b5b220e93a5b799dd5355da0fd431e42ea6de450489a7c7e3ca3da5404679c0a491ced993e22fa73e1b3eb604fd8e6 WHIRLPOOL c2e8c89fde7be1839af9a335879f5959b812c93a3a1fe2023fbace221f846b87595f2b5fd6e57716aeb1dcfed1f781ab15fa58850cca79d038443095a34c4210 DIST cmus-v2.4.3.tar.bz2 204508 SHA256 c8b853d6cc4de6cc628fe1cf48f5a841ab230d818bdbf39131b69d88844bcffe SHA512 66ead39eab8bc5fbb9220240deb2ccf73f9320b00dd52ac3c143b56c6f52c2397699fcfab581b49bbd64b686d8a6822c38276c1bc45ee14b064901b1eb898742 WHIRLPOOL 24ffb1ae9777cc365e112ac06cf4e1a65e8d0bdcd91b87d57190266ef796af72c06962fdc35e0f44347754e5f57de8d7a100b095d6f7ad5b9909596afc070d2c DIST cmus-v2.5.0.tar.bz2 224675 SHA256 2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf SHA512 a43e976dd7ca39d576ae51b0f66f9bc4fa21f30626cb814fa237389c9bbc1c0b5a3a28b1d3d0d86527c3a3ffb771cc68d29d5ca8b88f0390bda7926e668504e4 WHIRLPOOL 44baaf57e0e572736f7d2ed2fa1f16c6712831c1e10de5ef26a142f7b366547fa39212e5f947fbba6401212c9ffd41f208f4cbc457d9d9ac9f08282fbedbeb3c EBUILD cmus-2.4.3.ebuild 2333 SHA256 b6b010b387210cb4b9ec40e72a4b24c6108065afddb1b38680f900d5047e233d SHA512 6c700e9e84e444fffa23520eee0423502716d6ad5509c8a0c9b0850bbea1cbe7113bd11ce736f3f0879c62e6635a142c27a372009aca36907bfb7a670015cf22 WHIRLPOOL 9267e02bef419a743e1a4c08ee3c52355267cba4c22f65019c1459b0cc66ba4a46c5bc522b2adfd5d83a0e54a6261a4a976a116ae9d14d9d6d9698649c54cfbb +EBUILD cmus-2.5.0-r1.ebuild 2737 SHA256 cbfc2bfd508fff286127c35078922f45b277961873285516ff6e0ee5d7d24cd7 SHA512 deecbb74a55a22220c4636455b9ef0034fbeecfde88b80a983af20753ea61998a37902a6a7b16b62ab6a9073cc32d3f3f6992545491096552344e04133b2348f WHIRLPOOL 5c5abd64f631626a2f5473071c94a157ac715e4e15b539854de6275c95353348a2c81d54c7793c8afea2d10e042c941e1d057aa5ddbfea9a0ec7bcdcbd2fd24e EBUILD cmus-2.5.0.ebuild 2769 SHA256 baa3d5bb12f803f15a1762ed24d943424a5845ee81450ae08696b42c879a33c0 SHA512 bdf697fb93aaf5d8fc7e3e661c764c1fb1d6d839d5f531409671c8295a7aadac3d2851333b1b0826ab770e53bba4a1f94928ab2b06dbc6b21b3deb873224b6d6 WHIRLPOOL 2d047ba6aa7a98656295906a930dcbf4dd87eb47d643ce2b5579787b8e05e4ccb3f3ccc5a503e448c2319add6d4be7d539035d1290e938e7d38c7156ca4d2c1c -MISC ChangeLog 9154 SHA256 a4805b496cf309322034f960fba0a7c52f5643edac2f76c8e6ab14a8b3956f3d SHA512 a87a655ab25148051dc406eec4fef4cd2cc4e427a9392261c05b2d462be4e26f30d6caa2b30fed8c8a321926f3bedf1bb1417fd641236915808096eac2a21ad0 WHIRLPOOL 4bc551135d62a4bb52c50db148d788da74e79daeb1f7de37dd8c02679969c293c5ef10a6a0ed9b4fe2cf0391f6ff7743f697a0cf56045a6456af7b4c6ea7a02b +MISC ChangeLog 9398 SHA256 33496dbb3921d8631b913098d7f98cd3c859a2914216949ad33ade1fdfe1557b SHA512 e3e8a0ff80438baf6424abf0fef38d065ff577e514674aa6d2cf36ba3252444ca5676931d2b4607e1eb4eaf2d4a8c205de3eed2da1dbecad687d7a525894b58f WHIRLPOOL 4d06ea3295caece3b67a097ca33051b35fb47ee58e94e9088d45aa6cb50828bd6248faa3fc4b65a06beb0a88c8caf9239cc7781e6ce8d6ffc6298886aa0288bd MISC metadata.xml 611 SHA256 d97e31156c3093352fd75327f7ebff1f97e6babf6b9f372277ab16c03811125f SHA512 5cda481701d4f94f8a09c06f7d0a7f583115d6e555bb33840384e6c0da9644218614cdbca0d6575641c341b2143d6cd852907ab2169b66d7d967f8f9d1eb29d9 WHIRLPOOL e3c34ac2fab6d1dabc290ee352f2e01532721d74295fc0ab012ef192e88fa9113eea601f863af429b25177ee153dd338443cdf6ce3e669fdfbeb3b1964df7fd6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlD8cmAACgkQNQqtfCuFneOmIACeKKfiaH9wUXEprORhUw5TiwgI -XB0AoJ1PvUo8+GhBFaLHX0L2hjbDxUlP -=UmBo +iQEcBAEBCAAGBQJRc5f0AAoJEEdUh39IaPFNmYsIAI8qWWFjB6MGtPFZMCg+1DMf +EKjREXUljdE7vQggXQdh76hxv6mtlgrNBMS43b4Yu0QrrhtTTaM1o/B1SkNQYeXO +xJ8XO8WrXe3IInWIKQMPD6LdmzYrJG4mc6aH3wqEJpK/TIAT5iRKhCyUXd+8cwlI +B8duoDA7cWb82/ezvHIJoUXi3xBeShZJCuO1x9gWl0/2FR4ajM1bkSQ/YQnVu1FI +e74uMgATOTS/bM0kX3992vJK5FbzxVja7IU3Aws/ajyNJ3DNf++IdfXIEVjk2tq/ +o24dy4HkIitXh4QidbQDVYeoYQPEgOyPiXfbkKbCjgRr50MVIFdvStl4FoSZw7U= +=jdiu -----END PGP SIGNATURE----- diff --git a/media-sound/cmus/cmus-2.5.0-r1.ebuild b/media-sound/cmus/cmus-2.5.0-r1.ebuild new file mode 100644 index 000000000000..362887019beb --- /dev/null +++ b/media-sound/cmus/cmus-2.5.0-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.5.0-r1.ebuild,v 1.1 2013/04/21 07:41:34 ssuominen Exp $ + +EAPI=5 +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 cue cdio cddb discid 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 ) + cue? ( media-libs/libcue ) + cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) + cddb? ( media-libs/libcddb ) + discid? ( media-libs/libdiscid ) + flac? ( media-libs/flac ) + mad? ( >=media-libs/libmad-0.14 ) + mikmod? ( media-libs/libmikmod:0 ) + modplug? ( >=media-libs/libmodplug-0.7 ) + mp4? ( >=media-libs/libmp4v2-1.9:0 ) + musepack? ( >=media-sound/musepack-tools-444 ) + pulseaudio? ( media-sound/pulseaudio ) + vorbis? ( >=media-libs/libvorbis-1.0 ) + wavpack? ( media-sound/wavpack ) + wma? ( >=virtual/ffmpeg-0.10.2-r1 )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + zsh-completion? ( app-shells/zsh ) + pidgin? ( net-im/pidgin + dev-python/dbus-python )" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-cdio-make-it-work-with-libcdio-0.90.patch #452446 +} + +my_config() { + local value + use ${1} && value=a || value=n + myconf="${myconf} ${2}=${value}" +} + +src_configure() { + local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n" + + use debug && debuglevel=2 + + my_config cue CONFIG_CUE + my_config cddb CONFIG_CDDB + my_config cdio CONFIG_CDIO + my_config discid CONFIG_DISCID + 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.5.0-cdio-make-it-work-with-libcdio-0.90.patch b/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch new file mode 100644 index 000000000000..ace57bf075cb --- /dev/null +++ b/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch @@ -0,0 +1,100 @@ +From 70c727022dcfd802de0d621255ab1a366a50c434 Mon Sep 17 00:00:00 2001 +From: Gregory Petrosyan <gregory.petrosyan@gmail.com> +Date: Mon, 28 Jan 2013 16:13:40 +0400 +Subject: [PATCH] cdio: make it work with libcdio 0.90+ + +Signed-off-by: Gregory Petrosyan <gregory.petrosyan@gmail.com> +--- + cdio.c | 47 ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 38 insertions(+), 9 deletions(-) + +diff --git a/cdio.c b/cdio.c +index b88983a..b248b3a 100644 +--- a/cdio.c ++++ b/cdio.c +@@ -27,9 +27,14 @@ + #include "comment.h" + #include "discid.h" + +-#include <cdio/cdda.h> + #include <cdio/cdio.h> + #include <cdio/logging.h> ++#if LIBCDIO_VERSION_NUM >= 90 ++#include <cdio/paranoia/cdda.h> ++#else ++#include <cdio/cdda.h> ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -352,24 +357,47 @@ static int libcdio_read_comments(struct input_plugin_data *ip_data, struct keyva + GROWING_KEYVALS(c); + const char *artist = NULL, *albumartist = NULL, *album = NULL, + *title = NULL, *genre = NULL, *comment = NULL; +- const cdtext_t *cdtext_track, *cdtext_album; ++ int track_comments_found = 0; ++ const cdtext_t *cdt; + #ifdef HAVE_CDDB + cddb_conn_t *cddb_conn = NULL; + cddb_disc_t *cddb_disc = NULL; + #endif + char buf[64]; + +- cdtext_track = cdio_get_cdtext(priv->cdio, priv->track); +- if (cdtext_track) { +- char * const *field = cdtext_track->field; ++#if LIBCDIO_VERSION_NUM >= 90 ++ cdt = cdio_get_cdtext(priv->cdio); ++ if (cdt) { ++ artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track); ++ title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track); ++ genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track); ++ comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track); ++ ++ if (title) ++ track_comments_found = 1; ++ ++ album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0); ++ albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0); ++ if (!artist) ++ artist = albumartist; ++ if (!genre) ++ genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0); ++ if (!comment) ++ comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0); ++ } ++#else ++ cdt = cdio_get_cdtext(priv->cdio, priv->track); ++ if (cdt) { ++ track_comments_found = 1; ++ char * const *field = cdt->field; + artist = field[CDTEXT_PERFORMER]; + title = field[CDTEXT_TITLE]; + genre = field[CDTEXT_GENRE]; + comment = field[CDTEXT_MESSAGE]; + } +- cdtext_album = cdio_get_cdtext(priv->cdio, 0); +- if (cdtext_album) { +- char * const *field = cdtext_album->field; ++ cdt = cdio_get_cdtext(priv->cdio, 0); ++ if (cdt) { ++ char * const *field = cdt->field; + album = field[CDTEXT_TITLE]; + albumartist = field[CDTEXT_PERFORMER]; + if (!artist) +@@ -379,9 +407,10 @@ static int libcdio_read_comments(struct input_plugin_data *ip_data, struct keyva + if (!comment) + comment = field[CDTEXT_MESSAGE]; + } ++#endif + + #ifdef HAVE_CDDB +- if (!cdtext_track && cddb_url && cddb_url[0]) { ++ if (!track_comments_found && cddb_url && cddb_url[0]) { + cddb_track_t *cddb_track; + track_t i_tracks = cdio_get_num_tracks(priv->cdio); + track_t i_first_track = cdio_get_first_track_num(priv->cdio); +-- +1.8.2.1 + |