Add kaffeine with a fix for HTTP input.

(Portage version: 2.1_pre7-r4)

5 files changed, 157 insertions, 11 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 84782cdc6674..49a4733ab85d 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2006/03/26 17:15:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.48 2006/04/04 13:23:00 flameeyes Exp $
+
+*kaffeine-0.7.1-r2 (04 Apr 2006)
+
+  04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kaffeine-0.7.1-input-http.patch, +kaffeine-0.7.1-r2.ebuild:
+  Add kaffeine with a fix for HTTP input.
 
 *kaffeine-0.8-r1 (26 Mar 2006)
 
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 3b70ba071bea..795bad12327d 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c6e0a302c1ce64670e67300c30c90d0d ChangeLog 7021
 RMD160 470bbb92d9e1e835820057469e6b14015943415e ChangeLog 7021
 SHA256 342b4a71fb3ddf8a30304383085678eeacc7e3a342e4cee59611d5dd6471b1d3 ChangeLog 7021
@@ -10,9 +7,15 @@ SHA256 163c75a6548acea933e26e1ff891902b8744e5347ab71d4da88f8947747356d0 files/di
 MD5 baa75a66b8d3d549ad9f21ff7924d9d1 files/digest-kaffeine-0.7.1-r1 250
 RMD160 d8d51761537e9c4d29cc821c5e0589a821904952 files/digest-kaffeine-0.7.1-r1 250
 SHA256 be7cdc2892bb3974674212480a401b7a94746757df65e419657a4b117dc46676 files/digest-kaffeine-0.7.1-r1 250
+MD5 baa75a66b8d3d549ad9f21ff7924d9d1 files/digest-kaffeine-0.7.1-r2 250
+RMD160 d8d51761537e9c4d29cc821c5e0589a821904952 files/digest-kaffeine-0.7.1-r2 250
+SHA256 be7cdc2892bb3974674212480a401b7a94746757df65e419657a4b117dc46676 files/digest-kaffeine-0.7.1-r2 250
 MD5 849d5274cba2a51535717f014ab97942 files/digest-kaffeine-0.8-r1 244
 RMD160 b822f853b832a7b51d6a96fa6f612d5a86413ce8 files/digest-kaffeine-0.8-r1 244
 SHA256 f3150a31a2e25277b220cc5c5625abbfeba0b137d60739b13dd6108c80ca3014 files/digest-kaffeine-0.8-r1 244
+MD5 1f531ad96f5f7c767e4140f20f0d64ec files/kaffeine-0.7.1-input-http.patch 3463
+RMD160 f939e4d66e367a1d912045359fd9b31c53788ddf files/kaffeine-0.7.1-input-http.patch 3463
+SHA256 54922b6b371ffec0e3197c44468d994b816149ee4b2bf8a021de36a90fc59a33 files/kaffeine-0.7.1-input-http.patch 3463
 MD5 b7928429203a468028065c0c285dd5da files/kaffeine-0.7.1-respectflags.patch 782
 RMD160 5ebc90fcb28f80ed0cc16a5bd0b4e030e5116983 files/kaffeine-0.7.1-respectflags.patch 782
 SHA256 dd0ee0894669490381e9f87132a4c0d0c7ce05ce6dba0e582a573317d0354ac5 files/kaffeine-0.7.1-respectflags.patch 782
@@ -31,6 +34,9 @@ SHA256 3c3baee40311c9505e2c6f77960543dc5534e35698223b6d4532877ba86619a1 files/ka
 MD5 e3c21f89274d06b9b8cfacab5a9ef250 kaffeine-0.7.1-r1.ebuild 1216
 RMD160 bbc549ee341907458f5a9aa5f1185da867f855c0 kaffeine-0.7.1-r1.ebuild 1216
 SHA256 2f781a276a11a0bd4547b72d683dc605ac23b026bce1bd2aa013c3d22d2a729b kaffeine-0.7.1-r1.ebuild 1216
+MD5 e8b31d6349c88fc24049bd5ee827b943 kaffeine-0.7.1-r2.ebuild 1251
+RMD160 27820f5253c6af7244d0d5f32c1905f6553d899c kaffeine-0.7.1-r2.ebuild 1251
+SHA256 c8d49ab1ed96eaa7f98ba41c2bd781ca6c6c94ac6ffb3f381356b2db5959b1ea kaffeine-0.7.1-r2.ebuild 1251
 MD5 9c4a5494b3cdf2d6eea3ea75aad55d28 kaffeine-0.7.1.ebuild 924
 RMD160 d602e7de068f60c6de284721fbaa578c7b59d0e5 kaffeine-0.7.1.ebuild 924
 SHA256 7ece6c6cf2a21fd7be2dec15add9daff78ac4097f21160ed00df3b358fe4bb97 kaffeine-0.7.1.ebuild 924
@@ -40,10 +46,3 @@ SHA256 fad161304f3add3ef4bf21b3a1399146a664311405729b94d7f6b1dc1d210664 kaffeine
 MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
 RMD160 4e4c9dfa9b5102163a4f7b231f95672bd2266c0d metadata.xml 175
 SHA256 ee81a2309bd9eae88d896b77f0d87adbb941cf18f82eea08c025eb583ac6043d metadata.xml 175
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEJsxpAiZjviIA2XgRAq7BAKDfJFOMgiFxUopfB+hXsLp2f2+VSQCeKDZx
-ZoTYO4NYg1raj0Y5a3sjRfQ=
-=sG2J
------END PGP SIGNATURE-----
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.7.1-r2 b/media-video/kaffeine/files/digest-kaffeine-0.7.1-r2
new file mode 100644
index 000000000000..21e82a1a8d49
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.7.1-r2
@@ -0,0 +1,3 @@
+MD5 afde61516eb8f6cf2c3bf085a22ef427 kaffeine-0.7.1.tar.bz2 2276747
+RMD160 b609bc47dd7cc11753c016bf0da3214f54fa8df0 kaffeine-0.7.1.tar.bz2 2276747
+SHA256 7e2611ba4fb4cc5b6a1802250a5c404b22cca434ce1d3bbe83088f6189bfa145 kaffeine-0.7.1.tar.bz2 2276747
diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-input-http.patch b/media-video/kaffeine/files/kaffeine-0.7.1-input-http.patch
new file mode 100644
index 000000000000..796d07c18a4e
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.7.1-input-http.patch
@@ -0,0 +1,92 @@
+Index: kaffeine/kaffeine/player-parts/http.c
+===================================================================
+--- kaffeine/kaffeine/player-parts/http.c	(revision 521094)
++++ kaffeine/kaffeine/player-parts/http.c	(working copy)
+@@ -308,7 +308,7 @@ static http_t *http_open (const char *mr
+ 
+   http_t   *this;
+   char     *proxy;
+-  int       done,len,linenum;
++  int       done,len,linenum,buflen;
+   char      mime_type[BUFSIZE+1];
+ 
+   this = malloc (sizeof (http_t));
+@@ -362,13 +362,13 @@ static http_t *http_open (const char *mr
+   {
+     char buf[256];
+ 
+-    sprintf (buf, "http: opening >/%s< on host >%s<",
++    snprintf (buf, sizeof(buf), "http: opening >/%s< on host >%s<",
+ 	     this->filename, this->host);
+ 
+     if (proxy != NULL)
+-      sprintf(buf, "%s via proxy >%s<", buf, this->proxyhost);
++      snprintf(buf, sizeof(buf), "%s via proxy >%s<", buf, this->proxyhost);
+ 
+-    sprintf(buf, "%s\n", buf);
++    snprintf(buf, sizeof(buf), "%s\n", buf);
+ 
+     printf (buf);
+   }
+@@ -389,35 +389,42 @@ static http_t *http_open (const char *mr
+ 
+   if (proxy != NULL)
+     if (this->port != DEFAULT_HTTP_PORT)
+-      sprintf (this->buf, "GET http://%s:%d/%s HTTP/1.0\015\012",
+-	       this->host, this->port, this->filename);
++      snprintf (this->buf, BUFSIZE, "GET http://%s:%d/%s HTTP/1.0\015\012",
++	        this->host, this->port, this->filename);
+     else
+-      sprintf (this->buf, "GET http://%s/%s HTTP/1.0\015\012",
+-	       this->host, this->filename);
++      snprintf (this->buf, BUFSIZE, "GET http://%s/%s HTTP/1.0\015\012",
++	        this->host, this->filename);
+   else
+-    sprintf (this->buf, "GET /%s HTTP/1.0\015\012", this->filename);
++    snprintf (this->buf, BUFSIZE, "GET /%s HTTP/1.0\015\012", this->filename);
+ 
++  buflen = strlen(this->buf);
+   if (this->port != DEFAULT_HTTP_PORT)
+-    sprintf (this->buf + strlen(this->buf), "Host: %s:%d\015\012",
+-	     this->host, this->port);
++    snprintf (this->buf + buflen, BUFSIZE - buflen, "Host: %s:%d\015\012",
++	      this->host, this->port);
+   else
+-    sprintf (this->buf + strlen(this->buf), "Host: %s\015\012",
+-	     this->host);
++    snprintf (this->buf + buflen, BUFSIZE - buflen, "Host: %s\015\012",
++	      this->host);
+ 
+-  if (this->proxyuser != NULL)
+-    sprintf (this->buf + strlen(this->buf), "Proxy-Authorization: Basic %s\015\012",
+-	     this->proxyauth);
++  buflen = strlen(this->buf);
++  if (this->proxyuser != NULL) {
++    snprintf (this->buf + buflen, BUFSIZE - buflen, "Proxy-Authorization: Basic %s\015\012",
++	      this->proxyauth);
++    buflen = strlen(this->buf);
++  }
+ 
+-  if (this->user != NULL)
+-    sprintf (this->buf + strlen(this->buf), "Authorization: Basic %s\015\012",
+-	     this->auth);
++  if (this->user != NULL) {
++    snprintf (this->buf + buflen, BUFSIZE - buflen, "Authorization: Basic %s\015\012",
++	      this->auth);
++    buflen = strlen(this->buf);
++  }
+ 
+-  sprintf (this->buf + strlen(this->buf), "User-Agent: xine/%s\015\012",
++  snprintf (this->buf + buflen, BUFSIZE - buflen, "User-Agent: xine/%s\015\012",
+ 	   VERSION);
+ 
+-  strcat (this->buf, "Accept: */*\015\012");
+-
+-  strcat (this->buf, "\015\012");
++  buflen = strlen(this->buf);
++  snprintf (this->buf + buflen, BUFSIZE - buflen, "Accept: */*\015\012");
++  buflen = strlen(this->buf);
++  snprintf (this->buf + buflen, BUFSIZE - buflen, "\015\012");
+ 
+   if (write (this->fh, this->buf, strlen(this->buf)) != (ssize_t)strlen(this->buf)) {
+     free (this);
diff --git a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..6ecf8c75a136
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild,v 1.1 2006/04/04 13:23:00 flameeyes Exp $
+
+inherit eutils kde
+
+DESCRIPTION="Media player for KDE using xine and gstreamer backends."
+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 gstreamer xinerama"
+
+RDEPEND="|| ( x11-base/xorg-server
+	      >=x11-base/xorg-x11-6.8.0-r4 )
+	>=media-libs/xine-lib-1
+	gstreamer? ( =media-libs/gstreamer-0.8*
+		=media-libs/gst-plugins-0.8* )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+
+DEPEND="${RDEPEND}
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dvb? ( >=sys-kernel/linux-headers-2.6 )
+	dev-util/pkgconfig"
+
+# the dependency on xorg-x11 is meant to avoid bug #59746
+
+PATCHES="${FILESDIR}/${P}-systemproto.patch
+	${FILESDIR}/${P}-xinerama.patch
+	${FILESDIR}/${P}-respectflags.patch
+	${FILESDIR}/${P}-input-http.patch"
+
+need-kde 3.2
+
+src_compile() {
+	rm ${S}/configure
+
+	myconf="${myconf}
+		$(use_with xinerama)
+		$(use_with dvb)
+		$(use_with gstreamer)"
+
+	kde_src_compile
+}