Gentoo Archives: gentoo-commits

From: "Daniel Drake (dsd)" <dsd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r1453 - genpatches-2.6/trunk/2.6.27
Date: Thu, 01 Jan 2009 13:35:47
Message-Id: E1LINiC-0000Pi-5X@stork.gentoo.org
1 Author: dsd
2 Date: 2009-01-01 13:35:43 +0000 (Thu, 01 Jan 2009)
3 New Revision: 1453
4
5 Added:
6 genpatches-2.6/trunk/2.6.27/2705_dvb-kconfig-tuner-customize.patch
7 Modified:
8 genpatches-2.6/trunk/2.6.27/0000_README
9 Log:
10 Fix inability to select correct DVB tuner modules
11
12 Modified: genpatches-2.6/trunk/2.6.27/0000_README
13 ===================================================================
14 --- genpatches-2.6/trunk/2.6.27/0000_README 2008-12-30 20:30:00 UTC (rev 1452)
15 +++ genpatches-2.6/trunk/2.6.27/0000_README 2009-01-01 13:35:43 UTC (rev 1453)
16 @@ -103,6 +103,10 @@
17 From: http://bugs.gentoo.org/235732
18 Desc: Fix microphone input regression on Asus laptops
19
20 +Patch: 2705_dvb-kconfig-tuner-customize.patch
21 +From: http://bugs.gentoo.org/245106
22 +Desc: Fix inability to select correct DVB tuner modules
23 +
24 Patch: 2900_it87-support-it8720.patch
25 From: http://bugs.gentoo.org/show_bug.cgi?id=245625
26 Desc: Patch to retrieve sensor information from the IT8720 chipset
27
28 Added: genpatches-2.6/trunk/2.6.27/2705_dvb-kconfig-tuner-customize.patch
29 ===================================================================
30 --- genpatches-2.6/trunk/2.6.27/2705_dvb-kconfig-tuner-customize.patch (rev 0)
31 +++ genpatches-2.6/trunk/2.6.27/2705_dvb-kconfig-tuner-customize.patch 2009-01-01 13:35:43 UTC (rev 1453)
32 @@ -0,0 +1,273 @@
33 +From: Mauro Carvalho Chehab <mchehab@××××××.com>
34 +Date: Sun, 14 Dec 2008 22:39:03 +0000 (-0300)
35 +Subject: V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
36 +X-Git-Tag: v2.6.28~1^2~3
37 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8b21c1e90e633aee3363e3d87e1a0b829bdb420e
38 +
39 +V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
40 +
41 +When the tuner modules were moved to common/tuners, a separate customize
42 +option were added for tuners. However, the automatic selection of the
43 +tuners were still using the older option.
44 +
45 +This causes that the automatic selection to fail, if DVB_FE_CUSTOMISE is
46 +selected. Also, since those tuners are now under MEDIA_TUNER_CUSTOMIZE
47 +menu, if you unset MEDIA_TUNER_CUSTOMIZE, you can't manually select the
48 +tuners.
49 +
50 +This patch fixes this error by replacing DVB_FE_CUSTOMISE by
51 +MEDIA_TUNER_CUSTOMIZE on all places were a tuner is selected.
52 +
53 +The patch were generated by this small script:
54 +
55 +for i in `find drivers/media -name Kconfig`; do
56 + cat $i|perl -ne 's/(MEDIA_TUNER.*)DVB_FE_CUSTOMISE/\1MEDIA_TUNER_CUSTOMIZE/; print $_' >a
57 + mv a $i
58 +done
59 +
60 +Also, manually reordered the tuner entries.
61 +
62 +Signed-off-by: Mauro Carvalho Chehab <mchehab@××××××.com>
63 +[dsd@g.o: rediff for 2.6.27]
64 +---
65 +
66 +Index: linux-2.6.27-gentoo-r7/drivers/media/dvb/b2c2/Kconfig
67 +===================================================================
68 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/dvb/b2c2/Kconfig
69 ++++ linux-2.6.27-gentoo-r7/drivers/media/dvb/b2c2/Kconfig
70 +@@ -9,11 +9,11 @@ config DVB_B2C2_FLEXCOP
71 + select DVB_STV0297 if !DVB_FE_CUSTOMISE
72 + select DVB_BCM3510 if !DVB_FE_CUSTOMISE
73 + select DVB_LGDT330X if !DVB_FE_CUSTOMISE
74 +- select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
75 + select DVB_S5H1420 if !DVB_FE_CUSTOMISE
76 + select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
77 + select DVB_ISL6421 if !DVB_FE_CUSTOMISE
78 + select DVB_CX24123 if !DVB_FE_CUSTOMISE
79 ++ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
80 + help
81 + Support for the digital TV receiver chip made by B2C2 Inc. included in
82 + Technisats PCI cards and USB boxes.
83 +Index: linux-2.6.27-gentoo-r7/drivers/media/dvb/bt8xx/Kconfig
84 +===================================================================
85 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/dvb/bt8xx/Kconfig
86 ++++ linux-2.6.27-gentoo-r7/drivers/media/dvb/bt8xx/Kconfig
87 +@@ -8,7 +8,7 @@ config DVB_BT8XX
88 + select DVB_OR51211 if !DVB_FE_CUSTOMISE
89 + select DVB_LGDT330X if !DVB_FE_CUSTOMISE
90 + select DVB_ZL10353 if !DVB_FE_CUSTOMISE
91 +- select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
92 ++ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
93 + help
94 + Support for PCI cards based on the Bt8xx PCI bridge. Examples are
95 + the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
96 +Index: linux-2.6.27-gentoo-r7/drivers/media/dvb/dvb-usb/Kconfig
97 +===================================================================
98 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/dvb/dvb-usb/Kconfig
99 ++++ linux-2.6.27-gentoo-r7/drivers/media/dvb/dvb-usb/Kconfig
100 +@@ -24,8 +24,8 @@ config DVB_USB_A800
101 + tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"
102 + depends on DVB_USB
103 + select DVB_DIB3000MC
104 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
105 + select DVB_PLL if !DVB_FE_CUSTOMISE
106 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
107 + help
108 + Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
109 +
110 +@@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB
111 + depends on DVB_USB
112 + select DVB_PLL if !DVB_FE_CUSTOMISE
113 + select DVB_DIB3000MB
114 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
115 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
116 + help
117 + Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
118 + DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
119 +@@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC
120 + tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
121 + depends on DVB_USB
122 + select DVB_DIB3000MC
123 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
124 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
125 + help
126 + Support for USB2.0 DVB-T receivers based on reference designs made by
127 + DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
128 +@@ -72,10 +72,10 @@ config DVB_USB_DIB0700
129 + select DVB_DIB7000P
130 + select DVB_DIB7000M
131 + select DVB_DIB3000MC
132 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
133 +- select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE
134 +- select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
135 + select DVB_TUNER_DIB0070
136 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
137 ++ select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMIZE
138 ++ select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
139 + help
140 + Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
141 + USB bridge is also present in devices having the DiB7700 DVB-T-USB
142 +@@ -93,7 +93,7 @@ config DVB_USB_UMT_010
143 + depends on DVB_USB
144 + select DVB_PLL if !DVB_FE_CUSTOMISE
145 + select DVB_DIB3000MC
146 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
147 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
148 + help
149 + Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
150 +
151 +@@ -105,9 +105,9 @@ config DVB_USB_CXUSB
152 + select DVB_LGDT330X if !DVB_FE_CUSTOMISE
153 + select DVB_MT352 if !DVB_FE_CUSTOMISE
154 + select DVB_ZL10353 if !DVB_FE_CUSTOMISE
155 +- select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
156 +- select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
157 +- select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
158 ++ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
159 ++ select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
160 ++ select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
161 + help
162 + Say Y here to support the Conexant USB2.0 hybrid reference design.
163 + Currently, only DVB and ATSC modes are supported, analog mode
164 +@@ -120,9 +120,9 @@ config DVB_USB_M920X
165 + tristate "Uli m920x DVB-T USB2.0 support"
166 + depends on DVB_USB
167 + select DVB_MT352 if !DVB_FE_CUSTOMISE
168 +- select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
169 +- select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
170 + select DVB_TDA1004X if !DVB_FE_CUSTOMISE
171 ++ select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
172 ++ select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
173 + help
174 + Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
175 + Currently, only devices with a product id of
176 +@@ -133,7 +133,7 @@ config DVB_USB_GL861
177 + tristate "Genesys Logic GL861 USB2.0 support"
178 + depends on DVB_USB
179 + select DVB_ZL10353 if !DVB_FE_CUSTOMISE
180 +- select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
181 ++ select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
182 + help
183 + Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
184 + receiver with USB ID 0db0:5581.
185 +@@ -142,7 +142,7 @@ config DVB_USB_AU6610
186 + tristate "Alcor Micro AU6610 USB2.0 support"
187 + depends on DVB_USB
188 + select DVB_ZL10353 if !DVB_FE_CUSTOMISE
189 +- select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
190 ++ select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
191 + help
192 + Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
193 +
194 +@@ -194,8 +194,8 @@ config DVB_USB_NOVA_T_USB2
195 + tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
196 + depends on DVB_USB
197 + select DVB_DIB3000MC
198 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
199 + select DVB_PLL if !DVB_FE_CUSTOMISE
200 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
201 + help
202 + Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
203 +
204 +@@ -231,8 +231,8 @@ config DVB_USB_OPERA1
205 + config DVB_USB_AF9005
206 + tristate "Afatech AF9005 DVB-T USB1.1 support"
207 + depends on DVB_USB && EXPERIMENTAL
208 +- select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
209 +- select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
210 ++ select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
211 ++ select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
212 + help
213 + Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
214 + and the TerraTec Cinergy T USB XE (Rev.1)
215 +Index: linux-2.6.27-gentoo-r7/drivers/media/dvb/ttpci/Kconfig
216 +===================================================================
217 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/dvb/ttpci/Kconfig
218 ++++ linux-2.6.27-gentoo-r7/drivers/media/dvb/ttpci/Kconfig
219 +@@ -105,7 +105,7 @@ config DVB_BUDGET_CI
220 + select DVB_TDA1004X if !DVB_FE_CUSTOMISE
221 + select DVB_LNBP21 if !DVB_FE_CUSTOMISE
222 + select DVB_TDA10023 if !DVB_FE_CUSTOMISE
223 +- select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
224 ++ select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
225 + select VIDEO_IR
226 + help
227 + Support for simple SAA7146 based DVB cards
228 +Index: linux-2.6.27-gentoo-r7/drivers/media/video/cx18/Kconfig
229 +===================================================================
230 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/video/cx18/Kconfig
231 ++++ linux-2.6.27-gentoo-r7/drivers/media/video/cx18/Kconfig
232 +@@ -9,7 +9,7 @@ config VIDEO_CX18
233 + select VIDEO_CX2341X
234 + select VIDEO_CS5345
235 + select DVB_S5H1409 if !DVB_FE_CUSTOMISE
236 +- select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
237 ++ select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
238 + ---help---
239 + This is a video4linux driver for Conexant cx23418 based
240 + PCI combo video recorder devices.
241 +Index: linux-2.6.27-gentoo-r7/drivers/media/video/cx23885/Kconfig
242 +===================================================================
243 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/video/cx23885/Kconfig
244 ++++ linux-2.6.27-gentoo-r7/drivers/media/video/cx23885/Kconfig
245 +@@ -11,15 +11,15 @@ config VIDEO_CX23885
246 + select VIDEO_CX25840
247 + select VIDEO_CX2341X
248 + select DVB_DIB7000P if !DVB_FE_CUSTOMISE
249 +- select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE
250 + select DVB_S5H1409 if !DVB_FE_CUSTOMISE
251 + select DVB_S5H1411 if !DVB_FE_CUSTOMISE
252 + select DVB_LGDT330X if !DVB_FE_CUSTOMISE
253 ++ select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
254 ++ select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE
255 + select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
256 + select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
257 + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
258 + select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
259 +- select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
260 + ---help---
261 + This is a video4linux driver for Conexant 23885 based
262 + TV cards.
263 +Index: linux-2.6.27-gentoo-r7/drivers/media/video/cx88/Kconfig
264 +===================================================================
265 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/video/cx88/Kconfig
266 ++++ linux-2.6.27-gentoo-r7/drivers/media/video/cx88/Kconfig
267 +@@ -56,8 +56,8 @@ config VIDEO_CX88_DVB
268 + select DVB_NXT200X if !DVB_FE_CUSTOMISE
269 + select DVB_CX24123 if !DVB_FE_CUSTOMISE
270 + select DVB_ISL6421 if !DVB_FE_CUSTOMISE
271 +- select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
272 + select DVB_S5H1411 if !DVB_FE_CUSTOMISE
273 ++ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
274 + ---help---
275 + This adds support for DVB/ATSC cards based on the
276 + Conexant 2388x chip.
277 +Index: linux-2.6.27-gentoo-r7/drivers/media/video/pvrusb2/Kconfig
278 +===================================================================
279 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/video/pvrusb2/Kconfig
280 ++++ linux-2.6.27-gentoo-r7/drivers/media/video/pvrusb2/Kconfig
281 +@@ -42,7 +42,7 @@ config VIDEO_PVRUSB2_DVB
282 + select DVB_S5H1411 if !DVB_FE_CUSTOMISE
283 + select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
284 + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
285 +- select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
286 ++ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
287 + select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
288 + ---help---
289 +
290 +Index: linux-2.6.27-gentoo-r7/drivers/media/video/saa7134/Kconfig
291 +===================================================================
292 +--- linux-2.6.27-gentoo-r7.orig/drivers/media/video/saa7134/Kconfig
293 ++++ linux-2.6.27-gentoo-r7/drivers/media/video/saa7134/Kconfig
294 +@@ -34,9 +34,9 @@ config VIDEO_SAA7134_DVB
295 + select DVB_NXT200X if !DVB_FE_CUSTOMISE
296 + select DVB_TDA10086 if !DVB_FE_CUSTOMISE
297 + select DVB_TDA826X if !DVB_FE_CUSTOMISE
298 +- select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
299 + select DVB_ISL6421 if !DVB_FE_CUSTOMISE
300 +- select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
301 ++ select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
302 ++ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
303 + ---help---
304 + This adds support for DVB cards based on the
305 + Philips saa7134 chip.