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