diff options
author | Jörg Bornkessel <hd_brummy@gentoo.org> | 2007-05-10 15:45:27 +0000 |
---|---|---|
committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2007-05-10 15:45:27 +0000 |
commit | 968a99cce20d63a2b09bd7b7aa0eaf04d00224ee (patch) | |
tree | f505a735dbc3c677bb8763f9cc5044556edeaafd /media-plugins/vdr-streamdev-server | |
parent | remove old versions (diff) | |
download | gentoo-2-968a99cce20d63a2b09bd7b7aa0eaf04d00224ee.tar.gz gentoo-2-968a99cce20d63a2b09bd7b7aa0eaf04d00224ee.tar.bz2 gentoo-2-968a99cce20d63a2b09bd7b7aa0eaf04d00224ee.zip |
patch to use own plugin config DIR added
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-plugins/vdr-streamdev-server')
3 files changed, 34 insertions, 5 deletions
diff --git a/media-plugins/vdr-streamdev-server/ChangeLog b/media-plugins/vdr-streamdev-server/ChangeLog index 9449cd8b7afe..fbb6b55055c1 100644 --- a/media-plugins/vdr-streamdev-server/ChangeLog +++ b/media-plugins/vdr-streamdev-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-streamdev-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.15 2007/05/10 14:36:33 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.16 2007/05/10 15:45:27 hd_brummy Exp $ + + 10 May 2007; Joerg Bornkessel <hd_brummy@gentoo.org> + +files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff, + vdr-streamdev-server-0.3.3_pre20070510.ebuild: + patch to use own plugin config DIR added *vdr-streamdev-server-0.3.3_pre20070510 (10 May 2007) diff --git a/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-0.3.3_pre20070510-gentoo.diff new file mode 100644 index 000000000000..3fbbed1d399d --- /dev/null +++ b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-0.3.3_pre20070510-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( "plugin" ), "streamdevhosts.conf")) + + class cStreamdevServer: public cThread { + private: diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild index e5c7a60e145f..8f697bcd780d 100644 --- a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild +++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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_pre20070510.ebuild,v 1.1 2007/05/10 14:36:33 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20070510.ebuild,v 1.2 2007/05/10 15:45:27 hd_brummy Exp $ inherit vdr-plugin eutils @@ -10,7 +10,8 @@ MY_P=${VDRPLUGIN_BASE}-${MY_PV} DESCRIPTION="Video Disk Recorder Client/Server streaming plugin" HOMEPAGE="http://www.magoa.net/linux/" -SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2" +SRC_URI="mirror://gentoo/vdr-${MY_P}.tar.bz2 + http://dev.gentoo.org/~zzam/distfiles/vdr-${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -21,6 +22,8 @@ DEPEND=">=media-video/vdr-1.3.24" S=${WORKDIR}/${MY_P} +PATCHES="${FILESDIR}/${P}-gentoo.diff" + VDRPLUGIN_MAKE_TARGET="libvdr-${VDRPLUGIN}.so" EXTERNREMUX_PATH=/usr/share/vdr/streamdev/externremux.sh @@ -51,7 +54,7 @@ src_install() { vdr-plugin_src_install cd ${S} - insinto /etc/vdr/plugins + insinto /etc/vdr/plugins/streamdev newins streamdevhosts.conf.example streamdevhosts.conf chown vdr:vdr ${D}/etc/vdr -R } @@ -60,5 +63,10 @@ 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/streamdev/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 + +} |