1 |
hd_brummy 07/09/12 08:31:36 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: vdr-1.4.7-r4.ebuild |
5 |
Log: |
6 |
versions bump; new patchset handling and a lot of new use-flags up from this version |
7 |
(Portage version: 2.1.2.12) |
8 |
|
9 |
Revision Changes Path |
10 |
1.86 media-video/vdr/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.86&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.86&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?r1=1.85&r2=1.86 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v |
19 |
retrieving revision 1.85 |
20 |
retrieving revision 1.86 |
21 |
diff -u -r1.85 -r1.86 |
22 |
--- ChangeLog 11 Sep 2007 19:06:48 -0000 1.85 |
23 |
+++ ChangeLog 12 Sep 2007 08:31:36 -0000 1.86 |
24 |
@@ -1,6 +1,17 @@ |
25 |
# ChangeLog for media-video/vdr |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.85 2007/09/11 19:06:48 zzam Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.86 2007/09/12 08:31:36 hd_brummy Exp $ |
29 |
+ |
30 |
+*vdr-1.4.7-r4 (12 Sep 2007) |
31 |
+ |
32 |
+ 12 Sep 2007; Joerg Bornkessel <hd_brummy@g.o> |
33 |
+ +files/vdr-add-svdrp-down-0.1.diff, |
34 |
+ +files/vdr-1.4.7-makefile-destdir.diff, |
35 |
+ +files/vdr-1.4.7-makefile-install-header.diff, |
36 |
+ +files/extensions-patch-32-plugin-link-error.diff, |
37 |
+ +files/vdr-set-dumpable.diff, +vdr-1.4.7-r4.ebuild: |
38 |
+ versions bump; new patchset handling and a lot of new use-flags up from this |
39 |
+ version |
40 |
|
41 |
11 Sep 2007; Matthias Schwarzott <zzam@g.o> vdr-1.4.6.ebuild: |
42 |
Marked stable on x86. |
43 |
|
44 |
|
45 |
|
46 |
1.1 media-video/vdr/vdr-1.4.7-r4.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: vdr-1.4.7-r4.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2007 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild,v 1.1 2007/09/12 08:31:36 hd_brummy Exp $ |
56 |
|
57 |
inherit eutils flag-o-matic multilib |
58 |
|
59 |
IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry |
60 |
dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft |
61 |
jumpplay liemikuutio livebuffer lnbshare mainmenuhooks noepg osdmaxitems pinplugin |
62 |
rotor settime setup sortrecords sourcecaps submenu |
63 |
subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg |
64 |
syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter" |
65 |
|
66 |
IUSE="debug vanilla ${IUSE_EXTENSIONS}" |
67 |
|
68 |
EXT_V="32" |
69 |
EXT_P=VDR-Extensions-Patch-${EXT_V} |
70 |
EXT_DIR=${WORKDIR}/${EXT_P}/ |
71 |
# Set if != $PV |
72 |
#EXT_VDR_PV=1.5.3 |
73 |
|
74 |
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" |
75 |
HOMEPAGE="http://www.cadsoft.de/vdr/" |
76 |
SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2 |
77 |
http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2" |
78 |
|
79 |
KEYWORDS="~amd64 ~ppc ~x86" |
80 |
SLOT="0" |
81 |
LICENSE="GPL-2" |
82 |
|
83 |
|
84 |
DEPEND="media-libs/jpeg |
85 |
sys-apps/gawk |
86 |
media-tv/linuxtv-dvb-headers |
87 |
sys-libs/libcap |
88 |
dev-util/unifdef" |
89 |
|
90 |
RDEPEND="${DEPEND} |
91 |
dev-lang/perl |
92 |
media-tv/vdrplugin-rebuild |
93 |
>=media-tv/gentoo-vdr-scripts-0.3.5" |
94 |
|
95 |
# pull in vdr-setup to get the xml files, else menu will not work |
96 |
PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )" |
97 |
|
98 |
# Relevant Pathes for vdr on gentoo |
99 |
DVB_DIR=/usr/include |
100 |
CONF_DIR=/etc/vdr |
101 |
CAP_FILE=${S}/capabilities.sh |
102 |
CAPS="# Capabilities of the vdr-executable for use by startscript etc." |
103 |
|
104 |
pkg_setup() { |
105 |
use debug && append-flags -g |
106 |
PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" |
107 |
} |
108 |
|
109 |
add_cap() { |
110 |
while [ "$1" ]; do |
111 |
CAPS="${CAPS}\n$1=1" |
112 |
shift |
113 |
done |
114 |
} |
115 |
|
116 |
enable_patch() { |
117 |
local patch |
118 |
while [ "$1" ]; do |
119 |
patch="$1" |
120 |
echo "$patch = 1" >> Make.config |
121 |
shift |
122 |
done |
123 |
} |
124 |
|
125 |
extensions_add_make_conf() |
126 |
{ |
127 |
# copy all ifdef for extensions-patch to Make.config |
128 |
sed -e '1,/need to touch the following:/d' \ |
129 |
-e '/ifdef DVBDIR/,/^$/d' \ |
130 |
Make.config.template >> Make.config |
131 |
} |
132 |
|
133 |
extensions_all_defines() { |
134 |
# extract all possible settings for extensions-patch |
135 |
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \ |
136 |
Make.config.template \ |
137 |
| sort \ |
138 |
| tr '[:upper:]' '[:lower:]' |
139 |
} |
140 |
|
141 |
extensions_all_defines_unset() { |
142 |
# extract all possible settings for extensions-patch |
143 |
# and convert them to -U... for unifdef |
144 |
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \ |
145 |
Make.config.template \ |
146 |
| tr '\n' ' ' |
147 |
} |
148 |
|
149 |
do_unifdef() { |
150 |
ebegin "Unifdef sources" |
151 |
local mf="Makefile.get" |
152 |
cat <<'EOT' > $mf |
153 |
include Makefile |
154 |
show_def: |
155 |
@echo $(DEFINES) |
156 |
show_src_files: |
157 |
@echo $(OBJS:%.o=%.c) |
158 |
EOT |
159 |
|
160 |
local DEFINES=$(extensions_all_defines_unset) |
161 |
|
162 |
local RAW_DEFINES=$(make -f "$mf" show_def) |
163 |
local VDR_SRC_FILES="$(make -f "$mf" show_src_files)" |
164 |
local KEEP_FILES="genfontfile.c $(echo font*.c)" |
165 |
rm "$mf" |
166 |
|
167 |
local def |
168 |
for def in $RAW_DEFINES; do |
169 |
case "${def}" in |
170 |
-DUSE*) |
171 |
DEFINES="${DEFINES} ${def}" |
172 |
;; |
173 |
esac |
174 |
done |
175 |
|
176 |
local f |
177 |
for f in *.c; do |
178 |
|
179 |
# Removing the src files the Makefile does not use for compiling vdr |
180 |
if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then |
181 |
rm -f ${f} ${f%.c}.h |
182 |
continue |
183 |
fi |
184 |
|
185 |
unifdef ${DEFINES} "$f" > "tmp.$f" |
186 |
mv "tmp.$f" "$f" |
187 |
done |
188 |
for f in *.h; do |
189 |
unifdef ${DEFINES} "$f" > "tmp.$f" |
190 |
mv "tmp.$f" "$f" |
191 |
done |
192 |
eend 0 |
193 |
} |
194 |
|
195 |
src_unpack() { |
196 |
|
197 |
unpack ${A} |
198 |
cd ${S} |
199 |
|
200 |
ebegin "Changing pathes for gentoo" |
201 |
|
202 |
sed \ |
203 |
-e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \ |
204 |
-i vdr.c |
205 |
|
206 |
cat > Make.config <<-EOT |
207 |
# |
208 |
# Generated by ebuild ${PF} |
209 |
# |
210 |
BINDIR = /usr/bin |
211 |
MANDIR = /usr/share/man |
212 |
DVBDIR = ${DVB_DIR} |
213 |
PLUGINLIBDIR = ${PLUGIN_LIBDIR} |
214 |
CONFDIR = ${CONF_DIR} |
215 |
VIDEODIR = /var/vdr/video |
216 |
HEADERDIR = /usr/include |
217 |
|
218 |
DEFINES += -DCONFDIR=\"\$(CONFDIR)\" |
219 |
|
220 |
EOT |
221 |
eend 0 |
222 |
|
223 |
epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff |
224 |
epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff |
225 |
|
226 |
sed -i Makefile \ |
227 |
-e 's/runvdr//' \ |
228 |
-e 's/ install-plugins//' |
229 |
|
230 |
if ! use vanilla; then |
231 |
|
232 |
# changes to extensions-patch to be applicable to vdr-$PV |
233 |
cd "${EXT_DIR}" |
234 |
local LOCAL_EXT_CHANGES="${FILESDIR}/extensions-patch-${EXT_V}-vdr-${PV}.diff" |
235 |
if [[ -f "${LOCAL_EXT_CHANGES}" ]]; then |
236 |
epatch "${LOCAL_EXT_CHANGES}" |
237 |
fi |
238 |
epatch "${FILESDIR}/extensions-patch-32-plugin-link-error.diff" |
239 |
|
240 |
cd "${S}" |
241 |
epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff" |
242 |
#epatch "${FILESDIR}/${P}-gentoo-hardlinkcutter.diff" |
243 |
|
244 |
epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff" |
245 |
add_cap CAP_SHUTDOWN_SVDRP |
246 |
|
247 |
epatch "${FILESDIR}/vdr-set-dumpable.diff" |
248 |
|
249 |
# This allows us to start even if some plugin does not exist |
250 |
# or is not loadable. |
251 |
enable_patch PLUGINMISSING |
252 |
|
253 |
# Patch necessary for media-plugins/vdr-reelchannelscan |
254 |
# it does not change anything when plugin is not used |
255 |
enable_patch CHANNELSCAN |
256 |
|
257 |
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then |
258 |
einfo "Doing maintainer checks:" |
259 |
|
260 |
# these patches we do not support |
261 |
# (or have them already hard enabled) |
262 |
local IGNORE_PATCHES="channelscan pluginapi pluginmissing" |
263 |
|
264 |
extensions_all_defines > ${T}/new.IUSE |
265 |
echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > ${T}/old.IUSE |
266 |
local DIFFS=$(diff -u ${T}/old.IUSE ${T}/new.IUSE|grep '^[+-][^+-]') |
267 |
if [[ -z ${DIFFS} ]]; then |
268 |
einfo "IUSE_EXTENSIONS is up to date." |
269 |
else |
270 |
ewarn "IUSE differences!" |
271 |
local diff |
272 |
for diff in $DIFFS; do |
273 |
ewarn "$diff" |
274 |
done |
275 |
fi |
276 |
fi |
277 |
|
278 |
ebegin "Enabling selected patches" |
279 |
local flag |
280 |
for flag in $IUSE_EXTENSIONS; do |
281 |
FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]') |
282 |
use $flag && enable_patch ${FLAG_UP} |
283 |
done |
284 |
eend 0 |
285 |
|
286 |
extensions_add_make_conf |
287 |
|
288 |
ebegin "Make fonts" |
289 |
emake font >/dev/null |
290 |
eend $? "make fonts failed" |
291 |
|
292 |
ebegin "Make depend" |
293 |
emake .dependencies >/dev/null |
294 |
eend $? "make depend failed" |
295 |
|
296 |
do_unifdef |
297 |
fi |
298 |
|
299 |
# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR |
300 |
if test -n "${VDR_LOCAL_PATCHES_DIR}"; then |
301 |
local dir_tmp_var |
302 |
local LOCALPATCHES_SUBDIR=${PV} |
303 |
for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do |
304 |
if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then |
305 |
LOCALPATCHES_SUBDIR="${dir_tmp_var}" |
306 |
fi |
307 |
done |
308 |
|
309 |
echo |
310 |
if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then |
311 |
einfo "Applying local patches" |
312 |
else |
313 |
einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})" |
314 |
fi |
315 |
|
316 |
for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do |
317 |
test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}" |
318 |
done |
319 |
fi |
320 |
|
321 |
if [[ -n "${VDRSOURCE_DIR}" ]]; then |
322 |
cp -r ${S} ${T}/source-tree |
323 |
fi |
324 |
|
325 |
|
326 |
if ! use vanilla; then |
327 |
add_cap CAP_IRCTRL_RUNTIME_PARAM \ |
328 |
CAP_VFAT_RUNTIME_PARAM \ |
329 |
CAP_CHUID |
330 |
|
331 |
echo -e ${CAPS} > ${CAP_FILE} |
332 |
fi |
333 |
} |
334 |
|
335 |
src_install() { |
336 |
emake install DESTDIR="${D}" |
337 |
|
338 |
keepdir ${CONF_DIR}/plugins |
339 |
keepdir ${CONF_DIR}/themes |
340 |
|
341 |
keepdir "${PLUGIN_LIBDIR}" |
342 |
|
343 |
dohtml *.html |
344 |
dodoc MANUAL INSTALL README* HISTORY* |
345 |
dodoc TODO-enAIO-rm CONTRIBUTORS |
346 |
newdoc ${EXT_DIR}/README README.extensions-patch |
347 |
|
348 |
insinto /usr/share/vdr |
349 |
doins ${CAP_FILE} |
350 |
|
351 |
if [[ -n "${VDRSOURCE_DIR}" ]]; then |
352 |
einfo "Installing sources" |
353 |
insinto ${VDRSOURCE_DIR}/${P} |
354 |
doins -r ${T}/source-tree/* |
355 |
keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib |
356 |
fi |
357 |
|
358 |
if use setup; then |
359 |
insinto /usr/share/vdr/setup |
360 |
doins ${S}/menu.c |
361 |
fi |
362 |
chown -R vdr:vdr ${D}/${CONF_DIR} |
363 |
} |
364 |
|
365 |
pkg_postinst() { |
366 |
elog "It is a good idea to run vdrplugin-rebuild now" |
367 |
if has_version "<media-video/vdr-1.3.36-r3"; then |
368 |
ewarn "Upgrade Info:" |
369 |
ewarn |
370 |
ewarn "If you had used the use-flags lirc, rcu or vfat" |
371 |
ewarn "then, you now have to enable the associated functionality" |
372 |
ewarn "in /etc/conf.d/vdr" |
373 |
ewarn |
374 |
ewarn "vfat is now set with VFAT_FILENAMES." |
375 |
ewarn "lirc/rcu are now set with IR_CTRL." |
376 |
ebeep |
377 |
fi |
378 |
|
379 |
if use setup; then |
380 |
if ! has_version media-plugins/vdr-setup || \ |
381 |
! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then |
382 |
|
383 |
echo |
384 |
ewarn "You have compiled media-video/vdr with USE=\"setup\"" |
385 |
ewarn "It is very important to emerge media-plugins/vdr-setup now!" |
386 |
ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins" |
387 |
fi |
388 |
fi |
389 |
|
390 |
local keysfound=0 |
391 |
local key |
392 |
local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow" |
393 |
local remote_file=${ROOT}/etc/vdr/remote.conf |
394 |
|
395 |
if [[ -e ${remote_file} ]]; then |
396 |
for key in ${warn_keys}; do |
397 |
if grep -q -i "\.${key} " "${remote_file}"; then |
398 |
keysfound=1 |
399 |
break |
400 |
fi |
401 |
done |
402 |
if [[ ${keysfound} == 1 ]]; then |
403 |
ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable" |
404 |
ewarn "Please remove these keys or vdr will not start:" |
405 |
ewarn "# ${warn_keys}" |
406 |
fi |
407 |
fi |
408 |
} |
409 |
|
410 |
|
411 |
|
412 |
-- |
413 |
gentoo-commits@g.o mailing list |