1 |
zzam 08/09/13 14:36:07 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: vdr-1.6.0_p2.ebuild |
5 |
Log: |
6 |
Version bumped. vdr now is at maintainance patch 1.6.0-2, extensions-patch at v63. Fixed a typo in name of new extension cmdreccmdi18n. |
7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-tuxonice-r6 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.119 media-video/vdr/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.119&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?rev=1.119&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/ChangeLog?r1=1.118&r2=1.119 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v |
19 |
retrieving revision 1.118 |
20 |
retrieving revision 1.119 |
21 |
diff -u -r1.118 -r1.119 |
22 |
--- ChangeLog 29 Jun 2008 13:32:41 -0000 1.118 |
23 |
+++ ChangeLog 13 Sep 2008 14:36:07 -0000 1.119 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for media-video/vdr |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.118 2008/06/29 13:32:41 zzam Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.119 2008/09/13 14:36:07 zzam Exp $ |
29 |
+ |
30 |
+*vdr-1.6.0_p2 (13 Sep 2008) |
31 |
+ |
32 |
+ 13 Sep 2008; Matthias Schwarzott <zzam@g.o> metadata.xml, |
33 |
+ +vdr-1.6.0_p2.ebuild: |
34 |
+ Version bumped. vdr now is at maintainance patch 1.6.0-2, extensions-patch |
35 |
+ at v63. Fixed a typo in name of new extension cmdreccmdi18n. |
36 |
|
37 |
*vdr-1.4.7-r12 (29 Jun 2008) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.6 media-video/vdr/metadata.xml |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/metadata.xml?rev=1.6&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/metadata.xml?rev=1.6&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/metadata.xml?r1=1.5&r2=1.6 |
47 |
|
48 |
Index: metadata.xml |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/metadata.xml,v |
51 |
retrieving revision 1.5 |
52 |
retrieving revision 1.6 |
53 |
diff -u -r1.5 -r1.6 |
54 |
--- metadata.xml 17 Aug 2008 02:18:24 -0000 1.5 |
55 |
+++ metadata.xml 13 Sep 2008 14:36:07 -0000 1.6 |
56 |
@@ -13,6 +13,7 @@ |
57 |
<flag name="bigpatch">Enables almost all additional features flying around on the net (including aio)</flag> |
58 |
<flag name="child-protection">Enable support for the plugin vdr-pin (Protecting some recordings / channels with a PIN)</flag> |
59 |
<flag name="cmdctrl">allows switching remote control on/off</flag> |
60 |
+ <flag name="cmdreccmdi18n">loads translated commands and reccommands files if existing</flag> |
61 |
<flag name="cmdsubmenu">Allows the creation of submenus in the commands menu</flag> |
62 |
<flag name="cutterlimit">Limit IO bandwith used for cutting</flag> |
63 |
<flag name="cutterqueue">Adds a queue of recordings to be cutted</flag> |
64 |
|
65 |
|
66 |
|
67 |
1.1 media-video/vdr/vdr-1.6.0_p2.ebuild |
68 |
|
69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild?rev=1.1&view=markup |
70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild?rev=1.1&content-type=text/plain |
71 |
|
72 |
Index: vdr-1.6.0_p2.ebuild |
73 |
=================================================================== |
74 |
# Copyright 1999-2008 Gentoo Foundation |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.1 2008/09/13 14:36:07 zzam Exp $ |
77 |
|
78 |
inherit eutils flag-o-matic multilib |
79 |
|
80 |
# Switches supported by extensions-patch |
81 |
EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry |
82 |
dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter iptv |
83 |
jumpplay liemikuutio lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin |
84 |
rotor settime setup sortrecords sourcecaps livebuffer |
85 |
ttxtsubs timercmd timerinfo validinput yaepg |
86 |
syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer |
87 |
volctrl wareagleicon lircsettings deltimeshiftrec em84xx |
88 |
cmdreccmdi18n" |
89 |
|
90 |
IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS}" |
91 |
|
92 |
MY_PV="${PV%_p*}" |
93 |
MY_P="${PN}-${MY_PV}" |
94 |
S="${WORKDIR}/${MY_P}" |
95 |
|
96 |
EXT_V="63" |
97 |
EXT_P=VDR-Extensions-Patch-${EXT_V} |
98 |
EXT_DIR=${WORKDIR}/${EXT_P}/ |
99 |
EXT_VDR_PV="${PV/_p/-}" |
100 |
|
101 |
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" |
102 |
HOMEPAGE="http://www.cadsoft.de/vdr/" |
103 |
SRC_URI="ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2 |
104 |
ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-1.diff |
105 |
ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-2.diff |
106 |
http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2" |
107 |
|
108 |
KEYWORDS="~amd64 ~ppc ~x86" |
109 |
SLOT="0" |
110 |
LICENSE="GPL-2" |
111 |
|
112 |
COMMON_DEPEND="media-libs/jpeg |
113 |
sys-libs/libcap |
114 |
>=media-libs/fontconfig-2.4.2 |
115 |
>=media-libs/freetype-2 |
116 |
sys-devel/gettext |
117 |
dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )" |
118 |
|
119 |
DEPEND="${COMMON_DEPEND} |
120 |
media-tv/linuxtv-dvb-headers |
121 |
dev-util/unifdef" |
122 |
|
123 |
RDEPEND="${COMMON_DEPEND} |
124 |
dev-lang/perl |
125 |
>=media-tv/gentoo-vdr-scripts-0.4.5 |
126 |
media-fonts/corefonts" |
127 |
|
128 |
# pull in vdr-setup to get the xml files, else menu will not work |
129 |
PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )" |
130 |
|
131 |
CONF_DIR=/etc/vdr |
132 |
CAP_FILE=${S}/capabilities.sh |
133 |
CAPS="# Capabilities of the vdr-executable for use by startscript etc." |
134 |
|
135 |
pkg_setup() { |
136 |
check_menu_flags |
137 |
|
138 |
use debug && append-flags -g |
139 |
PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" |
140 |
} |
141 |
|
142 |
check_menu_flags() { |
143 |
if use menuorg && use setup; then |
144 |
echo |
145 |
eerror "Please use only one of this USE-Flags" |
146 |
eerror "\tmenuorg setup" |
147 |
die "multiple menu manipulation" |
148 |
fi |
149 |
} |
150 |
|
151 |
add_cap() { |
152 |
local arg |
153 |
for arg; do |
154 |
CAPS="${CAPS}\n${arg}=1" |
155 |
done |
156 |
} |
157 |
|
158 |
enable_patch() { |
159 |
local arg ARG_UPPER |
160 |
for arg; do |
161 |
ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]') |
162 |
echo "${ARG_UPPER} = 1" >> Make.config |
163 |
done |
164 |
} |
165 |
|
166 |
extensions_add_make_conf() |
167 |
{ |
168 |
# copy all ifdef for extensions-patch to Make.config |
169 |
sed -e '1,/need to touch the following:/d' \ |
170 |
-e '/ifdef DVBDIR/,/^$/d' \ |
171 |
Make.config.template >> Make.config |
172 |
} |
173 |
|
174 |
extensions_all_defines() { |
175 |
# extract all possible settings for extensions-patch |
176 |
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \ |
177 |
Make.config.template \ |
178 |
| sort \ |
179 |
| tr '[:upper:]' '[:lower:]' |
180 |
} |
181 |
|
182 |
extensions_all_defines_unset() { |
183 |
# extract all possible settings for extensions-patch |
184 |
# and convert them to -U... for unifdef |
185 |
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \ |
186 |
Make.config.template \ |
187 |
| tr '\n' ' ' |
188 |
} |
189 |
|
190 |
do_unifdef() { |
191 |
ebegin "Unifdef sources" |
192 |
local mf="Makefile.get" |
193 |
cat <<'EOT' > $mf |
194 |
include Makefile |
195 |
show_def: |
196 |
@echo $(DEFINES) |
197 |
show_src_files: |
198 |
@echo $(OBJS:%.o=%.c) |
199 |
EOT |
200 |
|
201 |
local DEFINES=$(extensions_all_defines_unset) |
202 |
|
203 |
local RAW_DEFINES=$(make -f "$mf" show_def) |
204 |
local VDR_SRC_FILES=$(make -f "$mf" show_src_files) |
205 |
local KEEP_FILES="" |
206 |
rm "$mf" |
207 |
|
208 |
local def |
209 |
for def in $RAW_DEFINES; do |
210 |
case "${def}" in |
211 |
-DUSE*) |
212 |
DEFINES="${DEFINES} ${def}" |
213 |
;; |
214 |
esac |
215 |
done |
216 |
|
217 |
local f |
218 |
for f in *.c; do |
219 |
|
220 |
# Removing the src files the Makefile does not use for compiling vdr |
221 |
if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then |
222 |
rm -f ${f} ${f%.c}.h |
223 |
continue |
224 |
fi |
225 |
|
226 |
unifdef ${DEFINES} "$f" > "tmp.$f" |
227 |
mv "tmp.$f" "$f" |
228 |
done |
229 |
for f in *.h; do |
230 |
unifdef ${DEFINES} "$f" > "tmp.$f" |
231 |
mv "tmp.$f" "$f" |
232 |
[[ -s $f ]] || rm "$f" |
233 |
done |
234 |
eend 0 |
235 |
} |
236 |
|
237 |
src_unpack() { |
238 |
|
239 |
unpack ${A} |
240 |
|
241 |
cd "${S}" |
242 |
#applying maintainace-patches |
243 |
epatch "${DISTDIR}/${MY_P}-1.diff" |
244 |
epatch "${DISTDIR}/${MY_P}-2.diff" |
245 |
|
246 |
ebegin "Changing pathes for gentoo" |
247 |
|
248 |
sed \ |
249 |
-e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \ |
250 |
-i vdr.c |
251 |
|
252 |
local DVBDIR=/usr/include |
253 |
|
254 |
cat > Make.config <<-EOT |
255 |
# |
256 |
# Generated by ebuild ${PF} |
257 |
# |
258 |
PREFIX = /usr |
259 |
DVBDIR = ${DVBDIR} |
260 |
PLUGINLIBDIR = ${PLUGIN_LIBDIR} |
261 |
CONFDIR = ${CONF_DIR} |
262 |
VIDEODIR = /var/vdr/video |
263 |
LOCDIR = \$(PREFIX)/share/vdr/locale |
264 |
|
265 |
DEFINES += -DCONFDIR=\"\$(CONFDIR)\" |
266 |
INCLUDES += -I\$(DVBDIR) |
267 |
|
268 |
EOT |
269 |
eend 0 |
270 |
|
271 |
epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff |
272 |
if use dxr3; then |
273 |
einfo "Applying dxr3 subtitle hack" |
274 |
epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff |
275 |
fi |
276 |
|
277 |
sed -i i18n-to-gettext.pl \ |
278 |
-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/' |
279 |
|
280 |
# Do not install runvdr script and plugins |
281 |
sed -i Makefile \ |
282 |
-e 's/runvdr//' \ |
283 |
-e 's/ install-plugins//' |
284 |
|
285 |
if ! use vanilla; then |
286 |
|
287 |
cd "${S}" |
288 |
# Now apply extensions patch |
289 |
local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff" |
290 |
epatch "${EXT_DIR}/${fname}" |
291 |
|
292 |
# Fix typo in Make.config.template |
293 |
sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template |
294 |
|
295 |
# other gentoo patches |
296 |
# epatch "${FILESDIR}/..." |
297 |
|
298 |
# This allows us to start even if some plugin does not exist |
299 |
# or is not loadable. |
300 |
enable_patch PLUGINMISSING |
301 |
|
302 |
# Patch necessary for media-plugins/vdr-reelchannelscan |
303 |
# it does not change anything when plugin is not used |
304 |
enable_patch CHANNELSCAN |
305 |
|
306 |
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then |
307 |
einfo "Doing maintainer checks:" |
308 |
|
309 |
# these patches we do not support |
310 |
# (or have them already hard enabled) |
311 |
local IGNORE_PATCHES="channelscan pluginapi pluginmissing" |
312 |
|
313 |
extensions_all_defines > "${T}"/new.IUSE |
314 |
echo $EXT_PATCH_FLAGS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE |
315 |
local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]') |
316 |
if [[ -z ${DIFFS} ]]; then |
317 |
einfo "EXT_PATCH_FLAGS is up to date." |
318 |
else |
319 |
ewarn "IUSE differences!" |
320 |
local diff |
321 |
for diff in $DIFFS; do |
322 |
ewarn "$diff" |
323 |
done |
324 |
fi |
325 |
fi |
326 |
|
327 |
ebegin "Enabling selected patches" |
328 |
local flag |
329 |
for flag in $EXT_PATCH_FLAGS; do |
330 |
use $flag && enable_patch ${flag} |
331 |
done |
332 |
eend 0 |
333 |
|
334 |
extensions_add_make_conf |
335 |
|
336 |
ebegin "Make depend" |
337 |
emake .dependencies >/dev/null |
338 |
eend $? "make depend failed" |
339 |
|
340 |
do_unifdef |
341 |
|
342 |
use iptv && sed -i sources.conf -e 's/^#P/P/' |
343 |
fi |
344 |
|
345 |
# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR |
346 |
if test -n "${VDR_LOCAL_PATCHES_DIR}"; then |
347 |
local dir_tmp_var |
348 |
local LOCALPATCHES_SUBDIR=${PV} |
349 |
for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do |
350 |
if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then |
351 |
LOCALPATCHES_SUBDIR="${dir_tmp_var}" |
352 |
fi |
353 |
done |
354 |
|
355 |
echo |
356 |
if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then |
357 |
einfo "Applying local patches" |
358 |
else |
359 |
einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})" |
360 |
fi |
361 |
|
362 |
for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do |
363 |
test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}" |
364 |
done |
365 |
fi |
366 |
|
367 |
if [[ -n "${VDRSOURCE_DIR}" ]]; then |
368 |
cp -r "${S}" "${T}"/source-tree |
369 |
fi |
370 |
|
371 |
add_cap CAP_UTF8 |
372 |
|
373 |
add_cap CAP_IRCTRL_RUNTIME_PARAM \ |
374 |
CAP_VFAT_RUNTIME_PARAM \ |
375 |
CAP_CHUID \ |
376 |
CAP_SHUTDOWN_AUTO_RETRY |
377 |
|
378 |
echo -e ${CAPS} > "${CAP_FILE}" |
379 |
} |
380 |
|
381 |
src_install() { |
382 |
# trick makefile not to create a videodir by supplying it with an existing |
383 |
# directory |
384 |
emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed" |
385 |
|
386 |
keepdir "${CONF_DIR}"/plugins |
387 |
keepdir "${CONF_DIR}"/themes |
388 |
|
389 |
keepdir "${PLUGIN_LIBDIR}" |
390 |
|
391 |
exeinto /usr/share/vdr/bin |
392 |
doexe i18n-to-gettext.pl |
393 |
|
394 |
dohtml *.html |
395 |
dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS |
396 |
|
397 |
cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir." |
398 |
|
399 |
local f |
400 |
rm *vdr-1.4* 2>/dev/null |
401 |
for f in *; do |
402 |
[[ -f ${f} ]] || continue |
403 |
newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}" |
404 |
done |
405 |
|
406 |
cd "${S}" |
407 |
|
408 |
insinto /usr/share/vdr |
409 |
doins "${CAP_FILE}" |
410 |
|
411 |
if [[ -n "${VDRSOURCE_DIR}" ]]; then |
412 |
local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}" |
413 |
einfo "Installing sources" |
414 |
insinto "${SOURCES_DEST}" |
415 |
doins -r "${T}"/source-tree/* |
416 |
keepdir "${SOURCES_DEST}"/PLUGINS/lib |
417 |
fi |
418 |
|
419 |
if use setup; then |
420 |
insinto /usr/share/vdr/setup |
421 |
doins "${S}"/menu.c |
422 |
fi |
423 |
chown -R vdr:vdr "${D}/${CONF_DIR}" |
424 |
} |
425 |
|
426 |
pkg_preinst() { |
427 |
has_version "<${CATEGORY}/${PN}-1.3.36-r3" |
428 |
previous_less_than_1_3_36_r3=$? |
429 |
} |
430 |
|
431 |
pkg_postinst() { |
432 |
elog "It is a good idea to run vdrplugin-rebuild now." |
433 |
if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then |
434 |
ewarn "Upgrade Info:" |
435 |
ewarn |
436 |
ewarn "If you had used the use-flags lirc, rcu or vfat" |
437 |
ewarn "then, you now have to enable the associated functionality" |
438 |
ewarn "in /etc/conf.d/vdr" |
439 |
ewarn |
440 |
ewarn "vfat is now set with VFAT_FILENAMES." |
441 |
ewarn "lirc/rcu are now set with IR_CTRL." |
442 |
ebeep |
443 |
fi |
444 |
|
445 |
if use setup; then |
446 |
if ! has_version media-plugins/vdr-setup || \ |
447 |
! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then |
448 |
|
449 |
echo |
450 |
ewarn "You have compiled media-video/vdr with USE=\"setup\"" |
451 |
ewarn "It is very important to emerge media-plugins/vdr-setup now!" |
452 |
ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins" |
453 |
fi |
454 |
fi |
455 |
|
456 |
local keysfound=0 |
457 |
local key |
458 |
local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow" |
459 |
local remote_file="${ROOT}"/etc/vdr/remote.conf |
460 |
|
461 |
if [[ -e ${remote_file} ]]; then |
462 |
for key in ${warn_keys}; do |
463 |
if grep -q -i "\.${key} " "${remote_file}"; then |
464 |
keysfound=1 |
465 |
break |
466 |
fi |
467 |
done |
468 |
if [[ ${keysfound} == 1 ]]; then |
469 |
ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable" |
470 |
ewarn "Please remove these keys or vdr will not start:" |
471 |
ewarn "# ${warn_keys}" |
472 |
fi |
473 |
fi |
474 |
|
475 |
if use atsc; then |
476 |
ewarn "ATSC is only supported by a rudimentary patch" |
477 |
einfo "and need at least this patch and a plugin installed" |
478 |
einfo "emerge media-plugins/vdr-atscepg" |
479 |
fi |
480 |
|
481 |
elog "To get nice symbols in OSD we recommend to install" |
482 |
elog "\t1. emerge media-fonts/vdrsymbols-ttf" |
483 |
elog "\t2. select font VDRSymbolsSans in Setup" |
484 |
elog "" |
485 |
elog "To get an idea how to proceed now, have a look at our vdr-guide:" |
486 |
elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml" |
487 |
} |