1 |
billie 09/09/10 17:56:50 |
2 |
|
3 |
Modified: ChangeLog linuxtv-dvb-firmware-2009.07.06-r1.ebuild |
4 |
Log: |
5 |
Fix installation of some firmwares if DVB_CARDS is unset. This fixes bug #284162. Ebuild cleanup. |
6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.25 media-tv/linuxtv-dvb-firmware/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog?rev=1.25&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog?rev=1.25&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog?r1=1.24&r2=1.25 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v |
18 |
retrieving revision 1.24 |
19 |
retrieving revision 1.25 |
20 |
diff -u -r1.24 -r1.25 |
21 |
--- ChangeLog 9 Sep 2009 21:41:04 -0000 1.24 |
22 |
+++ ChangeLog 10 Sep 2009 17:56:50 -0000 1.25 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for media-tv/linuxtv-dvb-firmware |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.24 2009/09/09 21:41:04 billie Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.25 2009/09/10 17:56:50 billie Exp $ |
28 |
+ |
29 |
+ 10 Sep 2009; Pielmeier Daniel <billie@g.o> |
30 |
+ linuxtv-dvb-firmware-2009.07.06-r1.ebuild: |
31 |
+ Fix installation of some firmwares if DVB_CARDS is unset. This fixes bug |
32 |
+ #284162. Ebuild cleanup. |
33 |
|
34 |
09 Sep 2009; Pielmeier Daniel <billie@g.o> |
35 |
linuxtv-dvb-firmware-2009.07.06-r1.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.3 media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild?rev=1.3&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild?rev=1.3&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild?r1=1.2&r2=1.3 |
44 |
|
45 |
Index: linuxtv-dvb-firmware-2009.07.06-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild,v |
48 |
retrieving revision 1.2 |
49 |
retrieving revision 1.3 |
50 |
diff -u -r1.2 -r1.3 |
51 |
--- linuxtv-dvb-firmware-2009.07.06-r1.ebuild 9 Sep 2009 21:41:04 -0000 1.2 |
52 |
+++ linuxtv-dvb-firmware-2009.07.06-r1.ebuild 10 Sep 2009 17:56:50 -0000 1.3 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild,v 1.2 2009/09/09 21:41:04 billie Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild,v 1.3 2009/09/10 17:56:50 billie Exp $ |
58 |
|
59 |
DESCRIPTION="Firmware files needed for operation of some dvb-devices" |
60 |
HOMEPAGE="http://www.linuxtv.org" |
61 |
@@ -239,7 +239,6 @@ |
62 |
install_dvb_card() { |
63 |
if [[ -z ${DVB_CARDS} ]]; then |
64 |
# install (almost) all firmware files |
65 |
- |
66 |
# do not install this one due to conflicting filenames |
67 |
[[ "${1}" != "tda10046lifeview" ]] |
68 |
else |
69 |
@@ -258,11 +257,14 @@ |
70 |
eerror |
71 |
eerror "But beware that you cannot enable tda10046 and" |
72 |
eerror "tda10046lifeview at the same time." |
73 |
- eerror |
74 |
fi |
75 |
|
76 |
if [[ -z ${DVB_CARDS} ]]; then |
77 |
+ elog |
78 |
elog "DVB_CARDS is not set, installing all available firmware files." |
79 |
+ elog "To save bandwidth please consider setting the DVB_CARDS variable" |
80 |
+ elog "in ${ROOT%/}/etc/make.conf. This way only the firmwares you own" |
81 |
+ elog "the hardware will be installed." |
82 |
fi |
83 |
# according to http://devmanual.gentoo.org/general-concepts/use-flags/index.html |
84 |
# we should not die here. However, there is no sensible fallback choice to make |
85 |
@@ -272,25 +274,29 @@ |
86 |
eerror "You cannot have both tda10046 and tda10046lifeview in DVB_CARDS" |
87 |
eerror "because of colliding firmware filenames (dvb-fe-tda10046.fw)." |
88 |
eerror "Sorry." |
89 |
- eerror |
90 |
die "Conflicting values for DVB_CARDS set." |
91 |
fi |
92 |
+ elog |
93 |
elog "List of possible card-names to use for DVB_CARDS:" |
94 |
echo ${FW_USE_FLAGS[*]}| tr ' ' '\n' | sort | uniq | fmt \ |
95 |
| while read line; do |
96 |
elog " ${line}" |
97 |
done |
98 |
+ elog |
99 |
elog "If you need another firmware file and want it included create a bug" |
100 |
elog "at bugs.gentoo.org." |
101 |
- elog "If some firmware sources are not fetchable anymore please also report" |
102 |
- elog "a bug. If there is no alternative source or an update to the firmware" |
103 |
- elog "available we have to remove it from this ebuild and you are on your own." |
104 |
+ elog "In case some firmware sources are not fetchable please try again at" |
105 |
+ elog "a later time and if it still does not fetch report a bug. If there" |
106 |
+ elog "is no alternative source or an update to the firmware available we" |
107 |
+ elog "have to remove it from the ebuild and you are on your own." |
108 |
} |
109 |
|
110 |
src_unpack() { |
111 |
+ local distfile |
112 |
+ |
113 |
# link all downloaded files to ${S} |
114 |
- for f in ${A}; do |
115 |
- [[ -L ${f} ]] || ln -s ${DISTDIR}/${f} ${f} |
116 |
+ for distfile in ${A}; do |
117 |
+ [[ -L ${distfile} ]] || ln -s ${DISTDIR}/${distfile} ${distfile} |
118 |
done |
119 |
|
120 |
# unpack firmware-packet |
121 |
@@ -298,13 +304,17 @@ |
122 |
unpack ${PACKET_NAME} |
123 |
fi |
124 |
|
125 |
- use dvb_cards_mpc718 && mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip" |
126 |
- use dvb_cards_ttpci && mv dvb-ttpci-01.fw-fc2624 dvb-ttpci-01.fw |
127 |
+ if [[ -z ${DVB_CARDS} ]] || use dvb_cards_mpc718 ; then |
128 |
+ mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip" |
129 |
+ fi |
130 |
+ if [[ -z ${DVB_CARDS} ]] || use dvb_cards_ttpci ; then |
131 |
+ mv dvb-ttpci-01.fw-fc2624 dvb-ttpci-01.fw |
132 |
+ fi |
133 |
|
134 |
- SCRIPT_V=${PV} |
135 |
+ local script_v=${PV} |
136 |
|
137 |
# Adjust temp-dir of get_dvb_firmware |
138 |
- sed "${FILESDIR}"/get_dvb_firmware-${SCRIPT_V} \ |
139 |
+ sed "${FILESDIR}"/get_dvb_firmware-${script_v} \ |
140 |
-e "s#/tmp#${T}#g" > get_dvb_firmware |
141 |
chmod a+x get_dvb_firmware |
142 |
|
143 |
@@ -326,9 +336,9 @@ |
144 |
|
145 |
for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do |
146 |
if install_dvb_card ${FW_USE_FLAGS[CARD]}; then |
147 |
- local FILE=${FW_FILES[CARD]} |
148 |
- [[ -f ${FILE} ]] || die "File ${FILE} does not exist!" |
149 |
- doins ${FILE} |
150 |
+ local file=${FW_FILES[CARD]} |
151 |
+ [[ -f ${file} ]] || die "File ${file} does not exist!" |
152 |
+ doins ${file} |
153 |
fi |
154 |
done |
155 |
} |