r3351 - in vdr/vdr-plugin-xineliboutput/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sun Sep 10 19:01:52 UTC 2006
Author: tiber-guest
Date: 2006-09-10 19:01:51 +0000 (Sun, 10 Sep 2006)
New Revision: 3351
Added:
vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian
Removed:
vdr/vdr-plugin-xineliboutput/trunk/debian/patches/20_nosignal-path.dpatch
Modified:
vdr/vdr-plugin-xineliboutput/trunk/debian/TODO
vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
vdr/vdr-plugin-xineliboutput/trunk/debian/docs
vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
vdr/vdr-plugin-xineliboutput/trunk/debian/patches/10_nosignal.dpatch
vdr/vdr-plugin-xineliboutput/trunk/debian/plugin.xineliboutput.conf
vdr/vdr-plugin-xineliboutput/trunk/debian/rules
Log:
Stripped comments from plugin.xineliboutput.conf and added README.Debian
Added: vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian (rev 0)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian 2006-09-10 19:01:51 UTC (rev 3351)
@@ -0,0 +1,77 @@
+Local frontends
+---------------
+
+To use local frontends, you must install libxineliboutput-fbfe if you want to
+use the framebuffer device, otherwise libxineliboutput-sxfe for the X-Server
+frontend. In /etc/vdr/plugins/plugin.xineliboutput.conf set "--local=sxfe" or
+"local-fbfe".
+
+
+Remote frontends
+--------------
+
+To allow remote clients to connect over the network you must configure the
+allowed network clients or network segments in /etc/vdr/svdrphosts.conf and
+set "--remote=37890" in /etc/vdr/plugins/plugin.xineliboutput.conf.
+
+
+Configuration options
+---------------------
+
+The plugin can be configured in /etc/vdr/plugins/plugin.xineliboutput.conf:
+
+--remote=<PORT>
+ Listen on <PORT> for remote clients
+ Use --remote=37890 to allow remote clients to connect
+ default: 0
+
+
+--primary
+ Force xineliboutput to be primary device when there are active frontend(s).
+ This is usually needed, when using remote clients.
+
+
+--local=<NAME>
+
+ Use local frontend <NAME>. Supported frontends are:
+ sxfe (X11)
+ fbfe (framebuffer)
+ none (only remote frontends)
+
+
+--video=<NAME>
+ Use video driver <NAME>. Supported values are:
+ for sxfe: auto, x11, xshm, xv, xvmc, xxmc, none
+ for fbfe: auto, fb, DirectFB, none
+
+
+--audio=<NAME>
+ Use audio driver <NAME>. Supported values are:
+ auto, alsa, oss, arts, esound, none
+
+
+--fullscreen
+ Fullscreen mode (X11)
+
+
+--width=<WIDTH>
+ Window Width
+
+
+--height=<HEIGTH>
+ Window Height
+
+
+--display=<DISP>
+ Use X11 display or framebuffer device name <DISP>
+
+
+--post=<POST>
+ Use xine post plugin <POST>
+ format : --post=pluginname[:arg=val[,arg=val]][,...]
+ example: --post=upmix;tvtime:enabled=1,cheap_mode=1
+ If multiple post plugins are given, all will be initialized.
+
+
+--exit-on-close
+ Exit vdr when local frontend window is closed
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/TODO
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/TODO 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/TODO 2006-09-10 19:01:51 UTC (rev 3351)
@@ -1,3 +1,2 @@
* Carefully check X-Server-Lib-dependencies
* Manpages for binaries
-
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog 2006-09-10 19:01:51 UTC (rev 3351)
@@ -1,10 +1,10 @@
-vdr-plugin-xineliboutput (0.99rc4+cvs20060906-1) UNRELEASED; urgency=low
+vdr-plugin-xineliboutput (0.99rc4+cvs20060910-1) unstable; urgency=low
- * NOT RELEASED YET
* New CVS snaphsot
* Added installation of custom nosignal.mpg
+ * Stripped comments from plugin.xineliboutput.conf and added README.Debian
- -- Tobias Grimm <tg at e-tobi.net> Mon, 28 Aug 2006 18:48:57 +0200
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 10 Sep 2006 21:01:31 +0200
vdr-plugin-xineliboutput (0.99rc4+cvs20060826-2) unstable; urgency=low
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/docs 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/docs 2006-09-10 19:01:51 UTC (rev 3351)
@@ -1 +1,2 @@
README
+debian/README.Debian
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list 2006-09-10 19:01:51 UTC (rev 3351)
@@ -1,2 +1 @@
10_nosignal
-20_nosignal-path
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/10_nosignal.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/10_nosignal.dpatch 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/10_nosignal.dpatch 2006-09-10 19:01:51 UTC (rev 3351)
@@ -28,7 +28,7 @@
exit 0
begin 644 debian/nosignal.mpg
-M```!LRP"0",23Z.````!M12*``$``````;4C!04%"P(2`````;@`"`!````!
+M```!LRP"0#,23Z.````!M12*``$``````;4C!04%"P(2`````;@`"`!````!
M```/__@```&UC__W78````$!0_Q$P:-&&3<8L&88PPV&C%@R9-AHT8LV;8:,
M6#)FV1[!HT9LFRQ8-&;#<:'M&C4PW&C!BRC#98-&#$8;+%E8LXR;+&,C-&<8
M;C1E9F(6K#<8-&D91FW8>P/9&9M,::V^'%,"BSF5B-:H&!!S)LCVC`>Q9GJP
Deleted: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/20_nosignal-path.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/20_nosignal-path.dpatch 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/20_nosignal-path.dpatch 2006-09-10 19:01:51 UTC (rev 3351)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_nosignal-path.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds /usr/share/libxine-xvdr/ to the paths searched for a custom
-## DP: nosignal.mpg.
-
- at DPATCH@
-diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060906~/xine_input_vdr.c vdr-plugin-xineliboutput-0.99rc4+cvs20060906/xine_input_vdr.c
---- vdr-plugin-xineliboutput-0.99rc4+cvs20060906~/xine_input_vdr.c 2006-09-06 20:24:13.000000000 +0200
-+++ vdr-plugin-xineliboutput-0.99rc4+cvs20060906/xine_input_vdr.c 2006-09-06 23:34:58.000000000 +0200
-@@ -1075,6 +1075,7 @@
- if(!data) {
- char *path;
- int fd = open(path="/usr/share/vdr/xineliboutput/nosignal.mpg", O_RDONLY);
-+ if(fd<0) fd = open(path="/usr/share/libxine-xvdr/nosignal.mpg", O_RDONLY);
- if(fd<0) fd = open(path="/video/plugins/xineliboutput/nosignal.mpg", O_RDONLY);
- if(fd<0) fd = open(path="/video/plugins/xine/noSignal.mpg", O_RDONLY);
- if(fd<0) fd = open(path="/etc/vdr/plugins/xineliboutput/nosignal.mpg", O_RDONLY);
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/plugin.xineliboutput.conf
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/plugin.xineliboutput.conf 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/plugin.xineliboutput.conf 2006-09-10 19:01:51 UTC (rev 3351)
@@ -1,62 +1,11 @@
#
# Command line parameters for vdr-plugin-xineliboutput
#
-# For more details see /usr/share/doc/vdr-plugin-xineliboutput/README
-# and `vdr --help -Pxineliboutput`
+# For more details see:
+# - /usr/share/doc/vdr-plugin-xineliboutput/README.Debian
+# - `vdr --help -Pxineliboutput`
+# - /usr/share/doc/vdr-plugin-xineliboutput/README
#
-
-# Use local frontend <NAME>. Supported frontends are:
-# sxfe (X11)
-# fbfe (framebuffer)
-# none (only remote frontends)
--local=none
-
-
-# Use video driver <NAME>. Supported values are:
-# for sxfe: auto, x11, xshm, xv, xvmc, xxmc, none
-# for fbfe: auto, fb, DirectFB, none
-#--video=<NAME>
-
-
-# Use audio driver <NAME>. Supported values are:
-# auto, alsa, oss, arts, esound, none
-#--audio=<NAME>
-
-
-# Listen on <PORT> for remote clients
-# default: 37890
-# --remote=<PORT>
-
-
-# Fullscreen mode (X11)
-# --fullscreen
-
-
-# Window Width
-# --width=<WIDTH>
-
-
-# Window Height
-# --height=<HEIGTH>
-
-
-# Use X11 display or framebuffer device name <DISP>
-# --display=<DISP>
-
-
-# Use xine post plugin POST
-#
-# format : --post=pluginname[:arg=val[,arg=val]][,...]
-# example: --post=upmix;tvtime:enabled=1,cheap_mode=1
-#
-# If multiple post plugins are given, all will be initialized.
-#--post=<POST>
-
-
-# Force xineliboutput to be primary device when there are active frontend(s)
-# --primary
-
-
-# Exit vdr when local frontend window is closed
-# --exit-on-close
+--primary
Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules 2006-09-06 22:46:56 UTC (rev 3350)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules 2006-09-10 19:01:51 UTC (rev 3351)
@@ -40,7 +40,8 @@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
+ NOSIGNAL_IMAGE_FILE=/usr/share/libxine-xvdr/nosignal.mpg
touch build-stamp
clean: clean-patched unpatch
More information about the pkg-vdr-dvb-changes
mailing list