Attachment 95299 Details for Bug 143456 – vdr.diff

[patch] vdr.diff

vdr.diff (text/plain), 7.73 KB, created by Dimitry Bradt (RETIRED) on 2006-08-28 10:58:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Bradt (RETIRED)

Created: 2006-08-28 10:58:12 UTC

Size: 7.73 KB

patch

obsolete

>--- vdr.xml.orig	2006-08-28 19:53:27.000000000 +0200
>+++ vdr.xml	2006-08-28 19:38:25.000000000 +0200
>@@ -5,12 +5,16 @@
> <guide link="/doc/en/vdr.xml">
> <title>Gentoo Linux VDR Guide</title>
> 
> <author title="Author">
>   <mail link="mail@ng-plasmon.de">Norman Golisz</mail>
> </author>
>+<author title="Editor">
>+  <mail link="diox@swords.be">Dimitry Bradt</mail>
>+</author>
>+
> 
> <abstract>
> This guide shows you how to prepare Gentoo Linux for DVB and VDR.
> </abstract>
> 
> 
>@@ -33,13 +37,14 @@
> to transfer several channels on the same frequency. The more data compression,
> the more channels can be transfered, but you pay it with quality loss.
> </p>
> 
> <p>
> DVB can be transfered in several ways. The trailing letter identifies the way
>-of transfer, e.g. DVB-<e>T</e> for terrestrial transmission. There are some more:
>+of transfer, e.g. DVB-<e>T</e> for terrestrial transmission. There are some
>+more:
> </p>
> 
> <ul>
>   <li>DVB-S for transmission over satelites</li>
>   <li>DVB-C for transmission over cable</li>
>   <li>DVB-H for transmission to mobile devices (terrestrial)</li>
>@@ -55,22 +60,22 @@
> 
> <section>
> <title>Types and requirement of DVB cards</title>
> <body>
> 
> <p>
>-Beside the different methods to receive the DVB stream, the cards are classified
>-by their type of produced output. They're cards with a decoder implemented, which
>-offer direct access to the stream by the device <path>/dev/video</path>. These
>-cards are called <e>Full featured cards</e>. Other cards havn't an own decoder
>-implemented and require a software decoder on the computer and are called
>-<e>Budget cards</e>. That implies a higher system requirement; you shouldn't use
>-a computer based on a CPU with lower than 600 MHz and a memory amount lower than
>-256 MB. <uri link="http://linuxtv.org/wiki/index.php/DVB_Card_Vendors">This list
>-</uri> is useful to identify your
>-card.
>+Beside the different methods to receive the DVB stream, the cards are
>+classified by their type of produced output. They're cards with a decoder
>+implemented, which offer direct access to the stream by the device
>+<path>/dev/video</path>. These cards are called <e>Full featured cards</e>.
>+Other cards havn't an own decoder implemented and require a software decoder on
>+the computer and are called <e>Budget cards</e>. That implies a higher system
>+requirement; you shouldn't use a computer based on a CPU with lower than 600
>+MHz and a memory amount lower than 256 MB. <uri
>+link="http://linuxtv.org/wiki/index.php/DVB_Card_Vendors">This list</uri> is
>+useful to identify your card.
> </p>
> 
> </body>
> </section>
> 
> </chapter>
>@@ -93,13 +98,13 @@
>     * Event Interface
> Device Drivers --->
>     Multimedia Devices --->
>         Digital Video Broadcasting Devices --->
>             [*] DVB For Linux
>              *  DVB Core Support
>-	     M  [Your driver]
>+           M  [Your driver]
> </pre>
> 
> <p>
> Additionally we have to select the proper driver for your hardware. To find out
> the right module for your card, we mark every driver as module. If you have a
> PCI card, install <c>pciutils</c>, if you havn't already. If you want built-in
>@@ -156,16 +161,16 @@
> <comment>If you own a TerraTec Cinergy T2, your output might look like this:</comment>
> DVB: registering new adapter (TerraTec/qanu USB2.0 Highspeed DVB-T Receiver).
> input: TerraTec/qanu USB2.0 Highspeed DVB-T Receiver remote control as /class/input/input2
> </pre>
> 
> <p>
>- Now
>-continue <uri link="#inst_lirc">installing LIRC</uri>, in case you want to use a
>-remote control.
>+
>+Now continue <uri link="#inst_lirc">installing LIRC</uri>, in case you want to
>+use a remote control.
> </p>
> 
> </body>
> </section>
> 
> <!--<section>
>@@ -191,18 +196,20 @@
> If your card offers the possibility to control remotely, you may wish to
> configure LIRC. LIRC interprets the pressed keys and returns a name for each
> one. A program that supports LIRC waits for key events and runs the action
> configured in the config file, mostly stored in the config directory of the
> executing program (e.g. MPlayer loads the file <path>~/.mplayer/lircrc</path>).
> Before we install LIRC, you have to add <c>lirc</c> to the USE flags and add
>-an option.
>+an option. To find the proper argument for LIRC_DEVICES, <uri
>+link="http://www.lirc.org/html/table.html">use this list</uri>.
> </p>
> 
> <pre caption="Installing LIRC">
>+<comment>Replace "devinput" with the proper driver</comment>
> # nano -w /etc/make.conf
>-# echo "LIRC_OPTS=\"--with-driver=devinput\"" >> /etc/make.conf
>+# echo "LIRC_DEVICES=\"--with-driver=devinput\"" >> /etc/make.conf
> # emerge lirc
> </pre>
> 
> <p>
> At first we have to define each key code with a name. Most supported remote
> controls are configured already, take a look at
>@@ -215,31 +222,31 @@
> <pre caption="List of current input devices">
> # cat /proc/bus/input/devices
> I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
> N: Name="AT Translated Set 2 keyboard"
> P: Phys=isa0060/serio0/input0
> S: Sysfs=/class/input/input0
>-H: Handlers=kbd event0 
>+H: Handlers=kbd event0
> B: EV=120013
> B: KEY=4 2000000 3802078 f840d001 f2ffffdf ffefffff ffffffff fffffffe
> B: MSC=10
> B: LED=7
> 
> I: Bus=0000 Vendor=0000 Product=0000 Version=0000
> N: Name="TerraTec/qanu USB2.0 Highspeed DVB-T Receiver remote control"
> P: Phys=usb-0000:00:1d.7-1/input0
> S: Sysfs=/class/input/input2
>-H: Handlers=kbd event1 
>+H: Handlers=kbd event1
> B: EV=100003
> B: KEY=108fc210 2043 0 0 0 0 8000 2080 1 9e1680 0 0 ffc
> 
> I: Bus=0011 Vendor=0002 Product=0007 Version=0000
> N: Name="SynPS/2 Synaptics TouchPad"
> P: Phys=isa0060/serio4/input0
> S: Sysfs=/class/input/input3
>-H: Handlers=mouse0 event2 
>+H: Handlers=mouse0 event2
> B: EV=b
> B: KEY=6420 0 7000f 0 0 0 0 0 0 0 0
> B: ABS=11000003
> </pre>
> 
> <p>
>@@ -251,13 +258,13 @@
> <p>
> lircd needs to know the device to use. Add the following line to
> <path>/etc/conf.d/lircd</path>.
> </p>
> 
> <pre caption="Adding options to lircd">
>-# echo "LIRCD_OPTS=\"-H dev/input -d /dev/input/event1\""
>+# echo "LIRCD_OPTS=\"-H dev/input -d /dev/input/event1\" >> /etc/conf.d/lirc.conf"
> </pre>
> 
> <p>
> Remember to replace <c>event1</c> with the actual device. It's time to start
> lircd.
> </p>
>@@ -290,14 +297,14 @@
> 
> <pre caption="Installing VDR">
> # emerge vdr
> </pre>
> 
> <p>
>-If you want to be able to use your remote control, we have to enable LIRC support
>-in VDR. Add the following line to the <path>/etc/conf.d/vdr</path>.
>+If you want to be able to use your remote control, we have to enable LIRC
>+support in VDR. Add the following line to the <path>/etc/conf.d/vdr</path>.
> </p>
> 
> <pre caption="Enabling support for LIRC">
> # echo "IR_CTRL=\"lirc\"" >> /etc/conf.d/vdr
> </pre>
> 
>@@ -311,16 +318,17 @@
> # rc-update add vdr default
> </pre>
> 
> <p>
> The installation has finished so far, to configure VDR, you switch to your
> output screen and follow the instructions on the screen. VDR asks you to press
>-various keys on your remote control to learn the correct keys codes. In case you
>-havn't a remote control unit, you can optionally use the keyboard. If you have
>-a budget card, we need to <uri link="#softdevice">install a softdevice</uri> now.
>-This device decodes the stream and offers a device to access.
>+various keys on your remote control to learn the correct keys codes. In case
>+you havn't a remote control unit, you can optionally use the keyboard. If you
>+have a budget card, we need to <uri link="#softdevice">install a
>+softdevice</uri> now. This device decodes the stream and offers a device to
>+access.
> </p>
> 
> </body>
> </section>
> 
> <section id="softdevice">

Actions: View | Diff

Attachments on bug 143456: 93907 | 94020 | 95299 | 95323 | 95387 | 95713