From d42200bec37eef2a7478d88988ff00addd0a9202 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Jan 2020 11:50:47 +0000 Subject: gentoo resync : 25.01.2020 --- media-video/noad/Manifest | 12 +-- .../patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff | 13 --- .../files/patches-0.7.x/noad-0.7.3-hangcheck.diff | 21 ---- .../files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff | 17 ---- .../patches-0.7.x/noad-0.7.3_missing_include.diff | 14 --- .../files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch | 16 ---- .../files/patches-0.8.x/noad-0.8.6-libav9.diff | 106 --------------------- media-video/noad/noad-0.7.3-r1.ebuild | 88 ----------------- media-video/noad/noad-0.8.6-r1.ebuild | 79 --------------- media-video/noad/noad-0.8.6-r2.ebuild | 83 ---------------- media-video/noad/noad-0.8.6-r4.ebuild | 79 +++++++++++++++ 11 files changed, 81 insertions(+), 447 deletions(-) delete mode 100644 media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff delete mode 100644 media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff delete mode 100644 media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff delete mode 100644 media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff delete mode 100644 media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch delete mode 100644 media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff delete mode 100644 media-video/noad/noad-0.7.3-r1.ebuild delete mode 100644 media-video/noad/noad-0.8.6-r1.ebuild delete mode 100644 media-video/noad/noad-0.8.6-r2.ebuild create mode 100644 media-video/noad/noad-0.8.6-r4.ebuild (limited to 'media-video/noad') diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest index 068e2ec15ed7..e2cfb2ac2c08 100644 --- a/media-video/noad/Manifest +++ b/media-video/noad/Manifest @@ -1,19 +1,11 @@ AUX confd_vdraddon.noad 1353 BLAKE2B 3387e476cc781ee66b93b9154d13f10761b5fd1e68509b0c593fcac8db87faf65eaf976ab322db37fec0c10143b92c598c105bc0b64ca7747bced8166dc392c7 SHA512 7d516aa290451ed79e010ba5f084ff120d1bb4e9cda68ff3a66a3b35786856dc9a6ebbf84df9f1d8d33f9ab3287018032377f675523b93edb89523fea456b29b AUX noad-reccmd 145 BLAKE2B f4cfd8f3a3b4651bc3afcdfd74e171b69d3fbfe6f95948db165003a3d4952c3a61dd3a0178340b69966aba59d5aec5d62e43a66cff73f277f0b722150ce68956 SHA512 83e53b1ff4af56ab188ea43ec34b843447101bd71f4eaa93b88892df8c5ff66160fbd441f13e19f7e73a5f6e193aacc003465ae174ad06ee3ae49a5c0977a60d -AUX patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff 603 BLAKE2B 2668a382b6b254a54acd84762572eb5fa7984a30905428c8c104bf4a3f4e6bb827f1fa331b339b3ed3c1959a698dff02db5c0a5166b00f618aa627475ac7c985 SHA512 32bbefe976fbe556d468365fb96dd10137178c58aab8f996d7312afddad9e99000e08ab2b93a411f6a1dac7542619eec49d9287ef2d613b2ad35fb62b327df45 -AUX patches-0.7.x/noad-0.7.3-hangcheck.diff 617 BLAKE2B bafe6534d00ecaea889f92036f0f577da87b2b84ddb669a4a1b795b3f41113f17542c75f4aecfdb8b883aecac118fb32cd8d016a2aa142ab2f1805beb53b3d23 SHA512 b426c4999f534b2940849f5f647c06d76c282d6f4f74e44c729de847b8ffd2699e242a29762a4407615ed44394495775df0aaf8220238c5baf9bf548111103ff -AUX patches-0.7.x/noad-0.7.3_gcc-4.7.diff 527 BLAKE2B 4fedfd7a14237a55b56577cc3fc699be206cb1aa0d2c7199e5bb3d1a5b8c85335ec9c8d21771b5551fc990a6562bf92401e41a91f30630ad247686653bc53e5c SHA512 ddcaea8a324cd634a294881cf272be211a42edb317e3342f28166b211584a5599b1f8ab9869dfa56983d50ff78e3e27a163ca7d752fd8efca009ba3a01e539d4 -AUX patches-0.7.x/noad-0.7.3_missing_include.diff 277 BLAKE2B 695b19165619efc537b42ceedd0af72fa952f4cfbabfad45ed712f1b2a6885773ee2d7fe9e83174ac0bfa8970ddc17775e190087e038ab169ca9fe6c27f9b2fc SHA512 6c0c03597f71d71efbcd80ec3d4c2df8f38ff8e46140232c95e4d0ed354da9932b80ab9587dfe9376fd29670b7154cef1a33974c739eaf5981048f21844208c3 -AUX patches-0.8.x/noad-0.8.6-ffmpeg25.patch 459 BLAKE2B 2de74d69f102143a4f9122ad4abddce6068218f58276185267f43c739e93c871d0fddedf003198da968e7972783a5c66e18c6dd1a4e5450f899739301d007848 SHA512 13bd88c67d9e5a0b452cfa46fd8b66108404f2b3efd1fa23563f7d8456318495a5c15916bd81422cffab948673a29cfb15da2e217c4f58d454c460caaad59a3b -AUX patches-0.8.x/noad-0.8.6-libav9.diff 3036 BLAKE2B 40de3a6ddeb8832ffcd50384d4c687e7f71bd101a4b9b1f1a2ccb962e3734affff0cec0b95c6648a98d284a4e8d1c53e96dc2be562b489c9a70198ecdd4a3c10 SHA512 f7ecc4e8d2c30a77588cbf5a0977575a0a2a9c44aaca1f061e34795302f56f77bcddb096e6a8ec2d3398829faabcb78a29825e1c0bc28f2350d7a4a7d1f8e64e AUX pre-shutdown-15-noad.sh 771 BLAKE2B ce0053c6fb813c28d0c653ba0ba68819f03532c82b3ac5ce018b72c9feb93d20c096b1fe83ed0694849b6629cbe0e455ffc749f0caf9977de8eea2a075c41d5f SHA512 d40625e0704bc228879bd5d19d7a62eed4e56d1a688699dde8f628aedf320e86b4bfca474b42edc3f6a93e7f8528ba15d654a818d9b19bd3ac196c1ca8324910 AUX reccmds.noad.conf 61 BLAKE2B 4600a5a2fc948b0695c487e87013b1207873b2f1f70e30604cb20288bbf7f107b2fbdb9a63d7f7eb2a8612569bb4975756109c804eb351635582f87e68eda8e5 SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9f8186a6567d01f656adb4b5385bb29bf8ce3a68a747a973f9bb00f64a65b21e1c7d43b7f60e2f54c55a SHA512 6ef839ad9c4d7b238e9e02dfdca486623902a5e9f3de722f18b9f50eff03888d58d03f8a17448903bbec2f04d1abcee22d6672798dd23eee024339a6474b98c9 -DIST noad-0.7.3.tar.bz2 174036 BLAKE2B 11fbe9e794981b1666b04ff9d8909972a00db2daff90819d651324704836949af85278e807e7e6902b0198fd4dcd167c8722adcf816d95e15fe808efb93420a1 SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66 DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02 DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9 -EBUILD noad-0.7.3-r1.ebuild 2209 BLAKE2B d4cd9e1024360b1f1d6740b501d304d051bbb0327fc3b7e4ca3721d31da18b08c5557f8d000506c8f46aabf6ef39f8c13cc63236e2f1c1a1672bbe48f0a5ba48 SHA512 bee6253e1cedad70e2ebbe256e0d3cce3ba45b0123320f813c3fee4cc0aaddf097958d2aeeacaa2b1e741222281cfff9736bc89249a5774d1103257b8452f442 -EBUILD noad-0.8.6-r1.ebuild 1890 BLAKE2B 005750b00b334559f25087b925e2c9fc7f4da035252879c9ea50fd6cfbfdbf437618b8a5b26337494e5c0b6fcbb19323d6c24372c2de9c1f74b3f9b866c590c9 SHA512 8d6ef2f5688ffca4e97fc34baca05a6f1d658f38390d129c7e396b984115f25c5ce6333e90d38bcbc4410699f536f8369e00a6f3c7a7e7a0213b163c41c88b6f -EBUILD noad-0.8.6-r2.ebuild 2038 BLAKE2B d8b952ef694693a0911e127f8421ffc85897147f1d816da9eb442a0be71e6ee29976e2afe1edd51737a38e2e5e1b9d3a1310d3a0a068d57fd933959070ac1329 SHA512 3f1dcce94f84a82cb62232fefe5fbbf0979c5d2a1f9f52fbb092b6759e05dd2f258e9b6b75da7f259b365ded17f59b3196ef10c8057ff5d4e164c892d3c72a50 +DIST noad-0.8.6.tar.gz 226169 BLAKE2B c8aa44a868a7592b66a94a58065df5b3dc19562bf6bfb946fe60acebd2ea9f9090750836368bc6aeecf2fbd9938b0ec3f653d7908d3b34f27c3362fcea48e445 SHA512 abec49ea7d4dc4233d42bd42ba267bc7b235aace1597c5cd3dcbb7b4ede00c3778eaa2a0d8697fca4caf2b0ca94b540b87a862523a3028eb5cfe84db3c460ede EBUILD noad-0.8.6-r3.ebuild 1857 BLAKE2B 8d9c8d53830b308bad041d8d4e8da7c60b2b53a774370381728b1750dcd0023a6ee0f63603206a6c104d502a3a25a8631703597fc1fbcf7a1e3014bb66a6abbc SHA512 319c2d1e328ebf769ed9d7f44d7f07d8223c1412b95c7d1bc49883f2f28dcc479832e14b8a46e6003e3a7fb85522880fe3ab670fe307fa936fbf562a7a58c9af +EBUILD noad-0.8.6-r4.ebuild 1873 BLAKE2B ea6c5a407a88532145e2c6e64cd08f1be3a15ddf50ffa283c64b0fb1cb0ad85393f37b0f229ed54ce56b568eb2700217db437aebbae9e00871a16c70fd0f8a19 SHA512 f8e78c678a7ee69236ac41c3a3756c959f18dd0778233ebe6f2d181ef4b518ab6cb52cd6bd935d616043a52e7a7c8ae4a650a39f3658f2cdd5fcbfb8497e6485 MISC metadata.xml 580 BLAKE2B ff89aebf4857547381931544cba6740e7775ac238d26a64fc982e516738155318fe6740e4655a5280814d9ec9ce1f90fbee56b3610bdc20a9d3a4578eb69dcc2 SHA512 ca567b06bad92795d337a7ef814d5b45e959403142d9589edf1361a48e66daaa64f28a7c0a67c188dd2a449aafb5e0f2ca597097ee104c0a3a88c85194db1902 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 deleted file mode 100644 index e757aeb884b0..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: noad-0.7.3/configure.ac -=================================================================== ---- noad-0.7.3.orig/configure.ac -+++ noad-0.7.3/configure.ac -@@ -158,7 +158,7 @@ dnl check that libavcodec is usable - dnl --------------------------------------------------------------------------- - if test "$withffmpeg" == "1"; then - AC_SUBST(LIBAVCODEC,"-lavcodec") -- AC_CHECK_LIB([avcodec],[avcodec_init],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ]) -+ AC_CHECK_LIB([avcodec],[avcodec_register_all],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ]) - fi - - 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 deleted file mode 100644 index 37788a197fd7..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp ---- noad-0.6.0-orig/main.cpp 2007-05-12 17:28:01.000000000 +0200 -+++ noad-0.6.0/main.cpp 2007-05-12 18:20:30.000000000 +0200 -@@ -566,10 +566,17 @@ - signal(SIGABRT, signal_handler); - signal(SIGSEGV, signal_handler); - signal(SIGUSR1, signal_handler); -+ signal(SIGALRM, signal_handler); - - // do cleanup at exit... - atexit(cleanUp); - -+ -+ if (!bOnline) { -+ // now start alarm timer to kill hanging noad (hardcoded 30min timeout) -+ alarm(30*60); -+ } -+ - // now do the work.., - doNoad(bBefore, recDir); - 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 deleted file mode 100644 index ca37f8e22a87..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=423623 -compilefix gcc-4.7.x - -signed-of-by: Joerg Bornkessel (2012/06/27) - -diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h ---- noad-0.7.3.orig/vdr_cl.h 2012-06-27 20:27:57.000000000 +0200 -+++ noad-0.7.3/vdr_cl.h 2012-06-27 20:30:56.000000000 +0200 -@@ -287,7 +287,7 @@ - { - T *l = new T; - if (l->Parse(s)) -- Add(l); -+ this->Add(l); - else - { - esyslog("ERROR: error in %s, line %d", fileName, line); 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 deleted file mode 100644 index c3c335c2663b..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff +++ /dev/null @@ -1,14 +0,0 @@ -Add missing includes for ressource limits. - -Signed-off-by: Markus Rathgeb - ---- main.cpp -+++ main.cpp -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include - #include - #include 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 deleted file mode 100644 index 455252a74c8a..000000000000 --- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: noad-0.8.6/ffmpeg_decoder.cpp -=================================================================== ---- noad-0.8.6.orig/ffmpeg_decoder.cpp -+++ noad-0.8.6/ffmpeg_decoder.cpp -@@ -253,7 +253,11 @@ int FFMPegDecoder::decoder_exit() - // close the file - if( pFormatCtx ) - { -+#if LIBAVFORMAT_VERSION_MAJOR < 54 - av_close_input_file(pFormatCtx); -+#else -+ avformat_close_input(&pFormatCtx); -+#endif - pFormatCtx = NULL; - } - // Close the codec 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 deleted file mode 100644 index a9b6c89d9f8c..000000000000 --- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff +++ /dev/null @@ -1,106 +0,0 @@ -compile fix noad-0.8.6 -testet with libav-9 ffmpeg-2.2.9 -Signed-of-by: Joerg Bornkessel (22 Oct 2014) -diff -Naur noad-0.8.6.orig/audiotools.cpp noad-0.8.6/audiotools.cpp ---- noad-0.8.6.orig/audiotools.cpp 2014-10-22 14:26:57.809249955 +0200 -+++ noad-0.8.6/audiotools.cpp 2014-10-22 14:28:06.830249955 +0200 -@@ -50,9 +50,9 @@ - uint8_t *outbuf=NULL; - AVCodec *codec=NULL; - AVCodecContext *codecContext= NULL; --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - AVDictionary *avDictionary = NULL; // "create" an empty dictionary --#endif -+//#endif - int64_t basepts=0; - int64_t audiobasepts=0; - //int64_t audiopts=0; -@@ -108,13 +108,13 @@ - codecContext = avcodec_alloc_context3(codec); - #endif - --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - /* open it */ - if (avcodec_open2(codecContext, codec, &avDictionary) < 0) --#else -+//#else - /* open it */ -- if (avcodec_open(codecContext, codec) < 0) --#endif -+// if (avcodec_open(codecContext, codec) < 0) -+//#endif - { - fprintf(stderr, "could not open codec\n"); - } -@@ -129,9 +129,9 @@ - { - free(outbuf); - avcodec_close(codecContext); --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - av_dict_free(&avDictionary); --#endif -+//#endif - av_free(codecContext); - av_codec_initialised = false; - } -diff -Naur noad-0.8.6.orig/ffmpeg_decoder.cpp noad-0.8.6/ffmpeg_decoder.cpp ---- noad-0.8.6.orig/ffmpeg_decoder.cpp 2014-10-22 14:26:57.808249955 +0200 -+++ noad-0.8.6/ffmpeg_decoder.cpp 2014-10-22 14:38:26.366249955 +0200 -@@ -184,7 +184,7 @@ - - // Retrieve stream information - resetDecoder(); -- int openCode2 = av_find_stream_info(pFormatCtx); -+ int openCode2 = avformat_find_stream_info(pFormatCtx, NULL); - if(openCode2<0) - return -1; // Couldn't find stream information - -@@ -222,13 +222,13 @@ - if(pCodec->capabilities & CODEC_CAP_TRUNCATED) - pCodecCtx->flags|=CODEC_FLAG_TRUNCATED; - --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - // Open codec - if(avcodec_open2(pCodecCtx, pCodec,&avDictionary) < 0) --#else -+//#else - // Open codec -- if(avcodec_open(pCodecCtx, pCodec)<0) --#endif -+// if(avcodec_open(pCodecCtx, pCodec)<0) -+//#endif - return -1; // Could not open codec - - -@@ -270,10 +270,10 @@ - pIOContext = NULL; - } - #endif --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - av_dict_free(&avDictionary); - avDictionary = NULL; --#endif -+//#endif - return 0; - } - -diff -Naur noad-0.8.6.orig/ffmpeg_decoder.h noad-0.8.6/ffmpeg_decoder.h ---- noad-0.8.6.orig/ffmpeg_decoder.h 2014-10-22 14:26:57.807249955 +0200 -+++ noad-0.8.6/ffmpeg_decoder.h 2014-10-22 14:36:27.213249955 +0200 -@@ -22,9 +22,9 @@ - int i, videoStream; - AVCodecContext *pCodecCtx; - AVCodec *pCodec; --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - AVDictionary *avDictionary; --#endif -+//#endif - AVFrame *pFrame; - - public: diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild deleted file mode 100644 index 3835c9d4b831..000000000000 --- a/media-video/noad/noad-0.7.3-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Mark commercial Breaks in VDR records" -HOMEPAGE="http://noad.heliohost.org/" -SRC_URI="http://noad.heliohost.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ffmpeg" - -RDEPEND="media-gfx/imagemagick - media-libs/libmpeg2:= - ffmpeg? ( virtual/ffmpeg ) - !media-plugins/vdr-markad" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch - - if has_version '>=media-video/vdr-1.7.15'; then - sed -i -e 's:2001:6419:' -i svdrpc.cpp || die - fi - - sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746 - - sed -i \ - -e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \ - Makefile.am || die #467134 - - # FIXME: --with-tools, markpics will compile but showindex won't! - sed -i \ - -e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \ - -e '/^EXTRA_PROGRAMS/s:showindex::' \ - Makefile.am || die - - # ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51' - if use ffmpeg; then - sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die - fi - - eautoreconf -} - -src_configure() { - econf \ - --with-magick \ - --with-mpeginclude=/usr/include/mpeg2dec \ - --with-tools \ - $(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '') -} - -src_install() { - dobin noad markpics # showindex - - dodoc README INSTALL - # example scripts are installed as dokumentation - dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html - - newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad - - insinto /usr/share/vdr/record - doins "${FILESDIR}"/record-50-noad.sh - - insinto /usr/share/vdr/shutdown - doins "${FILESDIR}"/pre-shutdown-15-noad.sh - - insinto /etc/vdr/reccmds - doins "${FILESDIR}"/reccmds.noad.conf - - exeinto /usr/share/vdr/bin - doexe "${FILESDIR}"/noad-reccmd -} - -pkg_postinst() { - elog - elog "To integrate noad in VDR you should do this:" - elog - elog "start and set Parameter in /etc/conf.d/vdraddon.noad" - elog - elog "Note: You can use here all pararmeters for noad," - elog "please look in the documentation of noad." -} diff --git a/media-video/noad/noad-0.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r1.ebuild deleted file mode 100644 index 60d75aed517f..000000000000 --- a/media-video/noad/noad-0.8.6-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Mark commercial breaks in VDR recordings" -HOMEPAGE="http://noad.net23.net/" -SRC_URI="http://noad.net23.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+ffmpeg imagemagick libmpeg2" - -RDEPEND=" - libmpeg2? ( media-libs/libmpeg2:= ) - ffmpeg? ( virtual/ffmpeg ) - imagemagick? ( media-gfx/imagemagick ) - !media-plugins/vdr-markad" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( ffmpeg libmpeg2 )" - -src_prepare() { - sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp - - # tested libav-9, ffmepg-2.2.9 - eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ - "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" - - eautoreconf -} - -src_configure() { - econf \ - $(usex imagemagick '--with-magick') \ - $(usex ffmpeg '' '--without-ffmpeg') \ - $(usex libmpeg2 '' '--without-libmpeg2') \ - --with-tools -} - -src_compile() { - emake AR="$(tc-getAR)" # see bug #469810 -} - -src_install() { - dobin noad showindex checkMarks - use imagemagick && dobin markpics - - dodoc README INSTALL - # example scripts are installed as dokumentation - dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd - - newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad - - insinto /usr/share/vdr/record - doins "${FILESDIR}"/record-50-noad.sh - - insinto /usr/share/vdr/shutdown - doins "${FILESDIR}"/pre-shutdown-15-noad.sh - - insinto /etc/vdr/reccmds - doins "${FILESDIR}"/reccmds.noad.conf - - exeinto /usr/share/vdr/bin - doexe "${FILESDIR}"/noad-reccmd -} - -pkg_postinst() { - elog - elog "To integrate noad in VDR you should do this:" - elog - elog "start and set Parameter in /etc/conf.d/vdraddon.noad" - elog - elog "Note: You can use here all parameters for noad," - elog "please look in the documentation of noad." -} diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild deleted file mode 100644 index d9c62f84e4be..000000000000 --- a/media-video/noad/noad-0.8.6-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Mark commercial breaks in VDR recordings" -HOMEPAGE="http://noad.net23.net/" -SRC_URI="http://noad.net23.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ffmpeg imagemagick libmpeg2" - -RDEPEND=" - libmpeg2? ( media-libs/libmpeg2:= ) - ffmpeg? ( virtual/ffmpeg ) - imagemagick? ( media-gfx/imagemagick ) - !media-plugins/vdr-markad" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( ffmpeg libmpeg2 )" - -src_prepare() { - sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp - - # wrt bug 575494 - sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp - sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp - - # tested libav-9, ffmepg-2.2.9 - eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ - "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" - - eautoreconf -} - -src_configure() { - econf \ - $(usex imagemagick '--with-magick') \ - $(usex ffmpeg '' '--without-ffmpeg') \ - $(usex libmpeg2 '' '--without-libmpeg2') \ - --with-tools -} - -src_compile() { - emake AR="$(tc-getAR)" # see bug #469810 -} - -src_install() { - dobin noad showindex checkMarks - use imagemagick && dobin markpics - - dodoc README INSTALL - # example scripts are installed as dokumentation - dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd - - newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad - - insinto /usr/share/vdr/record - doins "${FILESDIR}"/record-50-noad.sh - - insinto /usr/share/vdr/shutdown - doins "${FILESDIR}"/pre-shutdown-15-noad.sh - - insinto /etc/vdr/reccmds - doins "${FILESDIR}"/reccmds.noad.conf - - exeinto /usr/share/vdr/bin - doexe "${FILESDIR}"/noad-reccmd -} - -pkg_postinst() { - elog - elog "To integrate noad in VDR you should do this:" - elog - elog "start and set Parameter in /etc/conf.d/vdraddon.noad" - elog - elog "Note: You can use here all parameters for noad," - elog "please look in the documentation of noad." -} diff --git a/media-video/noad/noad-0.8.6-r4.ebuild b/media-video/noad/noad-0.8.6-r4.ebuild new file mode 100644 index 000000000000..170684dc966e --- /dev/null +++ b/media-video/noad/noad-0.8.6-r4.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +DESCRIPTION="Mark commercial breaks in VDR recordings" +HOMEPAGE="https://github.com/madmartin/noad" +SRC_URI="https://github.com/madmartin/noad/archive/v0.8.6.tar.gz -> ${P}.tar.gz + http://vdr.websitec.de/download/${PN}/${P}-ffmpeg3.4.diff.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ffmpeg imagemagick libmpeg2" + +RDEPEND=" + libmpeg2? ( media-libs/libmpeg2:= ) + ffmpeg? ( virtual/ffmpeg ) + imagemagick? ( media-gfx/imagemagick )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE="|| ( ffmpeg libmpeg2 )" + +src_prepare() { + default + + #compile tested libav-13, ffmepg-3.4 + eapply "${WORKDIR}/${P}-ffmpeg3.4.diff" + + eautoreconf +} + +src_configure() { + econf \ + $(usex imagemagick '--with-magick') \ + $(usex ffmpeg '' '--without-ffmpeg') \ + $(usex libmpeg2 '' '--without-libmpeg2') \ + --with-tools +} + +src_compile() { + emake AR="$(tc-getAR)" # see bug #469810 +} + +src_install() { + dobin noad showindex checkMarks + use imagemagick && dobin markpics + + dodoc README INSTALL + # example scripts are installed as dokumentation + dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd + + newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad + + insinto /usr/share/vdr/record + doins "${FILESDIR}"/record-50-noad.sh + + insinto /usr/share/vdr/shutdown + doins "${FILESDIR}"/pre-shutdown-15-noad.sh + + insinto /etc/vdr/reccmds + doins "${FILESDIR}"/reccmds.noad.conf + + exeinto /usr/share/vdr/bin + doexe "${FILESDIR}"/noad-reccmd +} + +pkg_postinst() { + elog + elog "To integrate noad in VDR you should do this:" + elog + elog "start and set Parameter in /etc/conf.d/vdraddon.noad" + elog + elog "Note: You can use here all parameters for noad," + elog "please look in the documentation of noad." +} -- cgit v1.2.3