1 |
commit: 91cf3ddad86852356bf48f7bd215d75807a1824d |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 5 19:23:26 2016 +0000 |
4 |
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 5 19:23:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91cf3dda |
7 |
|
8 |
compilefix wrt bug 575494 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
media-video/noad/noad-0.7.3.ebuild | 88 ---------------------- |
13 |
.../{noad-0.8.6.ebuild => noad-0.8.6-r2.ebuild} | 15 +++- |
14 |
2 files changed, 11 insertions(+), 92 deletions(-) |
15 |
|
16 |
diff --git a/media-video/noad/noad-0.7.3.ebuild b/media-video/noad/noad-0.7.3.ebuild |
17 |
deleted file mode 100644 |
18 |
index acce5bb..0000000 |
19 |
--- a/media-video/noad/noad-0.7.3.ebuild |
20 |
+++ /dev/null |
21 |
@@ -1,88 +0,0 @@ |
22 |
-# Copyright 1999-2012 Gentoo Foundation |
23 |
-# Distributed under the terms of the GNU General Public License v2 |
24 |
-# $Id$ |
25 |
- |
26 |
-EAPI="4" |
27 |
- |
28 |
-inherit eutils flag-o-matic autotools |
29 |
- |
30 |
-DESCRIPTION="Mark commercial Breaks in VDR records" |
31 |
-HOMEPAGE="http://noad.heliohost.org/" |
32 |
-SRC_URI="http://noad.heliohost.org/${P}.tar.bz2" |
33 |
- |
34 |
-LICENSE="GPL-2" |
35 |
-SLOT="0" |
36 |
-KEYWORDS="amd64 x86" |
37 |
-IUSE="ffmpeg imagemagick" |
38 |
- |
39 |
-DEPEND="media-libs/libmpeg2 |
40 |
- ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) |
41 |
- imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) |
42 |
- !media-plugins/vdr-markad" |
43 |
-RDEPEND="${DEPEND}" |
44 |
- |
45 |
-src_prepare() { |
46 |
- |
47 |
- epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff |
48 |
- |
49 |
- # UINT64_C is needed by ffmpeg headers |
50 |
- append-flags -D__STDC_CONSTANT_MACROS |
51 |
- |
52 |
- if has_version ">=media-video/vdr-1.7.15"; then |
53 |
- sed -e "s:2001:6419:" -i svdrpc.cpp |
54 |
- fi |
55 |
- |
56 |
- epatch "${FILESDIR}/patches-0.7.x/${P}_gcc-4.7.diff" |
57 |
- |
58 |
- eautoreconf |
59 |
-} |
60 |
- |
61 |
-src_configure() { |
62 |
- |
63 |
- local=myconf |
64 |
- use ffmpeg && myconf="--with-ffmpeg --with-ffmpeginclude=/usr/include" |
65 |
- |
66 |
- econf \ |
67 |
- ${myconf} \ |
68 |
- $(use_with imagemagick magick) \ |
69 |
- --with-mpeginclude=/usr/include/mpeg2dec |
70 |
-# --with-tools # fails on showindex, marcpics compile |
71 |
-} |
72 |
- |
73 |
-src_install() { |
74 |
- |
75 |
- dobin noad |
76 |
-# fix me later! |
77 |
-# dobin noad showindex |
78 |
-# use imagemagick && dobin markpics |
79 |
- |
80 |
- dodoc README INSTALL |
81 |
- # example scripts are installed as dokumentation |
82 |
- dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html |
83 |
- |
84 |
- newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad |
85 |
- |
86 |
- insinto /usr/share/vdr/record |
87 |
- doins "${FILESDIR}"/record-50-noad.sh |
88 |
- |
89 |
- insinto /usr/share/vdr/shutdown |
90 |
- doins "${FILESDIR}"/pre-shutdown-15-noad.sh |
91 |
- |
92 |
- insinto /etc/vdr/reccmds |
93 |
- doins "${FILESDIR}"/reccmds.noad.conf |
94 |
- |
95 |
- exeinto /usr/share/vdr/bin |
96 |
- doexe "${FILESDIR}"/noad-reccmd |
97 |
-} |
98 |
- |
99 |
-pkg_postinst() { |
100 |
- |
101 |
- elog |
102 |
- elog "Congratulations, you have just installed noad!," |
103 |
- elog "To integrate noad in VDR you should do this:" |
104 |
- elog |
105 |
- elog "start and set Parameter in /etc/conf.d/vdraddon.noad" |
106 |
- elog |
107 |
- elog "Note: You can use here all pararmeters for noad," |
108 |
- elog "please look in the documentation of noad." |
109 |
-} |
110 |
|
111 |
diff --git a/media-video/noad/noad-0.8.6.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild |
112 |
similarity index 82% |
113 |
rename from media-video/noad/noad-0.8.6.ebuild |
114 |
rename to media-video/noad/noad-0.8.6-r2.ebuild |
115 |
index 297a1a3..bb10d50 100644 |
116 |
--- a/media-video/noad/noad-0.8.6.ebuild |
117 |
+++ b/media-video/noad/noad-0.8.6-r2.ebuild |
118 |
@@ -1,4 +1,4 @@ |
119 |
-# Copyright 1999-2014 Gentoo Foundation |
120 |
+# Copyright 1999-2015 Gentoo Foundation |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
# $Id$ |
123 |
|
124 |
@@ -25,9 +25,16 @@ DEPEND="${RDEPEND} |
125 |
REQUIRED_USE="|| ( ffmpeg libmpeg2 )" |
126 |
|
127 |
src_prepare() { |
128 |
- if has_version '>=media-video/vdr-1.7.15'; then |
129 |
- sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp || die |
130 |
- fi |
131 |
+ sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp |
132 |
+ |
133 |
+ # wrt bug 575494 |
134 |
+ sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp |
135 |
+ sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp |
136 |
+ |
137 |
+ # tested libav-9, ffmepg-2.2.9 |
138 |
+ epatch "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ |
139 |
+ "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" |
140 |
+ |
141 |
eautoreconf |
142 |
} |