| 1 |
commit: 214cc2a405326c1ac1e04d5512bdb7e66cf316eb |
| 2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 23 20:13:41 2020 +0000 |
| 4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 23 20:33:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214cc2a4 |
| 7 |
|
| 8 |
media-video/noad: cleanup old |
| 9 |
|
| 10 |
this will also fix |
| 11 |
media-video/noad : does not respect AR |
| 12 |
in older ebuild versions |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/469810 |
| 15 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 16 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
| 17 |
|
| 18 |
media-video/noad/Manifest | 1 - |
| 19 |
.../patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff | 13 --- |
| 20 |
.../files/patches-0.7.x/noad-0.7.3-hangcheck.diff | 21 ---- |
| 21 |
.../files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff | 17 ---- |
| 22 |
.../patches-0.7.x/noad-0.7.3_missing_include.diff | 14 --- |
| 23 |
.../files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch | 16 ---- |
| 24 |
.../files/patches-0.8.x/noad-0.8.6-libav9.diff | 106 --------------------- |
| 25 |
media-video/noad/noad-0.7.3-r1.ebuild | 88 ----------------- |
| 26 |
media-video/noad/noad-0.8.6-r1.ebuild | 79 --------------- |
| 27 |
media-video/noad/noad-0.8.6-r2.ebuild | 83 ---------------- |
| 28 |
10 files changed, 438 deletions(-) |
| 29 |
|
| 30 |
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest |
| 31 |
index 947101c403a..8722aadf4f8 100644 |
| 32 |
--- a/media-video/noad/Manifest |
| 33 |
+++ b/media-video/noad/Manifest |
| 34 |
@@ -1,3 +1,2 @@ |
| 35 |
-DIST noad-0.7.3.tar.bz2 174036 BLAKE2B 11fbe9e794981b1666b04ff9d8909972a00db2daff90819d651324704836949af85278e807e7e6902b0198fd4dcd167c8722adcf816d95e15fe808efb93420a1 SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66 |
| 36 |
DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02 |
| 37 |
DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9 |
| 38 |
|
| 39 |
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff |
| 40 |
deleted file mode 100644 |
| 41 |
index e757aeb884b..00000000000 |
| 42 |
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,13 +0,0 @@ |
| 45 |
-Index: noad-0.7.3/configure.ac |
| 46 |
-=================================================================== |
| 47 |
---- noad-0.7.3.orig/configure.ac |
| 48 |
-+++ noad-0.7.3/configure.ac |
| 49 |
-@@ -158,7 +158,7 @@ dnl check that libavcodec is usable |
| 50 |
- dnl --------------------------------------------------------------------------- |
| 51 |
- if test "$withffmpeg" == "1"; then |
| 52 |
- AC_SUBST(LIBAVCODEC,"-lavcodec") |
| 53 |
-- AC_CHECK_LIB([avcodec],[avcodec_init],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ]) |
| 54 |
-+ AC_CHECK_LIB([avcodec],[avcodec_register_all],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ]) |
| 55 |
- fi |
| 56 |
- |
| 57 |
- |
| 58 |
|
| 59 |
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff |
| 60 |
deleted file mode 100644 |
| 61 |
index 37788a197fd..00000000000 |
| 62 |
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff |
| 63 |
+++ /dev/null |
| 64 |
@@ -1,21 +0,0 @@ |
| 65 |
-diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp |
| 66 |
---- noad-0.6.0-orig/main.cpp 2007-05-12 17:28:01.000000000 +0200 |
| 67 |
-+++ noad-0.6.0/main.cpp 2007-05-12 18:20:30.000000000 +0200 |
| 68 |
-@@ -566,10 +566,17 @@ |
| 69 |
- signal(SIGABRT, signal_handler); |
| 70 |
- signal(SIGSEGV, signal_handler); |
| 71 |
- signal(SIGUSR1, signal_handler); |
| 72 |
-+ signal(SIGALRM, signal_handler); |
| 73 |
- |
| 74 |
- // do cleanup at exit... |
| 75 |
- atexit(cleanUp); |
| 76 |
- |
| 77 |
-+ |
| 78 |
-+ if (!bOnline) { |
| 79 |
-+ // now start alarm timer to kill hanging noad (hardcoded 30min timeout) |
| 80 |
-+ alarm(30*60); |
| 81 |
-+ } |
| 82 |
-+ |
| 83 |
- // now do the work.., |
| 84 |
- doNoad(bBefore, recDir); |
| 85 |
- |
| 86 |
|
| 87 |
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff |
| 88 |
deleted file mode 100644 |
| 89 |
index ca37f8e22a8..00000000000 |
| 90 |
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,17 +0,0 @@ |
| 93 |
-https://bugs.gentoo.org/show_bug.cgi?id=423623 |
| 94 |
-compilefix gcc-4.7.x |
| 95 |
- |
| 96 |
-signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (2012/06/27) |
| 97 |
- |
| 98 |
-diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h |
| 99 |
---- noad-0.7.3.orig/vdr_cl.h 2012-06-27 20:27:57.000000000 +0200 |
| 100 |
-+++ noad-0.7.3/vdr_cl.h 2012-06-27 20:30:56.000000000 +0200 |
| 101 |
-@@ -287,7 +287,7 @@ |
| 102 |
- { |
| 103 |
- T *l = new T; |
| 104 |
- if (l->Parse(s)) |
| 105 |
-- Add(l); |
| 106 |
-+ this->Add(l); |
| 107 |
- else |
| 108 |
- { |
| 109 |
- esyslog("ERROR: error in %s, line %d", fileName, line); |
| 110 |
|
| 111 |
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff |
| 112 |
deleted file mode 100644 |
| 113 |
index c3c335c2663..00000000000 |
| 114 |
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,14 +0,0 @@ |
| 117 |
-Add missing includes for ressource limits. |
| 118 |
- |
| 119 |
-Signed-off-by: Markus Rathgeb <maggu2810@×××××.com> |
| 120 |
- |
| 121 |
---- main.cpp |
| 122 |
-+++ main.cpp |
| 123 |
-@@ -22,6 +22,7 @@ |
| 124 |
- |
| 125 |
- #include <stdlib.h> |
| 126 |
- #include <time.h> |
| 127 |
-+#include <sys/resource.h> |
| 128 |
- #include <sys/wait.h> |
| 129 |
- #include <signal.h> |
| 130 |
- #include <execinfo.h> |
| 131 |
|
| 132 |
diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch b/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch |
| 133 |
deleted file mode 100644 |
| 134 |
index 455252a74c8..00000000000 |
| 135 |
--- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,16 +0,0 @@ |
| 138 |
-Index: noad-0.8.6/ffmpeg_decoder.cpp |
| 139 |
-=================================================================== |
| 140 |
---- noad-0.8.6.orig/ffmpeg_decoder.cpp |
| 141 |
-+++ noad-0.8.6/ffmpeg_decoder.cpp |
| 142 |
-@@ -253,7 +253,11 @@ int FFMPegDecoder::decoder_exit() |
| 143 |
- // close the file |
| 144 |
- if( pFormatCtx ) |
| 145 |
- { |
| 146 |
-+#if LIBAVFORMAT_VERSION_MAJOR < 54 |
| 147 |
- av_close_input_file(pFormatCtx); |
| 148 |
-+#else |
| 149 |
-+ avformat_close_input(&pFormatCtx); |
| 150 |
-+#endif |
| 151 |
- pFormatCtx = NULL; |
| 152 |
- } |
| 153 |
- // Close the codec |
| 154 |
|
| 155 |
diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff b/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff |
| 156 |
deleted file mode 100644 |
| 157 |
index a9b6c89d9f8..00000000000 |
| 158 |
--- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff |
| 159 |
+++ /dev/null |
| 160 |
@@ -1,106 +0,0 @@ |
| 161 |
-compile fix noad-0.8.6 |
| 162 |
-testet with libav-9 ffmpeg-2.2.9 |
| 163 |
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.o> (22 Oct 2014) |
| 164 |
-diff -Naur noad-0.8.6.orig/audiotools.cpp noad-0.8.6/audiotools.cpp |
| 165 |
---- noad-0.8.6.orig/audiotools.cpp 2014-10-22 14:26:57.809249955 +0200 |
| 166 |
-+++ noad-0.8.6/audiotools.cpp 2014-10-22 14:28:06.830249955 +0200 |
| 167 |
-@@ -50,9 +50,9 @@ |
| 168 |
- uint8_t *outbuf=NULL; |
| 169 |
- AVCodec *codec=NULL; |
| 170 |
- AVCodecContext *codecContext= NULL; |
| 171 |
--#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 172 |
-+//#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 173 |
- AVDictionary *avDictionary = NULL; // "create" an empty dictionary |
| 174 |
--#endif |
| 175 |
-+//#endif |
| 176 |
- int64_t basepts=0; |
| 177 |
- int64_t audiobasepts=0; |
| 178 |
- //int64_t audiopts=0; |
| 179 |
-@@ -108,13 +108,13 @@ |
| 180 |
- codecContext = avcodec_alloc_context3(codec); |
| 181 |
- #endif |
| 182 |
- |
| 183 |
--#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 184 |
-+//#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 185 |
- /* open it */ |
| 186 |
- if (avcodec_open2(codecContext, codec, &avDictionary) < 0) |
| 187 |
--#else |
| 188 |
-+//#else |
| 189 |
- /* open it */ |
| 190 |
-- if (avcodec_open(codecContext, codec) < 0) |
| 191 |
--#endif |
| 192 |
-+// if (avcodec_open(codecContext, codec) < 0) |
| 193 |
-+//#endif |
| 194 |
- { |
| 195 |
- fprintf(stderr, "could not open codec\n"); |
| 196 |
- } |
| 197 |
-@@ -129,9 +129,9 @@ |
| 198 |
- { |
| 199 |
- free(outbuf); |
| 200 |
- avcodec_close(codecContext); |
| 201 |
--#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 202 |
-+//#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 203 |
- av_dict_free(&avDictionary); |
| 204 |
--#endif |
| 205 |
-+//#endif |
| 206 |
- av_free(codecContext); |
| 207 |
- av_codec_initialised = false; |
| 208 |
- } |
| 209 |
-diff -Naur noad-0.8.6.orig/ffmpeg_decoder.cpp noad-0.8.6/ffmpeg_decoder.cpp |
| 210 |
---- noad-0.8.6.orig/ffmpeg_decoder.cpp 2014-10-22 14:26:57.808249955 +0200 |
| 211 |
-+++ noad-0.8.6/ffmpeg_decoder.cpp 2014-10-22 14:38:26.366249955 +0200 |
| 212 |
-@@ -184,7 +184,7 @@ |
| 213 |
- |
| 214 |
- // Retrieve stream information |
| 215 |
- resetDecoder(); |
| 216 |
-- int openCode2 = av_find_stream_info(pFormatCtx); |
| 217 |
-+ int openCode2 = avformat_find_stream_info(pFormatCtx, NULL); |
| 218 |
- if(openCode2<0) |
| 219 |
- return -1; // Couldn't find stream information |
| 220 |
- |
| 221 |
-@@ -222,13 +222,13 @@ |
| 222 |
- if(pCodec->capabilities & CODEC_CAP_TRUNCATED) |
| 223 |
- pCodecCtx->flags|=CODEC_FLAG_TRUNCATED; |
| 224 |
- |
| 225 |
--#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 226 |
-+//#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 227 |
- // Open codec |
| 228 |
- if(avcodec_open2(pCodecCtx, pCodec,&avDictionary) < 0) |
| 229 |
--#else |
| 230 |
-+//#else |
| 231 |
- // Open codec |
| 232 |
-- if(avcodec_open(pCodecCtx, pCodec)<0) |
| 233 |
--#endif |
| 234 |
-+// if(avcodec_open(pCodecCtx, pCodec)<0) |
| 235 |
-+//#endif |
| 236 |
- return -1; // Could not open codec |
| 237 |
- |
| 238 |
- |
| 239 |
-@@ -270,10 +270,10 @@ |
| 240 |
- pIOContext = NULL; |
| 241 |
- } |
| 242 |
- #endif |
| 243 |
--#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 244 |
-+//#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 245 |
- av_dict_free(&avDictionary); |
| 246 |
- avDictionary = NULL; |
| 247 |
--#endif |
| 248 |
-+//#endif |
| 249 |
- return 0; |
| 250 |
- } |
| 251 |
- |
| 252 |
-diff -Naur noad-0.8.6.orig/ffmpeg_decoder.h noad-0.8.6/ffmpeg_decoder.h |
| 253 |
---- noad-0.8.6.orig/ffmpeg_decoder.h 2014-10-22 14:26:57.807249955 +0200 |
| 254 |
-+++ noad-0.8.6/ffmpeg_decoder.h 2014-10-22 14:36:27.213249955 +0200 |
| 255 |
-@@ -22,9 +22,9 @@ |
| 256 |
- int i, videoStream; |
| 257 |
- AVCodecContext *pCodecCtx; |
| 258 |
- AVCodec *pCodec; |
| 259 |
--#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 260 |
-+//#if LIBAVCODEC_VERSION_MAJOR > 54 |
| 261 |
- AVDictionary *avDictionary; |
| 262 |
--#endif |
| 263 |
-+//#endif |
| 264 |
- AVFrame *pFrame; |
| 265 |
- |
| 266 |
- public: |
| 267 |
|
| 268 |
diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild |
| 269 |
deleted file mode 100644 |
| 270 |
index 3835c9d4b83..00000000000 |
| 271 |
--- a/media-video/noad/noad-0.7.3-r1.ebuild |
| 272 |
+++ /dev/null |
| 273 |
@@ -1,88 +0,0 @@ |
| 274 |
-# Copyright 1999-2018 Gentoo Foundation |
| 275 |
-# Distributed under the terms of the GNU General Public License v2 |
| 276 |
- |
| 277 |
-EAPI=6 |
| 278 |
-inherit autotools eutils toolchain-funcs |
| 279 |
- |
| 280 |
-DESCRIPTION="Mark commercial Breaks in VDR records" |
| 281 |
-HOMEPAGE="http://noad.heliohost.org/" |
| 282 |
-SRC_URI="http://noad.heliohost.org/${P}.tar.bz2" |
| 283 |
- |
| 284 |
-LICENSE="GPL-2" |
| 285 |
-SLOT="0" |
| 286 |
-KEYWORDS="amd64 x86" |
| 287 |
-IUSE="ffmpeg" |
| 288 |
- |
| 289 |
-RDEPEND="media-gfx/imagemagick |
| 290 |
- media-libs/libmpeg2:= |
| 291 |
- ffmpeg? ( virtual/ffmpeg ) |
| 292 |
- !media-plugins/vdr-markad" |
| 293 |
-DEPEND="${RDEPEND} |
| 294 |
- virtual/pkgconfig" |
| 295 |
- |
| 296 |
-src_prepare() { |
| 297 |
- EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch |
| 298 |
- |
| 299 |
- if has_version '>=media-video/vdr-1.7.15'; then |
| 300 |
- sed -i -e 's:2001:6419:' -i svdrpc.cpp || die |
| 301 |
- fi |
| 302 |
- |
| 303 |
- sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746 |
| 304 |
- |
| 305 |
- sed -i \ |
| 306 |
- -e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \ |
| 307 |
- Makefile.am || die #467134 |
| 308 |
- |
| 309 |
- # FIXME: --with-tools, markpics will compile but showindex won't! |
| 310 |
- sed -i \ |
| 311 |
- -e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \ |
| 312 |
- -e '/^EXTRA_PROGRAMS/s:showindex::' \ |
| 313 |
- Makefile.am || die |
| 314 |
- |
| 315 |
- # ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51' |
| 316 |
- if use ffmpeg; then |
| 317 |
- sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die |
| 318 |
- fi |
| 319 |
- |
| 320 |
- eautoreconf |
| 321 |
-} |
| 322 |
- |
| 323 |
-src_configure() { |
| 324 |
- econf \ |
| 325 |
- --with-magick \ |
| 326 |
- --with-mpeginclude=/usr/include/mpeg2dec \ |
| 327 |
- --with-tools \ |
| 328 |
- $(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '') |
| 329 |
-} |
| 330 |
- |
| 331 |
-src_install() { |
| 332 |
- dobin noad markpics # showindex |
| 333 |
- |
| 334 |
- dodoc README INSTALL |
| 335 |
- # example scripts are installed as dokumentation |
| 336 |
- dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html |
| 337 |
- |
| 338 |
- newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad |
| 339 |
- |
| 340 |
- insinto /usr/share/vdr/record |
| 341 |
- doins "${FILESDIR}"/record-50-noad.sh |
| 342 |
- |
| 343 |
- insinto /usr/share/vdr/shutdown |
| 344 |
- doins "${FILESDIR}"/pre-shutdown-15-noad.sh |
| 345 |
- |
| 346 |
- insinto /etc/vdr/reccmds |
| 347 |
- doins "${FILESDIR}"/reccmds.noad.conf |
| 348 |
- |
| 349 |
- exeinto /usr/share/vdr/bin |
| 350 |
- doexe "${FILESDIR}"/noad-reccmd |
| 351 |
-} |
| 352 |
- |
| 353 |
-pkg_postinst() { |
| 354 |
- elog |
| 355 |
- elog "To integrate noad in VDR you should do this:" |
| 356 |
- elog |
| 357 |
- elog "start and set Parameter in /etc/conf.d/vdraddon.noad" |
| 358 |
- elog |
| 359 |
- elog "Note: You can use here all pararmeters for noad," |
| 360 |
- elog "please look in the documentation of noad." |
| 361 |
-} |
| 362 |
|
| 363 |
diff --git a/media-video/noad/noad-0.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r1.ebuild |
| 364 |
deleted file mode 100644 |
| 365 |
index 60d75aed517..00000000000 |
| 366 |
--- a/media-video/noad/noad-0.8.6-r1.ebuild |
| 367 |
+++ /dev/null |
| 368 |
@@ -1,79 +0,0 @@ |
| 369 |
-# Copyright 1999-2018 Gentoo Foundation |
| 370 |
-# Distributed under the terms of the GNU General Public License v2 |
| 371 |
- |
| 372 |
-EAPI=6 |
| 373 |
-inherit autotools eutils toolchain-funcs |
| 374 |
- |
| 375 |
-DESCRIPTION="Mark commercial breaks in VDR recordings" |
| 376 |
-HOMEPAGE="http://noad.net23.net/" |
| 377 |
-SRC_URI="http://noad.net23.net/${P}.tar.bz2" |
| 378 |
- |
| 379 |
-LICENSE="GPL-2" |
| 380 |
-SLOT="0" |
| 381 |
-KEYWORDS="amd64 x86" |
| 382 |
-IUSE="+ffmpeg imagemagick libmpeg2" |
| 383 |
- |
| 384 |
-RDEPEND=" |
| 385 |
- libmpeg2? ( media-libs/libmpeg2:= ) |
| 386 |
- ffmpeg? ( virtual/ffmpeg ) |
| 387 |
- imagemagick? ( media-gfx/imagemagick ) |
| 388 |
- !media-plugins/vdr-markad" |
| 389 |
-DEPEND="${RDEPEND} |
| 390 |
- virtual/pkgconfig" |
| 391 |
- |
| 392 |
-REQUIRED_USE="|| ( ffmpeg libmpeg2 )" |
| 393 |
- |
| 394 |
-src_prepare() { |
| 395 |
- sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp |
| 396 |
- |
| 397 |
- # tested libav-9, ffmepg-2.2.9 |
| 398 |
- eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ |
| 399 |
- "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" |
| 400 |
- |
| 401 |
- eautoreconf |
| 402 |
-} |
| 403 |
- |
| 404 |
-src_configure() { |
| 405 |
- econf \ |
| 406 |
- $(usex imagemagick '--with-magick') \ |
| 407 |
- $(usex ffmpeg '' '--without-ffmpeg') \ |
| 408 |
- $(usex libmpeg2 '' '--without-libmpeg2') \ |
| 409 |
- --with-tools |
| 410 |
-} |
| 411 |
- |
| 412 |
-src_compile() { |
| 413 |
- emake AR="$(tc-getAR)" # see bug #469810 |
| 414 |
-} |
| 415 |
- |
| 416 |
-src_install() { |
| 417 |
- dobin noad showindex checkMarks |
| 418 |
- use imagemagick && dobin markpics |
| 419 |
- |
| 420 |
- dodoc README INSTALL |
| 421 |
- # example scripts are installed as dokumentation |
| 422 |
- dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd |
| 423 |
- |
| 424 |
- newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad |
| 425 |
- |
| 426 |
- insinto /usr/share/vdr/record |
| 427 |
- doins "${FILESDIR}"/record-50-noad.sh |
| 428 |
- |
| 429 |
- insinto /usr/share/vdr/shutdown |
| 430 |
- doins "${FILESDIR}"/pre-shutdown-15-noad.sh |
| 431 |
- |
| 432 |
- insinto /etc/vdr/reccmds |
| 433 |
- doins "${FILESDIR}"/reccmds.noad.conf |
| 434 |
- |
| 435 |
- exeinto /usr/share/vdr/bin |
| 436 |
- doexe "${FILESDIR}"/noad-reccmd |
| 437 |
-} |
| 438 |
- |
| 439 |
-pkg_postinst() { |
| 440 |
- elog |
| 441 |
- elog "To integrate noad in VDR you should do this:" |
| 442 |
- elog |
| 443 |
- elog "start and set Parameter in /etc/conf.d/vdraddon.noad" |
| 444 |
- elog |
| 445 |
- elog "Note: You can use here all parameters for noad," |
| 446 |
- elog "please look in the documentation of noad." |
| 447 |
-} |
| 448 |
|
| 449 |
diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild |
| 450 |
deleted file mode 100644 |
| 451 |
index d9c62f84e4b..00000000000 |
| 452 |
--- a/media-video/noad/noad-0.8.6-r2.ebuild |
| 453 |
+++ /dev/null |
| 454 |
@@ -1,83 +0,0 @@ |
| 455 |
-# Copyright 1999-2018 Gentoo Foundation |
| 456 |
-# Distributed under the terms of the GNU General Public License v2 |
| 457 |
- |
| 458 |
-EAPI=6 |
| 459 |
-inherit autotools eutils toolchain-funcs |
| 460 |
- |
| 461 |
-DESCRIPTION="Mark commercial breaks in VDR recordings" |
| 462 |
-HOMEPAGE="http://noad.net23.net/" |
| 463 |
-SRC_URI="http://noad.net23.net/${P}.tar.bz2" |
| 464 |
- |
| 465 |
-LICENSE="GPL-2" |
| 466 |
-SLOT="0" |
| 467 |
-KEYWORDS="~amd64 ~x86" |
| 468 |
-IUSE="+ffmpeg imagemagick libmpeg2" |
| 469 |
- |
| 470 |
-RDEPEND=" |
| 471 |
- libmpeg2? ( media-libs/libmpeg2:= ) |
| 472 |
- ffmpeg? ( virtual/ffmpeg ) |
| 473 |
- imagemagick? ( media-gfx/imagemagick ) |
| 474 |
- !media-plugins/vdr-markad" |
| 475 |
-DEPEND="${RDEPEND} |
| 476 |
- virtual/pkgconfig" |
| 477 |
- |
| 478 |
-REQUIRED_USE="|| ( ffmpeg libmpeg2 )" |
| 479 |
- |
| 480 |
-src_prepare() { |
| 481 |
- sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp |
| 482 |
- |
| 483 |
- # wrt bug 575494 |
| 484 |
- sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp |
| 485 |
- sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp |
| 486 |
- |
| 487 |
- # tested libav-9, ffmepg-2.2.9 |
| 488 |
- eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ |
| 489 |
- "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" |
| 490 |
- |
| 491 |
- eautoreconf |
| 492 |
-} |
| 493 |
- |
| 494 |
-src_configure() { |
| 495 |
- econf \ |
| 496 |
- $(usex imagemagick '--with-magick') \ |
| 497 |
- $(usex ffmpeg '' '--without-ffmpeg') \ |
| 498 |
- $(usex libmpeg2 '' '--without-libmpeg2') \ |
| 499 |
- --with-tools |
| 500 |
-} |
| 501 |
- |
| 502 |
-src_compile() { |
| 503 |
- emake AR="$(tc-getAR)" # see bug #469810 |
| 504 |
-} |
| 505 |
- |
| 506 |
-src_install() { |
| 507 |
- dobin noad showindex checkMarks |
| 508 |
- use imagemagick && dobin markpics |
| 509 |
- |
| 510 |
- dodoc README INSTALL |
| 511 |
- # example scripts are installed as dokumentation |
| 512 |
- dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd |
| 513 |
- |
| 514 |
- newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad |
| 515 |
- |
| 516 |
- insinto /usr/share/vdr/record |
| 517 |
- doins "${FILESDIR}"/record-50-noad.sh |
| 518 |
- |
| 519 |
- insinto /usr/share/vdr/shutdown |
| 520 |
- doins "${FILESDIR}"/pre-shutdown-15-noad.sh |
| 521 |
- |
| 522 |
- insinto /etc/vdr/reccmds |
| 523 |
- doins "${FILESDIR}"/reccmds.noad.conf |
| 524 |
- |
| 525 |
- exeinto /usr/share/vdr/bin |
| 526 |
- doexe "${FILESDIR}"/noad-reccmd |
| 527 |
-} |
| 528 |
- |
| 529 |
-pkg_postinst() { |
| 530 |
- elog |
| 531 |
- elog "To integrate noad in VDR you should do this:" |
| 532 |
- elog |
| 533 |
- elog "start and set Parameter in /etc/conf.d/vdraddon.noad" |
| 534 |
- elog |
| 535 |
- elog "Note: You can use here all parameters for noad," |
| 536 |
- elog "please look in the documentation of noad." |
| 537 |
-} |
Archives