summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-04-27 14:46:32 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-04-27 14:46:32 +0000
commit09eddf96f21dd60c5d16b02d2e5ca675e05d1197 (patch)
tree18dfaf812c9547e8c68f3d163a3509f40b497546 /media-plugins/vdr-streamdev-server
parentAdded packages that require 2.6 headers/kernel to package.mask (diff)
downloadgentoo-2-09eddf96f21dd60c5d16b02d2e5ca675e05d1197.tar.gz
gentoo-2-09eddf96f21dd60c5d16b02d2e5ca675e05d1197.tar.bz2
gentoo-2-09eddf96f21dd60c5d16b02d2e5ca675e05d1197.zip
Added patch from streamdev-cvs.
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'media-plugins/vdr-streamdev-server')
-rw-r--r--media-plugins/vdr-streamdev-server/ChangeLog9
-rw-r--r--media-plugins/vdr-streamdev-server/files/digest-vdr-streamdev-server-0.3.3_pre20051219-r13
-rw-r--r--media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20051219-fix-http-errors.diff20
-rw-r--r--media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20051219-r1.ebuild46
4 files changed, 77 insertions, 1 deletions
diff --git a/media-plugins/vdr-streamdev-server/ChangeLog b/media-plugins/vdr-streamdev-server/ChangeLog
index 91f9163dec37..ec1530603dbd 100644
--- a/media-plugins/vdr-streamdev-server/ChangeLog
+++ b/media-plugins/vdr-streamdev-server/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-plugins/vdr-streamdev-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.4 2006/03/20 16:08:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.5 2006/04/27 14:46:32 zzam Exp $
+
+*vdr-streamdev-server-0.3.3_pre20051219-r1 (27 Apr 2006)
+
+ 27 Apr 2006; Matthias Schwarzott <zzam@gentoo.org>
+ +files/vdr-streamdev-server-20051219-fix-http-errors.diff,
+ +vdr-streamdev-server-0.3.3_pre20051219-r1.ebuild:
+ Added patch from streamdev-cvs.
20 Mar 2006; Matthias Schwarzott <zzam@gentoo.org>
vdr-streamdev-server-0.3.3_pre20051219.ebuild:
diff --git a/media-plugins/vdr-streamdev-server/files/digest-vdr-streamdev-server-0.3.3_pre20051219-r1 b/media-plugins/vdr-streamdev-server/files/digest-vdr-streamdev-server-0.3.3_pre20051219-r1
new file mode 100644
index 000000000000..1c2dfe9a6855
--- /dev/null
+++ b/media-plugins/vdr-streamdev-server/files/digest-vdr-streamdev-server-0.3.3_pre20051219-r1
@@ -0,0 +1,3 @@
+MD5 00e7d7594e5f2227222f07839e0127db vdr-streamdev-20051219.tar.bz2 118761
+RMD160 e9a251892fe8be59cc3bebfe1cf57690b8c33ec4 vdr-streamdev-20051219.tar.bz2 118761
+SHA256 efe78266e77c5b1c89a3692d6d328c7de85849aefcb50912b17409afbe9dbd96 vdr-streamdev-20051219.tar.bz2 118761
diff --git a/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20051219-fix-http-errors.diff b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20051219-fix-http-errors.diff
new file mode 100644
index 000000000000..981dc02ea4ba
--- /dev/null
+++ b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20051219-fix-http-errors.diff
@@ -0,0 +1,20 @@
+diff -ru --exclude=CVS streamdev-20051219/server/connectionHTTP.c streamdev-20060427/server/connectionHTTP.c
+--- streamdev-20051219/server/connectionHTTP.c 2005-05-09 22:22:29.000000000 +0200
++++ streamdev-20060427/server/connectionHTTP.c 2006-04-27 16:34:45.000000000 +0200
+@@ -83,12 +83,14 @@
+ }
+ DELETENULL(m_LiveStreamer);
+ DeferClose();
+- return Respond("HTTP/1.0 409 Channel not available");
++ return Respond("HTTP/1.0 409 Channel not available")
++ && Respond("");
+ }
+ }
+
+ DeferClose();
+- return Respond("HTTP/1.0 400 Bad Request");
++ return Respond("HTTP/1.0 400 Bad Request")
++ && Respond("");
+ }
+
+ void cConnectionHTTP::Flushed(void)
diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20051219-r1.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20051219-r1.ebuild
new file mode 100644
index 000000000000..87b957f13245
--- /dev/null
+++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20051219-r1.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-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20051219-r1.ebuild,v 1.1 2006/04/27 14:46:32 zzam Exp $
+
+inherit vdr-plugin eutils
+
+VDRPLUGIN_BASE=${VDRPLUGIN//-*/}
+MY_P=${VDRPLUGIN_BASE}-${PV/*_pre/}
+
+DESCRIPTION="Video Disk Recorder Client/Server streaming plugin"
+HOMEPAGE="http://www.magoa.net/linux/"
+SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.24"
+
+S=${WORKDIR}/${MY_P}
+
+VDRPLUGIN_MAKE_TARGET="libvdr-${VDRPLUGIN}.so"
+
+PATCHES="${FILESDIR}/vdr-streamdev-server-20051219-fix-http-errors.diff"
+
+src_unpack() {
+ vdr-plugin_src_unpack
+ cd ${S}
+
+ # make subdir libdvbmpeg respect CXXFLAGS
+ sed -i Makefile \
+ -e 's:\(CXXFLAGS.*=\):#\1:'
+ sed -i libdvbmpeg/Makefile \
+ -e 's:CFLAGS = -g -Wall -O2:CFLAGS = $(CXXFLAGS) :'
+}
+
+src_install() {
+ vdr-plugin_src_install
+
+ cd ${S}
+ insinto /etc/vdr/plugins
+ newins streamdevhosts.conf.example streamdevhosts.conf
+ chown vdr:vdr ${D}/etc/vdr -R
+}
+