diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2008-06-18 16:36:37 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-06-18 16:36:37 +0000 |
commit | db8d636a8c385ce467ff5803f16a60bf786cbeab (patch) | |
tree | b9e66204c1302817bc053cd725c0d7f7d2741550 /media-plugins | |
parent | Block vdr-streamdev package. Fix minor errors. (diff) | |
download | gentoo-2-db8d636a8c385ce467ff5803f16a60bf786cbeab.tar.gz gentoo-2-db8d636a8c385ce467ff5803f16a60bf786cbeab.tar.bz2 gentoo-2-db8d636a8c385ce467ff5803f16a60bf786cbeab.zip |
Merge vdr-streamdev-{client,server} into one package, adding blockers to the old split ebuilds. Version bumped to 0.3.4.
(Portage version: 2.1.5.6)
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/vdr-streamdev/ChangeLog | 16 | ||||
-rw-r--r-- | media-plugins/vdr-streamdev/Manifest | 5 | ||||
-rw-r--r-- | media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff | 16 | ||||
-rw-r--r-- | media-plugins/vdr-streamdev/metadata.xml | 9 | ||||
-rw-r--r-- | media-plugins/vdr-streamdev/vdr-streamdev-0.3.4.ebuild | 59 |
5 files changed, 105 insertions, 0 deletions
diff --git a/media-plugins/vdr-streamdev/ChangeLog b/media-plugins/vdr-streamdev/ChangeLog new file mode 100644 index 000000000000..ae091dfa3ffa --- /dev/null +++ b/media-plugins/vdr-streamdev/ChangeLog @@ -0,0 +1,16 @@ +# ChangeLog for media-plugins/vdr-streamdev +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/ChangeLog,v 1.3 2008/06/18 16:36:36 zzam Exp $ + + 18 Jun 2008; Matthias Schwarzott <zzam@gentoo.org> + +files/vdr-streamdev-0.3.4-gentoo.diff, +metadata.xml, + +vdr-streamdev-0.3.4.ebuild: + Merge vdr-streamdev-{client,server} into one package, adding blockers to + the old split ebuilds. Version bumped to 0.3.4. + +*vdr-streamdev-0.3.4 (04 Jun 2008) + + 04 Jun 2008; Matthias Schwarzott <zzam@gentoo.org> +metadata.xml, + +vdr-streamdev-0.3.4.ebuild: + Merged vdr-streamdev-{client,server}. + diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest new file mode 100644 index 000000000000..af78782addb9 --- /dev/null +++ b/media-plugins/vdr-streamdev/Manifest @@ -0,0 +1,5 @@ +AUX vdr-streamdev-0.3.4-gentoo.diff 692 RMD160 1160469e62bd07cb770eb72c7a01669940959a8f SHA1 da0cb1bbe5b2d42d66c57062569c34de3cd0d91b SHA256 f6f7ba042e34849ac9113cb042dc292fdf88bc6fe6de2a362f0420683a05b017 +DIST vdr-streamdev-0.3.4.tgz 158398 RMD160 99511089ffd2aefe6215a266f50175728fd0634f SHA1 7da7efbff63f66ded24370c86ecbf8dc564a4231 SHA256 a7c00c9d588b1cec96a67e1598dec1f11aa7f85a12c2e122a9dcc13a88e56576 +EBUILD vdr-streamdev-0.3.4.ebuild 1709 RMD160 c6e22a79115544b26e46bdce9f90c53222f8cca5 SHA1 5e1fb526226c7d03290740557b8130ee224238d5 SHA256 26b9c5c98f11fe23f0a9c2a164aa0b661002fe4052c2f65c71014fdc52d8b280 +MISC ChangeLog 571 RMD160 0a2a0240b60ed1f731ac2812e93b98d04fda0f47 SHA1 1e3ced3a46e3a70fc1a2a0789efebd648a43227b SHA256 b76d1162f2d3bff94c3392bfbdf459659f390404b9ac289a31a3639ee280ccff +MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff new file mode 100644 index 000000000000..5a5278f6d364 --- /dev/null +++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.3.4-gentoo.diff @@ -0,0 +1,16 @@ +will change config dir to /etc/vdr/plugins/${pluginname} + +Joerg Bornkessel <hd_brummy@gentoo.org> 10 May 2007 + +diff -Naur streamdev-20070510.orig/server/server.h streamdev-20070510/server/server.h +--- streamdev-20070510.orig/server/server.h 2007-05-10 17:02:45.084274870 +0200 ++++ streamdev-20070510/server/server.h 2007-05-10 17:10:32.652139993 +0200 +@@ -10,7 +10,7 @@ + #include "server/component.h" + #include "server/connection.h" + +-#define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory(), "streamdevhosts.conf")) ++#define STREAMDEVHOSTSPATH (*AddDirectory(cPlugin::ConfigDirectory( "streamdev" ), "streamdevhosts.conf")) + + class cStreamdevServer: public cThread { + private: diff --git a/media-plugins/vdr-streamdev/metadata.xml b/media-plugins/vdr-streamdev/metadata.xml new file mode 100644 index 000000000000..7b718b6f9765 --- /dev/null +++ b/media-plugins/vdr-streamdev/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>media-tv</herd> + <maintainer> + <email>vdr@gentoo.org</email> + <name>Gentoo VDR Project</name> + </maintainer> +</pkgmetadata> diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4.ebuild new file mode 100644 index 000000000000..429c989d1d0d --- /dev/null +++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.3.4.ebuild,v 1.1 2008/06/18 16:36:36 zzam Exp $ + +inherit vdr-plugin eutils + +DESCRIPTION="Video Disk Recorder Client/Server streaming plugin" +HOMEPAGE="http://www.magoa.net/linux/" +SRC_URI="http://streamdev.vdr-developer.org/releases/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-1.3.24 + !media-plugins/vdr-streamdev-client + !media-plugins/vdr-streamdev-server" + +EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh + +PATCHES=("${FILESDIR}/${P}-gentoo.diff") + +src_unpack() { + vdr-plugin_src_unpack + cd "${S}" + + # Moving externremux.sh out of /root + sed -i remux/extern.c \ + -e "s#/root/externremux.sh#${EXTERNREMUX_PATH}#" + + # make subdir libdvbmpeg respect CXXFLAGS + sed -i Makefile \ + -e '/CXXFLAGS.*+=/s:^:#:' + sed -i libdvbmpeg/Makefile \ + -e 's:CFLAGS = -g -Wall -O2:CFLAGS = $(CXXFLAGS) :' + + fix_vdr_libsi_include server/livestreamer.c +} + +src_install() { + vdr-plugin_src_install + + cd "${S}" + insinto /etc/vdr/plugins/streamdev + newins streamdevhosts.conf.example streamdevhosts.conf + chown vdr:vdr "${D}"/etc/vdr -R +} + +pkg_postinst() { + vdr-plugin_pkg_postinst + elog "If you want to use the externremux-feature, then put" + elog "your custom script as ${EXTERNREMUX_PATH}." + + if [[ -e "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf ]]; then + einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev/" + mv "${ROOT}"/etc/vdr/plugins/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf + fi +} |