diff options
| -rw-r--r-- | media-video/kaffeine/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/kaffeine/files/digest-kaffeine-0.6-r1 | 1 | ||||
| -rw-r--r-- | media-video/kaffeine/files/kaffeine-0.6-formats.patch | 81 | ||||
| -rw-r--r-- | media-video/kaffeine/kaffeine-0.6-r1.ebuild | 29 |
4 files changed, 5 insertions, 112 deletions
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog index 22258f569674..8a970aab7a58 100644 --- a/media-video/kaffeine/ChangeLog +++ b/media-video/kaffeine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/kaffeine # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.42 2006/01/15 02:45:48 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.43 2006/01/15 13:29:23 flameeyes Exp $ + + 15 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kaffeine-0.6-formats.patch, -kaffeine-0.6-r1.ebuild: + Drop old version. 15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> kaffeine-0.7.1.ebuild: Stable on amd64, bug 118669. diff --git a/media-video/kaffeine/files/digest-kaffeine-0.6-r1 b/media-video/kaffeine/files/digest-kaffeine-0.6-r1 deleted file mode 100644 index f33ec0a43dda..000000000000 --- a/media-video/kaffeine/files/digest-kaffeine-0.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7412abf5f646a0fd62ac5ad3dba80ab2 kaffeine-0.6.tar.bz2 1784898 diff --git a/media-video/kaffeine/files/kaffeine-0.6-formats.patch b/media-video/kaffeine/files/kaffeine-0.6-formats.patch deleted file mode 100644 index 7ee47fc6ca2b..000000000000 --- a/media-video/kaffeine/files/kaffeine-0.6-formats.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ur -x '*~' kaffeine-0.6/kaffeine/dvb/dvbpanel.cpp kaffeine-0.6-gcc4/kaffeine/dvb/dvbpanel.cpp ---- kaffeine-0.6/kaffeine/dvb/dvbpanel.cpp 2005-02-02 11:08:24.000000000 +0100 -+++ kaffeine-0.6-gcc4/kaffeine/dvb/dvbpanel.cpp 2005-05-30 01:25:44.710617768 +0200 -@@ -679,7 +679,7 @@ - int apidn=napid; - int i; - -- fprintf( stderr, "Tuning to : %s / autocount : %d\n", chan->name.latin1(), autocount ); -+ fprintf( stderr, "Tuning to : %s / autocount : %lu\n", chan->name.latin1(), autocount ); - QTime tm; - tm.start(); - int ret = dvb->goLive( chan, fifoName, apidn ); -diff -ur -x '*~' kaffeine-0.6/kaffeine/dvb/dvbsi.cpp kaffeine-0.6-gcc4/kaffeine/dvb/dvbsi.cpp ---- kaffeine-0.6/kaffeine/dvb/dvbsi.cpp 2005-02-02 11:08:25.000000000 +0100 -+++ kaffeine-0.6-gcc4/kaffeine/dvb/dvbsi.cpp 2005-05-30 01:26:16.219827640 +0200 -@@ -176,19 +176,19 @@ - s = t.setNum( getBits(b,0,32), 16 ); - freq = s.toInt(); - freq /=100; -- fprintf( stderr, " %d\n", freq ); -+ fprintf( stderr, " %lu\n", freq ); - trans->freqlist.append( freq ); - break; - case 2: // cable - s = t.setNum( getBits(b,0,32), 16 ); - freq = s.toInt(); - freq /=10; -- fprintf( stderr, " %d\n", freq ); -+ fprintf( stderr, " %lu\n", freq ); - trans->freqlist.append( freq ); - break; - case 3: // terrestrial - freq = getBits(b,0,32)/100; -- fprintf( stderr, " %d\n", freq ); -+ fprintf( stderr, " %lu\n", freq ); - trans->freqlist.append( freq ); - break; - } -@@ -385,7 +385,7 @@ - } - } - if ( j!=-1 ) { -- fprintf(stderr," Appending freq %d to %d\n", trans->freqlist[i], curtrans->freq ); -+ fprintf(stderr," Appending freq %lu to %lu\n", trans->freqlist[i], curtrans->freq ); - curtrans->freqlist.append( trans->freqlist[i] ); - } - } -diff -ur -x '*~' kaffeine-0.6/kaffeine/dvb/dvbstream.cpp kaffeine-0.6-gcc4/kaffeine/dvb/dvbstream.cpp ---- kaffeine-0.6/kaffeine/dvb/dvbstream.cpp 2005-02-15 09:18:35.000000000 +0100 -+++ kaffeine-0.6-gcc4/kaffeine/dvb/dvbstream.cpp 2005-05-30 01:26:51.809417200 +0200 -@@ -262,7 +262,7 @@ - feparams.u.qam.symbol_rate = srate; - feparams.u.qam.fec_inner = chan->tp.coderateH; - feparams.u.qam.modulation = chan->tp.modulation; -- fprintf(stderr,"inv:%d sr:%d fecH:%d mod:%d\n", chan->tp.inversion, -+ fprintf(stderr,"inv:%d sr:%lu fecH:%d mod:%d\n", chan->tp.inversion, - srate, chan->tp.coderateH, chan->tp.modulation ); - break; - } -diff -ur -x '*~' kaffeine-0.6/kaffeine/player-parts/http.c kaffeine-0.6-gcc4/kaffeine/player-parts/http.c ---- kaffeine-0.6/kaffeine/player-parts/http.c 2005-02-02 11:08:25.000000000 +0100 -+++ kaffeine-0.6-gcc4/kaffeine/player-parts/http.c 2005-05-30 01:24:39.999455360 +0200 -@@ -56,6 +56,7 @@ - #include <string.h> - #include <ctype.h> - #include <errno.h> -+#include <inttypes.h> - - #include "http.h" - -@@ -516,8 +517,8 @@ - if (this->contentlength == 0) { - intmax_t contentlength; - -- if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %Ld", &contentlength) == 1) { -- printf ("http: content length = %Ld bytes\n", contentlength); -+ if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %" PRIdMAX, &contentlength) == 1) { -+ printf ("http: content length = %" PRIdMAX " bytes\n", contentlength); - this->contentlength = (off_t)contentlength; - } - } diff --git a/media-video/kaffeine/kaffeine-0.6-r1.ebuild b/media-video/kaffeine/kaffeine-0.6-r1.ebuild deleted file mode 100644 index 6755d2be2b74..000000000000 --- a/media-video/kaffeine/kaffeine-0.6-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.6-r1.ebuild,v 1.5 2005/06/30 15:35:02 danarmak Exp $ - -inherit eutils kde - -DESCRIPTION="Media player for KDE based on xine-lib." -HOMEPAGE="http://kaffeine.sourceforge.net/" -SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" -IUSE="dvb" - -DEPEND=">=x11-base/xorg-x11-6.8.0-r4 - >=media-libs/xine-lib-1 - dvb? ( >=sys-kernel/linux-headers-2.6 )" - -# the dependency on xorg-x11 is meant to avoid bug #59746 - -need-kde 3.2 - -src_unpack() { - kde_src_unpack - cd ${S} - - epatch ${FILESDIR}/${P}-formats.patch -} |