1 |
hd_brummy 10/12/02 15:10:01 |
2 |
|
3 |
Added: vdr-extb-0.3.1_vdr-1.7.13.diff |
4 |
vdr-extb-0.3.1-gentoo.diff |
5 |
Removed: vdr-extb-0.2.9-gentoo.diff |
6 |
vdr-extb-0.3.0-gcc4.3.diff |
7 |
Log: |
8 |
clean up; version bump, fixed also bug #336198 |
9 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 media-plugins/vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: vdr-extb-0.3.1_vdr-1.7.13.diff |
18 |
=================================================================== |
19 |
http://toms-cafe.de/vdr/download/extb-0.3.1-vdr-1.7.13.diff |
20 |
compile fix up from vdr-1.7.13 |
21 |
|
22 |
--- extb-0.3.1/extboardio.c |
23 |
+++ extb-0.3.1/extboardio.c |
24 |
@@ -361,10 +361,16 @@ void cExtBoardIO::Channel(int nChannelNu |
25 |
m_nChannel |= (0 != pChannel->Tpid()) ?eHasTpid:0; |
26 |
|
27 |
if(pChannel->IsSat()) { |
28 |
+#if VDRVERSNUM >= 10713 |
29 |
+ cDvbTransponderParameters dtp(pChannel->Parameters()); |
30 |
+ char polarization = dtp.Polarization(); |
31 |
+#else |
32 |
+ char polarization = pChannel->Polarization(); |
33 |
+#endif |
34 |
m_nChannel |= eIsSourceSat; |
35 |
- if (toupper(pChannel->Polarization()) == 'V') |
36 |
+ if (toupper(polarization) == 'V') |
37 |
m_nChannel |= eIsSatVPolar; |
38 |
- if (toupper(pChannel->Polarization()) == 'H') |
39 |
+ if (toupper(polarization) == 'H') |
40 |
m_nChannel |= eIsSatHPolar; |
41 |
} |
42 |
else if(pChannel->IsCable()) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 media-plugins/vdr-extb/files/vdr-extb-0.3.1-gentoo.diff |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-extb/files/vdr-extb-0.3.1-gentoo.diff?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-extb/files/vdr-extb-0.3.1-gentoo.diff?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: vdr-extb-0.3.1-gentoo.diff |
53 |
=================================================================== |
54 |
diff -ur extb.orig/bin/extb.sh extb/bin/extb.sh |
55 |
--- extb.orig/bin/extb.sh 2004-05-05 17:38:29.000000000 +0200 |
56 |
+++ extb/bin/extb.sh 2004-07-19 22:19:49.459865904 +0200 |
57 |
@@ -10,17 +10,11 @@ |
58 |
trap 'rm /tmp/tmp{1,2,3}.$$; exit 0' 2 15 |
59 |
|
60 |
#Defaults |
61 |
-SCRIPT_PATH="/opt/extb/bin/" |
62 |
-LINPIC_PATH="/opt/extb/bin/" |
63 |
-HEX_FILES_PATH="/opt/extb/src/PIC/firm/" |
64 |
-LIRCD_CMD="lircd" |
65 |
-IREXEC_CMD="irexec" |
66 |
+SCRIPT_PATH="/usr/bin/" |
67 |
+LINPIC_PATH="/usr/bin/" |
68 |
+HEX_FILES_PATH=/usr/share/extb/" |
69 |
SETSERIAL_CMD="setserial" |
70 |
-LIRC_CONF="/etc/lircd.conf" |
71 |
-LIRC_RC="/etc/lircrc" |
72 |
COM_PORT="/dev/ttyS1" |
73 |
-VDR_PATH="/VDR/1.2.5/VDR/" |
74 |
-VDR_CMD="./runvdr" |
75 |
|
76 |
# ----------------------------------------------------------------------------- |
77 |
|
78 |
@@ -329,7 +323,7 @@ |
79 |
;; |
80 |
|
81 |
1) |
82 |
- cp /tmp/PICflags PICflags.conf |
83 |
+ cp /tmp/PICflags /etc/extb/PICflags.conf |
84 |
_MAIN |
85 |
;; |
86 |
|
87 |
@@ -477,7 +471,8 @@ |
88 |
0) |
89 |
tx.sh M2 # sending M2 to Extension Board to disable video/audio |
90 |
clear |
91 |
- killall irexec; killall lircd |
92 |
+ /etc/init.d/irexec stop |
93 |
+ /etc/init.d/lircd stop |
94 |
sleep 1 |
95 |
$SETSERIAL_CMD $COM_PORT uart 16550 |
96 |
sleep 1 |
97 |
@@ -487,14 +482,15 @@ |
98 |
echo "" |
99 |
$SETSERIAL_CMD $COM_PORT uart none |
100 |
sleep 1 |
101 |
- $LIRCD_CMD $LIRC_CONF; $IREXEC_CMD $LIRC_RC & |
102 |
+ /etc/init.d/lircd start |
103 |
+ /etc/init.d/irexc start |
104 |
echo "" |
105 |
echo "Stopping VDR ..." |
106 |
- killall vdr |
107 |
+ /etc/init.d/vdr stop |
108 |
sleep 1 |
109 |
echo "" |
110 |
echo "Restarting VDR ..." |
111 |
- cd $VDR_PATH; $VDR_CMD |
112 |
+ rcvdr start |
113 |
cd $SCRIPT_PATH |
114 |
echo "" |
115 |
# just in case the Extension Board plugin is not installed ... |
116 |
diff -ur extb.orig/bin/tx.sh extb/bin/tx.sh |
117 |
--- extb.orig/bin/tx.sh 2004-04-12 18:23:16.000000000 +0200 |
118 |
+++ extb/bin/tx.sh 2004-07-19 22:17:08.373354776 +0200 |
119 |
@@ -1,2 +1,2 @@ |
120 |
#!/bin/bash |
121 |
-rc send_once EXTB_TX $1 |
122 |
\ No newline at end of file |
123 |
+irsend send_once EXTB_TX $1 |
124 |
\ No newline at end of file |