Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-markad/, media-plugins/vdr-markad/files/
Date: Thu, 02 May 2019 18:53:19
Message-Id: 1556823180.5b2a7d1a528bad0b4dda3b8c3bdfeaaf9aeb6f17.zlogene@gentoo
1 commit: 5b2a7d1a528bad0b4dda3b8c3bdfeaaf9aeb6f17
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 2 18:53:00 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu May 2 18:53:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2a7d1a
7
8 media-plugins/vdr-markad: remove last rited package
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 media-plugins/vdr-markad/Manifest | 1 -
13 .../vdr-markad/files/vdr-markad-0.1.4-libav9.patch | 40 -------------
14 .../files/vdr-markad-0.1.4_ffmpeg-2.patch | 13 -----
15 media-plugins/vdr-markad/metadata.xml | 8 ---
16 .../vdr-markad/vdr-markad-0.1.4-r1.ebuild | 66 ----------------------
17 .../vdr-markad/vdr-markad-0.1.4-r2.ebuild | 66 ----------------------
18 media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild | 61 --------------------
19 7 files changed, 255 deletions(-)
20
21 diff --git a/media-plugins/vdr-markad/Manifest b/media-plugins/vdr-markad/Manifest
22 deleted file mode 100644
23 index 6bd9a688d1b..00000000000
24 --- a/media-plugins/vdr-markad/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST vdr-markad-0.1.4.tgz 118728 BLAKE2B f261bf7ecda87fe526acf229e66a710becdd86326cc6b5082fa7db2e7ab1fe35f850be2b3fa67947389d6cc77d2c7beccf26d5879124c74d8d0ba4a2e15f0bad SHA512 10121e72803f489cdcabb46c989ecf4ae2ced1893bbdaccefbeef412ca34b124952ddf4639b3f78da3413e7b784ead4a60034a70cbab43a7c27e0e41f9653ae1
28
29 diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
30 deleted file mode 100644
31 index f11fc613700..00000000000
32 --- a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
33 +++ /dev/null
34 @@ -1,40 +0,0 @@
35 -diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp
36 ---- markad-0.1.4.old/command/decoder.cpp 2013-06-17 21:52:44.333367552 +0200
37 -+++ markad-0.1.4/command/decoder.cpp 2013-06-17 21:53:03.708366863 +0200
38 -@@ -11,6 +11,7 @@
39 - #include <sys/types.h>
40 - #include <string.h>
41 - #include <cstdlib>
42 -+#include <cstdio>
43 -
44 - #include "decoder.h"
45 -
46 -@@ -172,7 +173,7 @@
47 -
48 - if (video_codec)
49 - {
50 -- video_context = avcodec_alloc_context();
51 -+ video_context = avcodec_alloc_context3(NULL);
52 - if (video_context)
53 - {
54 - if (video_codec->capabilities & CODEC_CAP_TRUNCATED)
55 -@@ -321,7 +322,7 @@
56 - {
57 - avcodec_flush_buffers(video_context);
58 - AVCodecContext *dest;
59 -- dest=avcodec_alloc_context();
60 -+ dest=avcodec_alloc_context3(NULL);
61 - if (dest)
62 - {
63 - if (avcodec_copy_context(dest,video_context)!=0) ret=false;
64 -diff -urN markad-0.1.4.old/command/decoder.h markad-0.1.4/command/decoder.h
65 ---- markad-0.1.4.old/command/decoder.h 2013-06-17 21:52:44.333367552 +0200
66 -+++ markad-0.1.4/command/decoder.h 2013-06-17 21:53:03.708366863 +0200
67 -@@ -18,6 +18,7 @@
68 - #include <avcodec.h>
69 - #else
70 - #include <libavcodec/avcodec.h>
71 -+#include <libavutil/mem.h>
72 - #endif
73 -
74 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
75
76 diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch
77 deleted file mode 100644
78 index c94d54ea7ae..00000000000
79 --- a/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch
80 +++ /dev/null
81 @@ -1,13 +0,0 @@
82 -diff -Naur markad-0.1.4.orig/command/decoder.cpp markad-0.1.4/command/decoder.cpp
83 ---- markad-0.1.4.orig/command/decoder.cpp 2014-01-29 20:16:23.000000000 +0100
84 -+++ markad-0.1.4/command/decoder.cpp 2014-01-29 20:17:49.000000000 +0100
85 -@@ -152,7 +152,8 @@
86 - }
87 -
88 - video_codec=NULL;
89 -- CodecID video_codecid;
90 -+// CodecID video_codecid;
91 -+ AVCodecID video_codecid;
92 -
93 - if (useH264)
94 - {
95
96 diff --git a/media-plugins/vdr-markad/metadata.xml b/media-plugins/vdr-markad/metadata.xml
97 deleted file mode 100644
98 index 27f419c289c..00000000000
99 --- a/media-plugins/vdr-markad/metadata.xml
100 +++ /dev/null
101 @@ -1,8 +0,0 @@
102 -<?xml version="1.0" encoding="UTF-8"?>
103 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
104 -<pkgmetadata>
105 -<maintainer type="project">
106 -<email>vdr@g.o</email>
107 -<name>Gentoo VDR Project</name>
108 -</maintainer>
109 -</pkgmetadata>
110
111 diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
112 deleted file mode 100644
113 index 263e2ce1abb..00000000000
114 --- a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
115 +++ /dev/null
116 @@ -1,66 +0,0 @@
117 -# Copyright 1999-2018 Gentoo Foundation
118 -# Distributed under the terms of the GNU General Public License v2
119 -
120 -EAPI=5
121 -
122 -inherit vdr-plugin-2
123 -
124 -VERSION="1041" # every bump, new version
125 -
126 -DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
127 -HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/"
128 -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
129 -
130 -KEYWORDS="amd64 x86"
131 -SLOT="0"
132 -LICENSE="GPL-2"
133 -IUSE=""
134 -
135 -DEPEND=">=media-video/vdr-1.6
136 - virtual/ffmpeg[mp3,x264]
137 - !media-video/noad"
138 -RDEPEND="${DEPEND}"
139 -
140 -S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
141 -S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
142 -
143 -# vdr-plugin-2.eclass changes
144 -PO_SUBDIR="../command"
145 -
146 -src_prepare() {
147 - vdr-plugin-2_src_prepare
148 -
149 - cd "${S2}"
150 - epatch "${FILESDIR}/${PN}-0.1.4-libav9.patch"
151 - sed -i Makefile \
152 - -e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):" \
153 - -e "s:\@\$(STRIP) \$(DESTDIR)/usr/bin/markad::"
154 -
155 - if has_version ">=media-video/vdr-1.7.15"; then
156 - sed -e "s:2001:6419:" -i markad-standalone.cpp
157 - fi
158 -
159 - epatch "${FILESDIR}/${P}_ffmpeg-2.patch"
160 -
161 - # compile fix, tested libav11, ffmpeg-2.5.2
162 - sed -e "s:CODEC_ID_:AV_CODEC_ID_:"\
163 - -e "s:avcodec_alloc_frame:av_frame_alloc:"\
164 - -i "${S2}"/decoder.cpp
165 -}
166 -
167 -src_compile() {
168 - vdr-plugin-2_src_compile
169 -
170 - cd "${S2}"
171 - emake markad || die "Compiling command-line markad binary failed"
172 -}
173 -
174 -src_install() {
175 - vdr-plugin-2_src_install
176 -
177 - cd "${S2}"
178 - emake install DESTDIR="${D}" || die "emake install failed"
179 -
180 - cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
181 - dodoc README HISTORY
182 -}
183
184 diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
185 deleted file mode 100644
186 index 3d18884c2cc..00000000000
187 --- a/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
188 +++ /dev/null
189 @@ -1,66 +0,0 @@
190 -# Copyright 1999-2018 Gentoo Foundation
191 -# Distributed under the terms of the GNU General Public License v2
192 -
193 -EAPI=5
194 -
195 -inherit vdr-plugin-2
196 -
197 -VERSION="1041" # every bump, new version
198 -
199 -DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
200 -HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/"
201 -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
202 -
203 -KEYWORDS="~amd64 ~arm ~x86"
204 -SLOT="0"
205 -LICENSE="GPL-2"
206 -IUSE=""
207 -
208 -DEPEND=">=media-video/vdr-1.6
209 - virtual/ffmpeg[mp3]
210 - !media-video/noad"
211 -RDEPEND="${DEPEND}"
212 -
213 -S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
214 -S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
215 -
216 -# vdr-plugin-2.eclass changes
217 -PO_SUBDIR="../command"
218 -
219 -src_prepare() {
220 - vdr-plugin-2_src_prepare
221 -
222 - cd "${S2}"
223 - epatch "${FILESDIR}/${PN}-0.1.4-libav9.patch"
224 - sed -i Makefile \
225 - -e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):" \
226 - -e "s:\@\$(STRIP) \$(DESTDIR)/usr/bin/markad::"
227 -
228 - if has_version ">=media-video/vdr-1.7.15"; then
229 - sed -e "s:2001:6419:" -i markad-standalone.cpp
230 - fi
231 -
232 - epatch "${FILESDIR}/${P}_ffmpeg-2.patch"
233 -
234 - # compile fix, tested libav11, ffmpeg-2.5.2
235 - sed -e "s:CODEC_ID_:AV_CODEC_ID_:"\
236 - -e "s:avcodec_alloc_frame:av_frame_alloc:"\
237 - -i "${S2}"/decoder.cpp
238 -}
239 -
240 -src_compile() {
241 - vdr-plugin-2_src_compile
242 -
243 - cd "${S2}"
244 - emake markad || die "Compiling command-line markad binary failed"
245 -}
246 -
247 -src_install() {
248 - vdr-plugin-2_src_install
249 -
250 - cd "${S2}"
251 - emake install DESTDIR="${D}" || die "emake install failed"
252 -
253 - cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
254 - dodoc README HISTORY
255 -}
256
257 diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
258 deleted file mode 100644
259 index 2b5962e457c..00000000000
260 --- a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
261 +++ /dev/null
262 @@ -1,61 +0,0 @@
263 -# Copyright 1999-2018 Gentoo Foundation
264 -# Distributed under the terms of the GNU General Public License v2
265 -
266 -EAPI=5
267 -
268 -inherit vdr-plugin-2
269 -
270 -VERSION="1041" # every bump, new version
271 -
272 -DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
273 -HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/"
274 -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
275 -
276 -KEYWORDS="amd64 x86"
277 -SLOT="0"
278 -LICENSE="GPL-2"
279 -IUSE=""
280 -
281 -DEPEND=">=media-video/vdr-1.6
282 - virtual/ffmpeg[mp3,x264]
283 - !media-video/noad"
284 -RDEPEND="${DEPEND}"
285 -
286 -S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
287 -S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
288 -
289 -# vdr-plugin-2.eclass changes
290 -PO_SUBDIR="../command"
291 -
292 -src_prepare() {
293 - vdr-plugin-2_src_prepare
294 -
295 - cd "${S2}"
296 - epatch "${FILESDIR}/${PN}-0.1.4-libav9.patch"
297 - sed -i Makefile \
298 - -e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):" \
299 - -e "s:\@\$(STRIP) \$(DESTDIR)/usr/bin/markad::"
300 -
301 - if has_version ">=media-video/vdr-1.7.15"; then
302 - sed -e "s:2001:6419:" -i markad-standalone.cpp
303 - fi
304 -
305 - epatch "${FILESDIR}/${P}_ffmpeg-2.patch"
306 -}
307 -
308 -src_compile() {
309 - vdr-plugin-2_src_compile
310 -
311 - cd "${S2}"
312 - emake markad || die "Compiling command-line markad binary failed"
313 -}
314 -
315 -src_install() {
316 - vdr-plugin-2_src_install
317 -
318 - cd "${S2}"
319 - emake install DESTDIR="${D}" || die "emake install failed"
320 -
321 - cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
322 - dodoc README HISTORY
323 -}