From 2cb26483945211e812d7a0351ae472a676cd9592 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Aug 2022 14:30:35 +0100 Subject: gentoo auto-resync : 16:08:2022 - 14:30:35 --- media-video/Manifest.gz | Bin 25999 -> 25841 bytes media-video/dv2sub/Manifest | 4 +- media-video/dv2sub/dv2sub-0.3-r1.ebuild | 32 ----- media-video/dv2sub/dv2sub-0.3-r2.ebuild | 15 ++ media-video/dv2sub/metadata.xml | 3 - media-video/kino/Manifest | 10 -- media-video/kino/files/kino-1.3.4-desktop.patch | 14 -- media-video/kino/files/kino-1.3.4-ffmpeg3.patch | 157 --------------------- media-video/kino/files/kino-1.3.4-ffmpeg4.patch | 13 -- media-video/kino/files/kino-1.3.4-libav-0.7.patch | 60 -------- media-video/kino/files/kino-1.3.4-libav-0.8.patch | 57 -------- .../files/kino-1.3.4-libavcodec-pkg-config.patch | 11 -- media-video/kino/files/kino-1.3.4-v4l1.patch | 22 --- media-video/kino/kino-1.3.4-r2.ebuild | 105 -------------- media-video/kino/metadata.xml | 14 -- 15 files changed, 17 insertions(+), 500 deletions(-) delete mode 100644 media-video/dv2sub/dv2sub-0.3-r1.ebuild create mode 100644 media-video/dv2sub/dv2sub-0.3-r2.ebuild delete mode 100644 media-video/kino/Manifest delete mode 100644 media-video/kino/files/kino-1.3.4-desktop.patch delete mode 100644 media-video/kino/files/kino-1.3.4-ffmpeg3.patch delete mode 100644 media-video/kino/files/kino-1.3.4-ffmpeg4.patch delete mode 100644 media-video/kino/files/kino-1.3.4-libav-0.7.patch delete mode 100644 media-video/kino/files/kino-1.3.4-libav-0.8.patch delete mode 100644 media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch delete mode 100644 media-video/kino/files/kino-1.3.4-v4l1.patch delete mode 100644 media-video/kino/kino-1.3.4-r2.ebuild delete mode 100644 media-video/kino/metadata.xml (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index f8053d3a79f3..4ecab179df07 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/dv2sub/Manifest b/media-video/dv2sub/Manifest index 3b8108b9174f..32cef334ad91 100644 --- a/media-video/dv2sub/Manifest +++ b/media-video/dv2sub/Manifest @@ -1,3 +1,3 @@ DIST dv2sub-0.3.tar.gz 121756 BLAKE2B 7cb66255964ed9d566da8297ef82b3ab653230c7980005d73ff5881dc1b90ac53359513d9154f07a3c0bce74675a420346fe525c6ee1407582cec8624acdbbec SHA512 3284afd6b9698d7a464771e244eed567c7937d5b022f7f98f6dfc1ae73fde220bb816cc16d44c22cbf2112a0b7621f41a2223f25e2b8d3cad469275db4e8cfe2 -EBUILD dv2sub-0.3-r1.ebuild 651 BLAKE2B dc8cdbfe51ed075fbef1a1dab62007a7cf839d5e91069750f24c2522b6681153ef97677221927c2813225297a469d646c5c3f123fc1bdf174096ad93dd08c39f SHA512 f2abef0459587e8dea5c4cc586fdccef9a68b830a00caaa8cd2b4df5c7cfe3779bbc17f1f6c8f3a19503431b79d628886d8571db69e22d5627428c3cf7417789 -MISC metadata.xml 668 BLAKE2B f9cc47c941d2cd1797a040e703ed5d2a3329aee3b9cf7911063fcd2fb3229206c1a92638039a52b06357a5196d2e2ed73446d688a5ac57ddf254b66c07d5d421 SHA512 10596f5c0d5f1f7f8fd91d1ace897aee1c49a26cda8aee0285da6c002e1e687c20583992e60d7c294b036af3caa348f9eeba83df145d9eeabadd9fb387c773af +EBUILD dv2sub-0.3-r2.ebuild 362 BLAKE2B 821be5fed28de64264a6211a8a5de101e85ed0f93b5c7bace9a90e9c651d4ccd507c7804abcbd66eeaff3d28dc13b1909dc71c91f7d130fff4e2634745b9a4cb SHA512 f2b164983466b97b10417a3c9c28b701a19fa1d933d1e951b11cb0ae543914f3229c604c1dc14bf0bc589ac472e691c4d6ee5053520bf128d5790e11b5b53417 +MISC metadata.xml 606 BLAKE2B adc06b51fd6ae8e146d6674b370a4806064356538d685ffc09c306be0424a70452235b05e8dda990c63e0656ed687e182e740819ecf437ba7e38ea9c785dbc00 SHA512 f7939c0040b7c81c797a8b5dd9254214ec26dfada34978e556a851f51c65c96f6ad089246c1d47c58fd87bc7ff86a5ca5b79609a807a2a0e8012c9800611b495 diff --git a/media-video/dv2sub/dv2sub-0.3-r1.ebuild b/media-video/dv2sub/dv2sub-0.3-r1.ebuild deleted file mode 100644 index a45a239bcfd4..000000000000 --- a/media-video/dv2sub/dv2sub-0.3-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Extract info or subtitles from DV stream" -HOMEPAGE="http://dv2sub.sourceforge.net/" -SRC_URI="mirror://sourceforge/dv2sub/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="kino" - -DEPEND="media-libs/libdv" -RDEPEND="${DEPEND} - kino? ( - media-video/kino - media-video/dvdauthor - media-video/ffmpeg - )" - -src_install() { - default - - if use kino; then - insinto /usr/share/kino/scripts/exports - exeinto /usr/share/kino/scripts/exports - doins kino_scripts/dv2sub_spumux.xml - doexe kino_scripts/*.sh - fi -} diff --git a/media-video/dv2sub/dv2sub-0.3-r2.ebuild b/media-video/dv2sub/dv2sub-0.3-r2.ebuild new file mode 100644 index 000000000000..655239544c3d --- /dev/null +++ b/media-video/dv2sub/dv2sub-0.3-r2.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Extract info or subtitles from DV stream" +HOMEPAGE="http://dv2sub.sourceforge.net/" +SRC_URI="mirror://sourceforge/dv2sub/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="media-libs/libdv" +RDEPEND="${DEPEND}" diff --git a/media-video/dv2sub/metadata.xml b/media-video/dv2sub/metadata.xml index c46fee690af6..8fc8f44b8338 100644 --- a/media-video/dv2sub/metadata.xml +++ b/media-video/dv2sub/metadata.xml @@ -11,9 +11,6 @@ every input DV frame or create MicroDVD subtitles with the recording date and time. - - install kino plugin - dv2sub diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest deleted file mode 100644 index e31381bc0453..000000000000 --- a/media-video/kino/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX kino-1.3.4-desktop.patch 407 BLAKE2B 9fb95f11dabad418b2006db47c0cfd4a29bec37c896b84fc78f3ff4d9070364e62517f35454408eec9a3d0cfb53969561ec7851a437cbfe78afa80ddc099cd34 SHA512 573ecb979dda675a6b9a82258bd854468289e2551c6a8a4e6b33144f51daf4d4a3a6fd52b1ac17eaefa19d6c033ca3b22d47ab515b0f3d121b5a767680c7ee63 -AUX kino-1.3.4-ffmpeg3.patch 6804 BLAKE2B 7517c00374bb48ec7677a749296a91c4e5d242496b14d0a38c1e262772cbdadb89c527a44a46db42fa7cad8460138e1d2b11e56ead5bc320a12f5a005363ad17 SHA512 d6ba42d70a907887a866c195946a130fcfff63c8caacf68e8de13fe4d43d4e1898df38fbea5afdb498aade03d14822f0c6f1a9b8308729041e1319acd8c2a0bf -AUX kino-1.3.4-ffmpeg4.patch 687 BLAKE2B 904e34afbc0707cc8b12de5ec4b733e78a6db91bd9af07a071ae623f82bb57b249acf0b49151a9a597985824c7b402fe8191616fd99ead50a6df7e8f79a1ef93 SHA512 55646377cfacf3a60d240845656e0f01060fb520cf51cac03a6d72941447a5ac05abe1086f84810d684ffe913bd04b3073c951a0efb5891bae44f3eb8c65a858 -AUX kino-1.3.4-libav-0.7.patch 2001 BLAKE2B 75060268985ffbf0cb19e6b96acde037b7b86522e03661becf0fde1b8e114212a033150bb69cf4bdfcd4783cb149f2864c7cceb8d6cfbf778b26cca96108febb SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a -AUX kino-1.3.4-libav-0.8.patch 2622 BLAKE2B 7345a43a6bfb6473dda9899ab675426db102d32a60d44256b14ab7834835b21e5e1a066bd950309bdaad0a5a66650ea220342ed542a641c35e7e1d07f81c21d4 SHA512 736eeb8f6902704166f48975581ebf2eb9e9edc6da8883d49e5f3710679988da57d796b5a926f27282d88584451ff03983402de66a4a707171674ad2de63d4d4 -AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60a39ee743e08e88e736e91db2728a19653c6d0eba22b3883e99e6c54f14b6f1262227aa883c067cd577eb69eef66caac3ee49339 SHA512 4351560f26ea47f3122ac5a44bea48eae48b8efcc6ca10e72adb31ff5c535ed17e7324444bd03a29482351c3100b07a4305f092c687f18d56f813839332f5847 -AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77 -DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32 -EBUILD kino-1.3.4-r2.ebuild 2777 BLAKE2B fef4063078668ece4cfdfeb72662e617b9ac11eaa2277c90eac19d173c7ab86eccec51d01bb32840511908741e6f95c5d7a4ea81173551df0125113f8cbebccf SHA512 6a906da7ed8877194f39463510660cd70147a1f5160023fd88714c6fe9c80eab0292d3dc6ced7dbfc03d67d27e6342477d8cdd7087307bd22a7198a448b6e4d7 -MISC metadata.xml 440 BLAKE2B 17578875722421328d795ab626f8b0f126891652532e69a8b03046b00c4b95cdce66dfe011d82b3147ece3dbd824c6ea8acc036770b11c3dc7b66c50a1620602 SHA512 bf3cd35ea0db6914b766b400b5cb0245f6601f0d8f7d03efeb9fd00336960e4d1fd01d8fa43f29d16f7caee5dd0010dab937f729174df8ebbf234f013c00b3e2 diff --git a/media-video/kino/files/kino-1.3.4-desktop.patch b/media-video/kino/files/kino-1.3.4-desktop.patch deleted file mode 100644 index 03267e35b48f..000000000000 --- a/media-video/kino/files/kino-1.3.4-desktop.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- kino-1.3.4/Kino.desktop_orig 2021-04-10 11:55:07.696950138 +0200 -+++ kino-1.3.4/Kino.desktop 2021-04-10 11:55:19.621863615 +0200 -@@ -41,9 +41,9 @@ - Encoding=UTF-8 - TryExec=kino - Exec=kino %F --Icon=kino.png -+Icon=kino - Terminal=false - StartupNotify=true - Type=Application --Categories=Application;AudioVideo;AudioVideoEditing; -+Categories=AudioVideo;AudioVideoEditing; - MimeType=video/dv;application/smil diff --git a/media-video/kino/files/kino-1.3.4-ffmpeg3.patch b/media-video/kino/files/kino-1.3.4-ffmpeg3.patch deleted file mode 100644 index 57849d74e5c9..000000000000 --- a/media-video/kino/files/kino-1.3.4-ffmpeg3.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- ./src.orig/frame.cc 2016-12-18 12:25:48.480275083 -0600 -+++ ./src/frame.cc 2016-12-18 12:54:17.800740672 -0600 -@@ -103,7 +103,7 @@ - av_register_all(); - libavcodec = avcodec_alloc_context3(NULL); - avcodec_open2( libavcodec, -- avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL ); -+ avcodec_find_decoder( AV_CODEC_ID_DVVIDEO ), NULL ); - pthread_mutex_unlock( &avcodec_mutex ); - data = ( unsigned char* ) av_mallocz( 144000 ); - #if defined(HAVE_SWSCALE) -@@ -1060,7 +1060,7 @@ - int Frame::ExtractRGB( void * rgb ) - { - #if defined(HAVE_LIBAVCODEC) -- AVFrame *frame = avcodec_alloc_frame(); -+ AVFrame *frame = av_frame_alloc(); - AVPicture dest; - int got_picture; - -@@ -1072,17 +1072,17 @@ - avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { -- avpicture_fill( &dest, static_cast( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); -+ avpicture_fill( &dest, static_cast( rgb ), AV_PIX_FMT_RGB24, GetWidth(), GetHeight() ); - #if defined(HAVE_SWSCALE) - if ( !imgConvertRgbCtx ) - imgConvertRgbCtx = sws_getContext( libavcodec->width, libavcodec->height, libavcodec->pix_fmt, -- GetWidth(), GetHeight(), PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL ); -+ GetWidth(), GetHeight(), AV_PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL ); - sws_scale( imgConvertRgbCtx, frame->data, frame->linesize, 0, libavcodec->height, dest.data, dest.linesize ); - #else -- img_convert( &dest, PIX_FMT_RGB24, reinterpret_cast( frame ), libavcodec->pix_fmt, GetWidth(), GetHeight() ); -+ img_convert( &dest, AV_PIX_FMT_RGB24, reinterpret_cast( frame ), libavcodec->pix_fmt, GetWidth(), GetHeight() ); - #endif - } -- av_free( frame ); -+ av_frame_free( &frame ); - #else - unsigned char *pixels[ 3 ]; - int pitches[ 3 ]; -@@ -1125,7 +1125,7 @@ - int Frame::ExtractYUV( void *yuv ) - { - #if defined(HAVE_LIBAVCODEC) -- AVFrame *frame = avcodec_alloc_frame();; -+ AVFrame *frame = av_frame_alloc();; - AVPicture output; - int got_picture; - -@@ -1137,14 +1137,14 @@ - avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { -- avpicture_fill( &output, static_cast( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); -+ avpicture_fill( &output, static_cast( yuv ), AV_PIX_FMT_YUYV422, GetWidth(), GetHeight() ); - #if defined(HAVE_SWSCALE) - if ( !imgConvertYuvCtx ) - imgConvertYuvCtx = sws_getContext( libavcodec->width, libavcodec->height, libavcodec->pix_fmt, -- GetWidth(), GetHeight(), PIX_FMT_YUV422, SWS_FAST_BILINEAR, NULL, NULL, NULL ); -+ GetWidth(), GetHeight(), AV_PIX_FMT_YUYV422, SWS_FAST_BILINEAR, NULL, NULL, NULL ); - sws_scale( imgConvertYuvCtx, frame->data, frame->linesize, 0, libavcodec->height, output.data, output.linesize ); - #else -- img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, libavcodec->pix_fmt, GetWidth(), GetHeight() ); -+ img_convert( &output, AV_PIX_FMT_YUYV422, (AVPicture *)frame, libavcodec->pix_fmt, GetWidth(), GetHeight() ); - #endif - } - av_free( frame ); -@@ -1164,7 +1164,7 @@ - int Frame::ExtractYUV420( uint8_t *yuv, uint8_t *output[ 3 ] ) - { - #if defined(HAVE_LIBAVCODEC) -- AVFrame *frame = avcodec_alloc_frame(); -+ AVFrame *frame = av_frame_alloc(); - int got_picture; - - AVPacket pkt; -@@ -1176,7 +1176,7 @@ - - int width = GetWidth(), height = GetHeight(); - -- if ( libavcodec->pix_fmt == PIX_FMT_YUV420P ) // PAL -+ if ( libavcodec->pix_fmt == AV_PIX_FMT_YUV420P ) // PAL - { - int h2 = height / 2; - int w2 = width / 2; -@@ -1204,7 +1204,7 @@ - } - } - } -- else // libavcodec.pix_fmt == PIX_FMT_YUV411P // NTSC -+ else // libavcodec.pix_fmt == AV_PIX_FMT_YUV411P // NTSC - { - int w4 = width / 4; - -@@ -1341,7 +1341,7 @@ - avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); - AVStream* vst = avformat_new_stream( avformatEncoder, NULL ); - vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; -- vst->codec->codec_id = CODEC_ID_DVVIDEO; -+ vst->codec->codec_id = AV_CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; - vst->start_time = 0; - AVCodecContext *avcodecEncoder = vst->codec; -@@ -1366,14 +1366,14 @@ - #endif - avcodecEncoder->thread_count = 2; - avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; -- avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P; -+ avcodecEncoder->pix_fmt = isPAL ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV411P; - avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; -- avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL ); -+ avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL ); - av_new_packet( &avpacketEncoder, 144000 ); - tempImage = ( uint8_t* ) av_malloc( - avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) ); - #if defined(HAVE_SWSCALE) -- imgConvertEncoderCtx = sws_getContext( avcodecEncoder->width, avcodecEncoder->height, PIX_FMT_RGB24, -+ imgConvertEncoderCtx = sws_getContext( avcodecEncoder->width, avcodecEncoder->height, AV_PIX_FMT_RGB24, - avcodecEncoder->width, avcodecEncoder->height, avcodecEncoder->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL); - #endif - } -@@ -1452,8 +1452,8 @@ - if ( CreateEncoder( IsPAL(), IsWide() ) ) - { - #if defined(HAVE_LIBAVCODEC) -- AVFrame *input = avcodec_alloc_frame(); -- AVFrame *output = avcodec_alloc_frame(); -+ AVFrame *input = av_frame_alloc(); -+ AVFrame *output = av_frame_alloc(); - - if ( input && output ) - { -@@ -1464,16 +1464,19 @@ - - // Convert color space - avpicture_fill( ( AVPicture* )output, tempImage, avcodecEncoder->pix_fmt, width, height ); -- avpicture_fill( ( AVPicture* )input, rgb, PIX_FMT_RGB24, width, height ); -+ avpicture_fill( ( AVPicture* )input, rgb, AV_PIX_FMT_RGB24, width, height ); - #if defined(HAVE_SWSCALE) - sws_scale( imgConvertEncoderCtx, input->data, input->linesize, 0, height, - output->data, output->linesize); - #else -- img_convert( ( AVPicture* )output, avcodecEncoder->pix_fmt, ( AVPicture* )input, PIX_FMT_RGB24, width, height ); -+ img_convert( ( AVPicture* )output, avcodecEncoder->pix_fmt, ( AVPicture* )input, AV_PIX_FMT_RGB24, width, height ); - #endif - - // Encode -- bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); -+ -+ // bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); -+ int got_packet; -+ bytesInFrame = avcodec_encode_video2( avcodecEncoder, &avpacketEncoder, output, &got_packet ); - avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL); - avpacketEncoder.size = bytesInFrame; - if ( !isEncoderHeaderWritten ) diff --git a/media-video/kino/files/kino-1.3.4-ffmpeg4.patch b/media-video/kino/files/kino-1.3.4-ffmpeg4.patch deleted file mode 100644 index b0f359f06ba3..000000000000 --- a/media-video/kino/files/kino-1.3.4-ffmpeg4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/old/frame.cc b/src/frame.cc -index c88508f..1e2573a 100644 ---- a/old/frame.cc -+++ b/src/frame.cc -@@ -1367,7 +1367,7 @@ bool Frame::CreateEncoder( bool isPAL, bool isWide ) - avcodecEncoder->thread_count = 2; - avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; - avcodecEncoder->pix_fmt = isPAL ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV411P; -- avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; -+ avcodecEncoder->flags |= AV_CODEC_FLAG_INTERLACED_DCT; - avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL ); - av_new_packet( &avpacketEncoder, 144000 ); - tempImage = ( uint8_t* ) av_malloc( diff --git a/media-video/kino/files/kino-1.3.4-libav-0.7.patch b/media-video/kino/files/kino-1.3.4-libav-0.7.patch deleted file mode 100644 index 65c5bc38276d..000000000000 --- a/media-video/kino/files/kino-1.3.4-libav-0.7.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- kino-1.3.4.orig/src/frame.cc 2011-07-17 14:54:59.089481638 +0200 -+++ kino-1.3.4/src/frame.cc 2011-07-17 15:09:23.199481714 +0200 -@@ -1063,7 +1063,12 @@ - AVPicture dest; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &dest, static_cast( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); -@@ -1123,7 +1128,12 @@ - AVPicture output; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &output, static_cast( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); -@@ -1156,7 +1166,12 @@ - AVFrame *frame = avcodec_alloc_frame(); - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - - int width = GetWidth(), height = GetHeight(); - -@@ -1319,12 +1334,12 @@ - #if defined(HAVE_LIBAVCODEC) - if ( avformatEncoder == NULL ) - { -- avformatEncoder = av_alloc_format_context(); -+ avformatEncoder = avformat_alloc_context(); - if ( avformatEncoder ) - { -- avformatEncoder->oformat = guess_format( "dv", NULL, NULL ); -+ avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); - AVStream* vst = av_new_stream( avformatEncoder, 0 ); -- vst->codec->codec_type = CODEC_TYPE_VIDEO; -+ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; - vst->start_time = 0; diff --git a/media-video/kino/files/kino-1.3.4-libav-0.8.patch b/media-video/kino/files/kino-1.3.4-libav-0.8.patch deleted file mode 100644 index f98cbda0bc49..000000000000 --- a/media-video/kino/files/kino-1.3.4-libav-0.8.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- kino-1.3.4.orig/src/frame.cc 2012-05-14 19:55:42.153772418 -0700 -+++ kino-1.3.4/src/frame.cc 2012-05-14 20:28:34.448838653 -0700 -@@ -101,8 +101,9 @@ - #if defined(HAVE_LIBAVCODEC) - pthread_mutex_lock( &avcodec_mutex ); - av_register_all(); -- libavcodec = avcodec_alloc_context(); -- avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) ); -+ libavcodec = avcodec_alloc_context3(NULL); -+ avcodec_open2( libavcodec, -+ avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL ); - pthread_mutex_unlock( &avcodec_mutex ); - data = ( unsigned char* ) av_mallocz( 144000 ); - #if defined(HAVE_SWSCALE) -@@ -1338,7 +1339,7 @@ - if ( avformatEncoder ) - { - avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); -- AVStream* vst = av_new_stream( avformatEncoder, 0 ); -+ AVStream* vst = avformat_new_stream( avformatEncoder, NULL ); - vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; -@@ -1364,12 +1365,10 @@ - vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio; - #endif - avcodecEncoder->thread_count = 2; -- avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count ); - avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; - avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P; - avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; -- av_set_parameters( avformatEncoder, NULL ); -- avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) ); -+ avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL ); - av_new_packet( &avpacketEncoder, 144000 ); - tempImage = ( uint8_t* ) av_malloc( - avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) ); -@@ -1475,16 +1474,16 @@ - - // Encode - bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); -- url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY ); -+ avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL); - avpacketEncoder.size = bytesInFrame; - if ( !isEncoderHeaderWritten ) - { -- av_write_header( avformatEncoder ); -+ avformat_write_header( avformatEncoder, NULL ); - isEncoderHeaderWritten = true; - } - av_write_frame( avformatEncoder, &avpacketEncoder ); - #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) -- url_close_buf( avformatEncoder->pb ); -+ avio_close( avformatEncoder->pb ); - #else - url_close_buf( &avformatEncoder->pb ); - #endif diff --git a/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch b/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch deleted file mode 100644 index c5cd12106f5c..000000000000 --- a/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in 2009-09-08 02:35:23.000000000 -0400 -+++ b/configure.in 2014-01-27 14:53:01.366063037 -0500 -@@ -221,7 +221,7 @@ - if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then - local_legacy_ffmpeg_test - else -- PKG_CHECK_MODULES(AVCODEC, libavformat, -+ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil], - [ - AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec]) - AC_SUBST(AVCODEC_LIBS) diff --git a/media-video/kino/files/kino-1.3.4-v4l1.patch b/media-video/kino/files/kino-1.3.4-v4l1.patch deleted file mode 100644 index c6757743cd7e..000000000000 --- a/media-video/kino/files/kino-1.3.4-v4l1.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:20:37.161004916 +0400 -+++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:21:57.302377529 +0400 -@@ -26,7 +26,7 @@ - #include - #include - #define _LINUX_TIME_H 1 --#include -+#include - #include - - typedef struct { ---- kino-1.3.3.orig/src/v4l.h 2011-05-17 02:20:38.896969666 +0400 -+++ kino-1.3.3.orig/src/v4l.h 2011-05-17 02:21:39.922730395 +0400 -@@ -40,7 +40,7 @@ - - #define _DEVICE_H_ - #define _LINUX_TIME_H --#include -+#include - - #include "displayer.h" - diff --git a/media-video/kino/kino-1.3.4-r2.ebuild b/media-video/kino/kino-1.3.4-r2.ebuild deleted file mode 100644 index c34910775617..000000000000 --- a/media-video/kino/kino-1.3.4-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools udev xdg - -DESCRIPTION="Non-linear DV editor for GNU/Linux" -HOMEPAGE="http://www.kinodv.org/" -SRC_URI="mirror://sourceforge/kino/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="alsa dvdr gpac lame quicktime sox vorbis" - -# Optional dependency on cinelerra-cvs (as a replacement for libquicktime) -# dropped because kino may run with it but won't build anymore. -DEPEND=" - >=x11-libs/gtk+-2.6.0:2 - >=gnome-base/libglade-2.5.0 - >=dev-libs/glib-2:2 - x11-libs/libXv - dev-libs/libxml2:2 - media-libs/audiofile - >=sys-libs/libraw1394-1.0.0 - >=sys-libs/libavc1394-0.4.1 - >=media-libs/libdv-0.103 - media-libs/libsamplerate - media-libs/libiec61883 - media-libs/libv4l:0= - alsa? ( >=media-libs/alsa-lib-1.0.9 ) - >=media-video/ffmpeg-3:0= - quicktime? ( >=media-libs/libquicktime-0.9.5 ) -" -RDEPEND="${DEPEND} - media-video/mjpegtools - media-sound/rawrec - dvdr? ( media-video/dvdauthor - app-cdr/dvd+rw-tools ) - gpac? ( media-video/gpac ) - lame? ( media-sound/lame ) - sox? ( media-sound/sox ) - vorbis? ( media-sound/vorbis-tools ) -" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool -" - -src_prepare() { - default - - # Deactivating automagic alsa configuration, bug #134725 - if ! use alsa ; then - sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die - fi - - # Fix bug #169590 - sed -i \ - -e '/\$(LIBQUICKTIME_LIBS) \\/d' \ - -e '/^[[:space:]]*\$(SRC_LIBS)/ a\ - \$(LIBQUICKTIME_LIBS) \\' \ - src/Makefile.in || die - - # Fix test failure discovered in bug #193947 - sed -i -e '$a\ -\ -ffmpeg/libavcodec/ps2/idct_mmi.c\ -ffmpeg/libavcodec/sparc/dsputil_vis.c\ -ffmpeg/libavcodec/sparc/vis.h\ -ffmpeg/libavutil/bswap.h\ -ffmpeg/libswscale/yuv2rgb_template.c\ -src/export.h\ -src/message.cc\ -src/page_bttv.cc' po/POTFILES.in || die - - sed -i -e 's:^#include :#include :' src/filehandler.h || die - eapply "${FILESDIR}/${P}-v4l1.patch" - eapply "${FILESDIR}/${P}-libav-0.7.patch" - eapply "${FILESDIR}/${P}-libav-0.8.patch" - eapply "${FILESDIR}/${P}-libavcodec-pkg-config.patch" - eapply "${FILESDIR}/${P}-ffmpeg3.patch" - eapply "${FILESDIR}/${P}-ffmpeg4.patch" - eapply "${FILESDIR}/${P}-desktop.patch" - - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - --disable-local-ffmpeg \ - $(use_enable quicktime) \ - $(use_with sparc dv1394) \ - --with-udev-rules-dir="$(get_udevdir)"/rules.d \ - CPPFLAGS="-I${ESYSROOT}usr/include/libavcodec -I${ESYSROOT}usr/include/libavformat -I${ESYSROOT}usr/include/libswscale" -} - -src_install() { - default - mv "${ED}/$(get_udevdir)"/rules.d/{,99-}kino.rules || die - fowners root:root -R /usr/share/kino/help #177378 - find "${ED}" -name '*.la' -delete || die #385361 -} diff --git a/media-video/kino/metadata.xml b/media-video/kino/metadata.xml deleted file mode 100644 index 85d3482c21f9..000000000000 --- a/media-video/kino/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - media-video@gentoo.org - Gentoo Video project - - - Enable GPAC support when exporting to 3GPP format - - - kino - - -- cgit v1.2.3