[gentoo-commits] repo/gentoo:master commit in: profiles/, media-libs/mediastreamer/files/, media-libs/mediastreamer/

[Andreas Sturmlechner]

commit:     8b1751482b69bdc9cfc8a98ffdd5719928ebb1f2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 12:51:18 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 12:54:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b175148

media-libs/mediastreamer: Remove last-rited package

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/mediastreamer/Manifest                  |   1 -
 .../files/mediastreamer-2.9.0-ffmpeg3.patch        | 482 ---------------------
 .../files/mediastreamer-2.9.0-ffmpeg4.patch        |  22 -
 .../files/mediastreamer-2.9.0-libav9.patch         | 120 -----
 .../files/mediastreamer-2.9.0-tests.patch          |  26 --
 .../files/mediastreamer-2.9.0-underlinking.patch   |  57 ---
 .../files/mediastreamer-2.9.0-v4l-automagic.patch  |  55 ---
 .../files/mediastreamer-2.9.0-xxd.patch            |  18 -
 .../mediastreamer/mediastreamer-2.9.0-r2.ebuild    | 191 --------
 media-libs/mediastreamer/metadata.xml              |  20 -
 profiles/package.mask                              |   6 -
 11 files changed, 998 deletions(-)

diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
deleted file mode 100644
index 4c93a71d607..00000000000
--- a/media-libs/mediastreamer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg3.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg3.patch
deleted file mode 100644
index a536270897b..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg3.patch
+++ /dev/null
@@ -1,482 +0,0 @@
-Index: mediastreamer-2.9.0/src/utils/ffmpeg-priv.h
-===================================================================
---- mediastreamer-2.9.0.orig/src/utils/ffmpeg-priv.h
-+++ mediastreamer-2.9.0/src/utils/ffmpeg-priv.h
-@@ -69,9 +69,6 @@ static inline int avcodec_decode_video2(
- 	return avcodec_decode_video(avctx,picture, got_picture_ptr,avpkt->data,avpkt->size);
- }
- #endif
--#if (LIBAVCODEC_VERSION_MAJOR >= 56)
--#include <libavcodec/old_codec_ids.h>
--#endif
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
- #define CodecID AVCodecID
- #endif
-Index: mediastreamer-2.9.0/src/videofilters/h264dec.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/h264dec.c
-+++ mediastreamer-2.9.0/src/videofilters/h264dec.c
-@@ -56,7 +56,7 @@ static void ffmpeg_init(){
- static void dec_open(DecData *d){
- 	AVCodec *codec;
- 	int error;
--	codec=avcodec_find_decoder(CODEC_ID_H264);
-+	codec=avcodec_find_decoder(AV_CODEC_ID_H264);
- 	if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
- 	avcodec_get_context_defaults3(&d->av_context, NULL);
- 	error=avcodec_open2(&d->av_context,codec, NULL);
-@@ -119,7 +119,7 @@ static mblk_t *get_as_yuvmsg(MSFilter *f
- 		s->outbuf.w=ctx->width;
- 		s->outbuf.h=ctx->height;
- 		s->sws_ctx=sws_getContext(ctx->width,ctx->height,ctx->pix_fmt,
--			ctx->width,ctx->height,PIX_FMT_YUV420P,SWS_FAST_BILINEAR,
-+			ctx->width,ctx->height,AV_PIX_FMT_YUV420P,SWS_FAST_BILINEAR,
-                 	NULL, NULL, NULL);
- 	}
- #if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0,9,0)	
-@@ -272,7 +272,7 @@ static void dec_process(MSFilter *f){
- 				int len;
- 				int got_picture=0;
- 				AVPacket pkt;
--				avcodec_get_frame_defaults(&orig);
-+				av_frame_unref(&orig);
- 				av_init_packet(&pkt);
- 				pkt.data = p;
- 				pkt.size = end-p;
-Index: mediastreamer-2.9.0/src/videofilters/jpegwriter.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/jpegwriter.c
-+++ mediastreamer-2.9.0/src/videofilters/jpegwriter.c
-@@ -36,9 +36,9 @@ typedef struct {
- 
- static void jpg_init(MSFilter *f){
- 	JpegWriter *s=ms_new0(JpegWriter,1);
--	s->codec=avcodec_find_encoder(CODEC_ID_MJPEG);
-+	s->codec=avcodec_find_encoder(AV_CODEC_ID_MJPEG);
- 	if (s->codec==NULL){
--		ms_error("Could not find CODEC_ID_MJPEG !");
-+		ms_error("Could not find AV_CODEC_ID_MJPEG !");
- 	}
- 	f->data=s;
- }
-@@ -96,7 +96,7 @@ static void jpg_process(MSFilter *f){
- 			avctx->height=yuvbuf.h;
- 			avctx->time_base.num = 1;
- 			avctx->time_base.den =1;
--			avctx->pix_fmt=PIX_FMT_YUVJ420P;
-+			avctx->pix_fmt=AV_PIX_FMT_YUVJ420P;
- 
- 			error=avcodec_open2(avctx,s->codec,NULL);
- 			if (error!=0) {
-@@ -105,7 +105,7 @@ static void jpg_process(MSFilter *f){
- 				av_free(avctx);
- 				return;
- 			}
--			sws_ctx=sws_getContext(avctx->width,avctx->height,PIX_FMT_YUV420P,
-+			sws_ctx=sws_getContext(avctx->width,avctx->height,AV_PIX_FMT_YUV420P,
- 				avctx->width,avctx->height,avctx->pix_fmt,SWS_FAST_BILINEAR,NULL, NULL, NULL);
- 			if (sws_ctx==NULL) {
- 				ms_error(" sws_getContext() failed.");
-@@ -126,13 +126,18 @@ static void jpg_process(MSFilter *f){
- 			}
- 			sws_freeContext(sws_ctx);
- 			
--			avcodec_get_frame_defaults(&pict);
-+			av_frame_unref(&pict);
- 			avpicture_fill((AVPicture*)&pict,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height);
--			error=avcodec_encode_video(avctx, (uint8_t*)comp_buf,comp_buf_sz, &pict);
-+			AVPacket pkt;
-+			av_init_packet(&pkt);
-+			pkt.buf = (uint8_t*)comp_buf;
-+			pkt.size = comp_buf_sz;
-+			int got_packet;
-+			error=avcodec_encode_video2(avctx, &pkt, &pict, &got_packet);
- 			if (error<0){
- 				ms_error("Could not encode jpeg picture.");
--			}else{
--				if (fwrite(comp_buf,error,1,s->file)>0){
-+			}else if(got_packet){
-+				if (fwrite(comp_buf,pkt.size,1,s->file)>0){
- 					ms_message("Snapshot done");
- 				}else{
- 					ms_error("Error writing snapshot.");
-Index: mediastreamer-2.9.0/src/videofilters/nowebcam.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/nowebcam.c
-+++ mediastreamer-2.9.0/src/videofilters/nowebcam.c
-@@ -61,7 +61,7 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf,
- 	struct SwsContext *sws_ctx;
- 	AVPacket pkt;
- 	MSPicture dest;
--	AVCodec *codec=avcodec_find_decoder(CODEC_ID_MJPEG);
-+	AVCodec *codec=avcodec_find_decoder(AV_CODEC_ID_MJPEG);
- 
- 	if (codec==NULL){
- 		ms_error("Could not find MJPEG decoder in ffmpeg.");
-@@ -84,9 +84,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf,
- 	}
- 	ret=ms_yuv_buf_alloc(&dest, reqsize->width,reqsize->height);
- 	/* not using SWS_FAST_BILINEAR because it doesn't play well with
--	 * av_context.pix_fmt set to PIX_FMT_YUVJ420P by jpeg decoder */
-+	 * av_context.pix_fmt set to AV_PIX_FMT_YUVJ420P by jpeg decoder */
- 	sws_ctx=sws_getContext(av_context.width,av_context.height,av_context.pix_fmt,
--		reqsize->width,reqsize->height,PIX_FMT_YUV420P,SWS_BILINEAR,
-+		reqsize->width,reqsize->height,AV_PIX_FMT_YUV420P,SWS_BILINEAR,
-                 NULL, NULL, NULL);
- 	if (sws_ctx==NULL) {
- 		ms_error("jpeg2yuv: ms_sws_getContext() failed.");
-Index: mediastreamer-2.9.0/src/videofilters/videodec.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/videodec.c
-+++ mediastreamer-2.9.0/src/videofilters/videodec.c
-@@ -40,7 +40,7 @@ typedef struct DecState{
- 	YuvBuf outbuf;
- 	mblk_t *yuv_msg;
- 	struct SwsContext *sws_ctx;
--	enum PixelFormat output_pix_fmt;
-+	enum AVPixelFormat output_pix_fmt;
- 	uint8_t dci[512];
- 	int dci_size;
- 	uint64_t last_error_reported_time;
-@@ -58,7 +58,7 @@ static void dec_init(MSFilter *f, enum C
- 	s->codec=cid;
- 	s->input=NULL;
- 	s->yuv_msg=NULL;
--	s->output_pix_fmt=PIX_FMT_YUV420P;
-+	s->output_pix_fmt=AV_PIX_FMT_YUV420P;
- 	s->snow_initialized=FALSE;
- 	s->outbuf.w=0;
- 	s->outbuf.h=0;
-@@ -77,19 +77,19 @@ static void dec_init(MSFilter *f, enum C
- }
- 
- static void dec_h263_init(MSFilter *f){
--	dec_init(f,CODEC_ID_H263);
-+	dec_init(f,AV_CODEC_ID_H263);
- }
- 
- static void dec_mpeg4_init(MSFilter *f){
--	dec_init(f,CODEC_ID_MPEG4);
-+	dec_init(f,AV_CODEC_ID_MPEG4);
- }
- 
- static void dec_mjpeg_init(MSFilter *f){
--	dec_init(f,CODEC_ID_MJPEG);
-+	dec_init(f,AV_CODEC_ID_MJPEG);
- }
- 
- static void dec_snow_init(MSFilter *f){
--	dec_init(f,CODEC_ID_SNOW);
-+	dec_init(f,AV_CODEC_ID_SNOW);
- }
- 
- static void dec_uninit(MSFilter *f){
-@@ -134,10 +134,10 @@ static void dec_preprocess(MSFilter *f){
- 	s->first_image_decoded = FALSE;
- 	if (s->av_context.codec==NULL){
- 		/* we must know picture size before initializing snow decoder*/
--		if (s->codec!=CODEC_ID_SNOW){
-+		if (s->codec!=AV_CODEC_ID_SNOW){
- 			error=avcodec_open2(&s->av_context, s->av_codec,NULL);
- 			if (error!=0) ms_error("avcodec_open2() failed: %i",error);
--			if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
-+			if (s->codec==AV_CODEC_ID_MPEG4 && s->dci_size>0){
- 				s->av_context.extradata=s->dci;
- 				s->av_context.extradata_size=s->dci_size;
- 			}
-@@ -643,8 +643,8 @@ static void dec_process_frame(MSFilter *
- 	
- 	if (f->desc->id==MS_H263_DEC_ID) inm=skip_rfc2429_header(inm);
- 	else if (f->desc->id==MS_H263_OLD_DEC_ID) inm=skip_rfc2190_header(inm);
--	else if (s->codec==CODEC_ID_SNOW && s->input==NULL) inm=parse_snow_header(s,inm);
--	else if (s->codec==CODEC_ID_MJPEG && f->desc->id==MS_JPEG_DEC_ID) inm=read_rfc2435_header(s,inm);
-+	else if (s->codec==AV_CODEC_ID_SNOW && s->input==NULL) inm=parse_snow_header(s,inm);
-+	else if (s->codec==AV_CODEC_ID_MJPEG && f->desc->id==MS_JPEG_DEC_ID) inm=read_rfc2435_header(s,inm);
- 
- 	if (inm){
- 		/* accumulate the video packet until we have the rtp markbit*/
-Index: mediastreamer-2.9.0/src/videofilters/videoenc.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/videofilters/videoenc.c
-+++ mediastreamer-2.9.0/src/videofilters/videoenc.c
-@@ -223,19 +223,19 @@ static void enc_init(MSFilter *f, enum C
- }
- 
- static void enc_h263_init(MSFilter *f){
--	enc_init(f,CODEC_ID_H263P);
-+	enc_init(f,AV_CODEC_ID_H263P);
- }
- 
- static void enc_mpeg4_init(MSFilter *f){
--	enc_init(f,CODEC_ID_MPEG4);
-+	enc_init(f,AV_CODEC_ID_MPEG4);
- }
- 
- static void enc_snow_init(MSFilter *f){
--	enc_init(f,CODEC_ID_SNOW);
-+	enc_init(f,AV_CODEC_ID_SNOW);
- }
- 
- static void enc_mjpeg_init(MSFilter *f){
--	enc_init(f,CODEC_ID_MJPEG);
-+	enc_init(f,AV_CODEC_ID_MJPEG);
- }
- 
- static void prepare(EncState *s){
-@@ -243,7 +243,7 @@ static void prepare(EncState *s){
- 	const int max_br_vbv=128000;
- 
- 	avcodec_get_context_defaults3(c, NULL);
--	if (s->codec==CODEC_ID_MJPEG)
-+	if (s->codec==AV_CODEC_ID_MJPEG)
- 	{
- 		ms_message("Codec bitrate set to %i",c->bit_rate);
- 		c->width = s->vsize.width;  
-@@ -251,7 +251,7 @@ static void prepare(EncState *s){
- 		c->time_base.num = 1;
- 		c->time_base.den = (int)s->fps;
- 		c->gop_size=(int)s->fps*5; /*emit I frame every 5 seconds*/
--		c->pix_fmt=PIX_FMT_YUVJ420P;
-+		c->pix_fmt=AV_PIX_FMT_YUVJ420P;
- 		s->comp_buf=allocb(c->bit_rate*2,0);
- 		return;
- 	}
-@@ -269,7 +269,7 @@ static void prepare(EncState *s){
- 
- 	/* ffmpeg vbv rate control consumes too much cpu above a certain target bitrate.
- 	We don't use it above max_br_vbv */
--	if (s->codec!=CODEC_ID_SNOW && s->maxbr<max_br_vbv){
-+	if (s->codec!=AV_CODEC_ID_SNOW && s->maxbr<max_br_vbv){
- 		/*snow does not like 1st pass rate control*/
- 		c->rc_max_rate=c->bit_rate;
- 		c->rc_min_rate=0;
-@@ -285,9 +285,9 @@ static void prepare(EncState *s){
- 	c->time_base.num = 1;
- 	c->time_base.den = (int)s->fps;
- 	c->gop_size=(int)s->fps*10; /*emit I frame every 10 seconds*/
--	c->pix_fmt=PIX_FMT_YUV420P;
-+	c->pix_fmt=AV_PIX_FMT_YUV420P;
- 	s->comp_buf=allocb(c->bit_rate*2,0);
--	if (s->codec==CODEC_ID_SNOW){
-+	if (s->codec==AV_CODEC_ID_SNOW){
- 		c->strict_std_compliance=-2;
- 	}
- 	
-@@ -304,7 +304,7 @@ static void prepare_h263(EncState *s){
- #endif
- 	c->rtp_payload_size = s->mtu/2;
- 	if (s->profile==0){
--		s->codec=CODEC_ID_H263;
-+		s->codec=AV_CODEC_ID_H263;
- 	}else{
- 		/*
- 		c->flags|=CODEC_FLAG_H263P_UMV;
-@@ -313,7 +313,7 @@ static void prepare_h263(EncState *s){
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		*/
--		s->codec=CODEC_ID_H263P;
-+		s->codec=AV_CODEC_ID_H263P;
- 	}
- }
- 
-@@ -331,13 +331,13 @@ static void enc_preprocess(MSFilter *f){
- 	EncState *s=(EncState*)f->data;
- 	int error;
- 	prepare(s);
--	if (s->codec==CODEC_ID_H263P || s->codec==CODEC_ID_H263)
-+	if (s->codec==AV_CODEC_ID_H263P || s->codec==AV_CODEC_ID_H263)
- 		prepare_h263(s);
--	else if (s->codec==CODEC_ID_MPEG4)
-+	else if (s->codec==AV_CODEC_ID_MPEG4)
- 		prepare_mpeg4(s);
--	else if (s->codec==CODEC_ID_SNOW){
-+	else if (s->codec==AV_CODEC_ID_SNOW){
- 		/**/
--	}else if (s->codec==CODEC_ID_MJPEG){
-+	}else if (s->codec==AV_CODEC_ID_MJPEG){
- 		/**/
- 	}else {
- 		ms_error("Unsupported codec id %i",s->codec);
-@@ -724,12 +724,12 @@ static void split_and_send(MSFilter *f,
- 	uint8_t *psc;
- 	uint32_t timestamp=f->ticker->time*90LL;
- 	
--	if (s->codec==CODEC_ID_MPEG4 || s->codec==CODEC_ID_SNOW)
-+	if (s->codec==AV_CODEC_ID_MPEG4 || s->codec==AV_CODEC_ID_SNOW)
- 	{
- 		mpeg4_fragment_and_send(f,s,frame,timestamp);
- 		return;
- 	}
--	else if (s->codec==CODEC_ID_MJPEG)
-+	else if (s->codec==AV_CODEC_ID_MJPEG)
- 	{
- 		mblk_t *lqt=NULL;
- 		mblk_t *cqt=NULL;
-@@ -765,7 +765,7 @@ static void split_and_send(MSFilter *f,
- 
- static void process_frame(MSFilter *f, mblk_t *inm){
- 	EncState *s=(EncState*)f->data;
--	AVFrame pict;
-+	AVFrame pict = {};
- 	AVCodecContext *c=&s->av_context;
- 	int error;
- 	mblk_t *comp_buf=s->comp_buf;
-@@ -774,7 +774,7 @@ static void process_frame(MSFilter *f, m
- 
- 	ms_yuv_buf_init_from_mblk(&yuv, inm);
- 	/* convert image if necessary */
--	avcodec_get_frame_defaults(&pict);
-+	av_frame_unref(&pict);
- 	avpicture_fill((AVPicture*)&pict,yuv.planes[0],c->pix_fmt,c->width,c->height);
- 	
- 	/* timestamp used by ffmpeg, unset here */
-@@ -789,7 +789,7 @@ static void process_frame(MSFilter *f, m
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
--	if (s->codec==CODEC_ID_SNOW){
-+	if (s->codec==AV_CODEC_ID_SNOW){
- 		//prepend picture size
- 		uint32_t header=((s->vsize.width&0xffff)<<16) | (s->vsize.height&0xffff);
- 		*(uint32_t*)comp_buf->b_wptr=htonl(header);
-@@ -797,10 +797,15 @@ static void process_frame(MSFilter *f, m
- 		comp_buf_sz-=4;
- 	}
- 
--	error=avcodec_encode_video(c, (uint8_t*)comp_buf->b_wptr,comp_buf_sz, &pict);
-+	AVPacket pkt;
-+	av_init_packet(&pkt);
-+	pkt.data = (uint8_t*)comp_buf->b_wptr;
-+	pkt.size = comp_buf_sz;
-+	int got_packet;
-+	error=avcodec_encode_video2(c, &pkt, &pict, &got_packet);
- 
- 	if (error<=0) ms_warning("ms_AVencoder_process: error %i.",error);
--	else{
-+	else if(got_packet){
- 		s->framenum++;
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
-@@ -808,7 +813,7 @@ static void process_frame(MSFilter *f, m
- 		if (c->coded_frame->pict_type==FF_I_TYPE){
- 			ms_message("Emitting I-frame");
- 		}
--		comp_buf->b_wptr+=error;
-+		comp_buf->b_wptr+=pkt.size;
- 		split_and_send(f,s,comp_buf);
- 	}
- 	freemsg(inm);
-@@ -837,7 +842,7 @@ static int enc_get_br(MSFilter *f, void
- 
- static int enc_set_br(MSFilter *f, void *arg){
- 	EncState *s=(EncState*)f->data;
--	bool_t snow=s->codec==CODEC_ID_SNOW;
-+	bool_t snow=s->codec==AV_CODEC_ID_SNOW;
- 	s->maxbr=*(int*)arg;
- 	if (s->av_context.codec!=NULL){
- 		/*when we are processing, apply new settings immediately*/
-@@ -847,11 +852,11 @@ static int enc_set_br(MSFilter *f, void
- 		ms_filter_unlock(f);
- 		return 0;
- 	}
--	if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){
-+	if (s->maxbr>=1024000 && s->codec!=AV_CODEC_ID_H263P){
- 		s->vsize.width = MS_VIDEO_SIZE_SVGA_W;
- 		s->vsize.height = MS_VIDEO_SIZE_SVGA_H;
- 		s->fps=25;
--	}else if (s->maxbr>=800000 && s->codec!=CODEC_ID_H263P){
-+	}else if (s->maxbr>=800000 && s->codec!=AV_CODEC_ID_H263P){
- 		s->vsize.width = MS_VIDEO_SIZE_VGA_W;
- 		s->vsize.height = MS_VIDEO_SIZE_VGA_H;
- 		s->fps=25;
-@@ -864,7 +869,7 @@ static int enc_set_br(MSFilter *f, void
- 		s->vsize.height=MS_VIDEO_SIZE_CIF_H;
- 		s->fps=17;
- 		s->qmin=3;
--	}else if (s->maxbr>=170000 && s->codec!=CODEC_ID_H263P && s->codec!=CODEC_ID_H263){
-+	}else if (s->maxbr>=170000 && s->codec!=AV_CODEC_ID_H263P && s->codec!=AV_CODEC_ID_H263){
- 		s->vsize.width=MS_VIDEO_SIZE_QVGA_W;
- 		s->vsize.height=MS_VIDEO_SIZE_QVGA_H;
- 		s->fps=15;
-@@ -1075,15 +1080,15 @@ MSFilterDesc ms_mjpeg_enc_desc={
- 
- void __register_ffmpeg_encoders_if_possible(void){
- 	ms_ffmpeg_check_init();
--	if (avcodec_find_encoder(CODEC_ID_MPEG4))
-+	if (avcodec_find_encoder(AV_CODEC_ID_MPEG4))
- 		ms_filter_register(&ms_mpeg4_enc_desc);
--	if (avcodec_find_encoder(CODEC_ID_H263)){
-+	if (avcodec_find_encoder(AV_CODEC_ID_H263)){
- 		ms_filter_register(&ms_h263_enc_desc);
- 		ms_filter_register(&ms_h263_old_enc_desc);
- 	}
--	if (avcodec_find_encoder(CODEC_ID_SNOW))
-+	if (avcodec_find_encoder(AV_CODEC_ID_SNOW))
- 		ms_filter_register(&ms_snow_enc_desc);
--	if (avcodec_find_encoder(CODEC_ID_MJPEG))
-+	if (avcodec_find_encoder(AV_CODEC_ID_MJPEG))
- 	{
- 		ms_filter_register(&ms_mjpeg_enc_desc);
- 	}
-Index: mediastreamer-2.9.0/src/voip/msvideo.c
-===================================================================
---- mediastreamer-2.9.0.orig/src/voip/msvideo.c
-+++ mediastreamer-2.9.0/src/voip/msvideo.c
-@@ -351,21 +351,21 @@ void ms_rgb_to_yuv(const uint8_t rgb[3],
- int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt){
- 	switch(fmt){
- 		case MS_RGBA32:
--			return PIX_FMT_RGBA;
-+			return AV_PIX_FMT_RGBA;
- 		case MS_RGB24:
--			return PIX_FMT_RGB24;
-+			return AV_PIX_FMT_RGB24;
- 		case MS_RGB24_REV:
--			return PIX_FMT_BGR24;
-+			return AV_PIX_FMT_BGR24;
- 		case MS_YUV420P:
--			return PIX_FMT_YUV420P;
-+			return AV_PIX_FMT_YUV420P;
- 		case MS_YUYV:
--			return PIX_FMT_YUYV422;
-+			return AV_PIX_FMT_YUYV422;
- 		case MS_UYVY:
--			return PIX_FMT_UYVY422;
-+			return AV_PIX_FMT_UYVY422;
- 		case MS_YUY2:
--			return PIX_FMT_YUYV422;   /* <- same as MS_YUYV */
-+			return AV_PIX_FMT_YUYV422;   /* <- same as MS_YUYV */
- 		case MS_RGB565:
--			return PIX_FMT_RGB565;
-+			return AV_PIX_FMT_RGB565;
- 		default:
- 			ms_fatal("format not supported.");
- 			return -1;
-@@ -375,19 +375,19 @@ int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt){
- 
- MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt){
- 	switch(fmt){
--		case PIX_FMT_RGB24:
-+		case AV_PIX_FMT_RGB24:
- 			return MS_RGB24;
--		case PIX_FMT_BGR24:
-+		case AV_PIX_FMT_BGR24:
- 			return MS_RGB24_REV;
--		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return MS_YUV420P;
--		case PIX_FMT_YUYV422:
-+		case AV_PIX_FMT_YUYV422:
- 			return MS_YUYV;     /* same as MS_YUY2 */
--		case PIX_FMT_UYVY422:
-+		case AV_PIX_FMT_UYVY422:
- 			return MS_UYVY;
--		case PIX_FMT_RGBA:
-+		case AV_PIX_FMT_RGBA:
- 			return MS_RGBA32;
--		case PIX_FMT_RGB565:
-+		case AV_PIX_FMT_RGB565:
- 			return MS_RGB565;
- 		default:
- 			ms_fatal("format not supported.");

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch
deleted file mode 100644
index 7a164d51639..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
-index 60e38530..52cc3359 100644
---- a/src/videofilters/nowebcam.c
-+++ b/src/videofilters/nowebcam.c
-@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #ifndef NO_FFMPEG
- #include "ffmpeg-priv.h"
- #else
--#define FF_INPUT_BUFFER_PADDING_SIZE 32
-+#define AV_INPUT_BUFFER_PADDING_SIZE 32
- #endif
- 
- #if TARGET_OS_IPHONE
-@@ -1740,7 +1740,7 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
- 			m=ms_load_generate_yuv(reqsize);
- 			return m;
- 		}
--		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE);
- 		if (jpgbuf==NULL)
- 		{
- 			close(fd);
\ No newline at end of file

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
deleted file mode 100644
index 078f360b338..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
-index 38881c1..f306723 100644
---- a/src/videofilters/h264dec.c
-+++ b/src/videofilters/h264dec.c
-@@ -58,10 +58,10 @@ static void dec_open(DecData *d){
- 	int error;
- 	codec=avcodec_find_decoder(CODEC_ID_H264);
- 	if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
--	avcodec_get_context_defaults(&d->av_context);
--	error=avcodec_open(&d->av_context,codec);
-+	avcodec_get_context_defaults3(&d->av_context, NULL);
-+	error=avcodec_open2(&d->av_context,codec, NULL);
- 	if (error!=0){
--		ms_fatal("avcodec_open() failed.");
-+		ms_fatal("avcodec_open2() failed.");
- 	}
- }
- 
-diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
-index 891f618..96f5d7f 100644
---- a/src/videofilters/jpegwriter.c
-+++ b/src/videofilters/jpegwriter.c
-@@ -90,7 +90,7 @@ static void jpg_process(MSFilter *f){
- 			mblk_t *jpegm;
- 			struct SwsContext *sws_ctx;
- 			
--			AVCodecContext *avctx=avcodec_alloc_context();
-+			AVCodecContext *avctx=avcodec_alloc_context3(NULL);
- 			
- 			avctx->width=yuvbuf.w;
- 			avctx->height=yuvbuf.h;
-@@ -98,9 +98,9 @@ static void jpg_process(MSFilter *f){
- 			avctx->time_base.den =1;
- 			avctx->pix_fmt=PIX_FMT_YUVJ420P;
- 
--			error=avcodec_open(avctx,s->codec);
-+			error=avcodec_open2(avctx,s->codec,NULL);
- 			if (error!=0) {
--				ms_error("avcodec_open() failed: %i",error);
-+				ms_error("avcodec_open2() failed: %i",error);
- 				cleanup(s,NULL);
- 				av_free(avctx);
- 				return;
-diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
-index 60e3853..329c453 100644
---- a/src/videofilters/nowebcam.c
-+++ b/src/videofilters/nowebcam.c
-@@ -68,9 +68,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){
- 		return NULL;
- 	}
- 
--	avcodec_get_context_defaults(&av_context);
--	if (avcodec_open(&av_context,codec)<0){
--		ms_error("jpeg2yuv: avcodec_open failed");
-+	avcodec_get_context_defaults3(&av_context, NULL);
-+	if (avcodec_open2(&av_context,codec,NULL)<0){
-+		ms_error("jpeg2yuv: avcodec_open2 failed");
- 		return NULL;
- 	}
- 	av_init_packet(&pkt);
-diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
-index 494debf..c52e207 100644
---- a/src/videofilters/videodec.c
-+++ b/src/videofilters/videodec.c
-@@ -53,7 +53,7 @@ static void dec_init(MSFilter *f, enum CodecID cid){
- 	DecState *s=(DecState *)ms_new0(DecState,1);
- 	ms_ffmpeg_check_init();
- 	
--	avcodec_get_context_defaults(&s->av_context);
-+	avcodec_get_context_defaults3(&s->av_context, NULL);
- 	s->av_codec=NULL;
- 	s->codec=cid;
- 	s->input=NULL;
-@@ -135,8 +135,8 @@ static void dec_preprocess(MSFilter *f){
- 	if (s->av_context.codec==NULL){
- 		/* we must know picture size before initializing snow decoder*/
- 		if (s->codec!=CODEC_ID_SNOW){
--			error=avcodec_open(&s->av_context, s->av_codec);
--			if (error!=0) ms_error("avcodec_open() failed: %i",error);
-+			error=avcodec_open2(&s->av_context, s->av_codec,NULL);
-+			if (error!=0) ms_error("avcodec_open2() failed: %i",error);
- 			if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
- 				s->av_context.extradata=s->dci;
- 				s->av_context.extradata_size=s->dci_size;
-@@ -225,8 +225,8 @@ static mblk_t * parse_snow_header(DecState *s,mblk_t *inm){
- 			int error;
- 			s->av_context.width=h>>16;
- 			s->av_context.height=h&0xffff;
--			error=avcodec_open(&s->av_context, s->av_codec);
--			if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
-+			error=avcodec_open2(&s->av_context, s->av_codec, NULL);
-+			if (error!=0) ms_error("avcodec_open2() failed for snow: %i",error);
- 			else {
- 				s->snow_initialized=TRUE;
- 				ms_message("Snow decoder initialized,size=%ix%i",
-diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
-index da35592..09dcc9d 100644
---- a/src/videofilters/videoenc.c
-+++ b/src/videofilters/videoenc.c
-@@ -242,7 +242,7 @@ static void prepare(EncState *s){
- 	AVCodecContext *c=&s->av_context;
- 	const int max_br_vbv=128000;
- 
--	avcodec_get_context_defaults(c);
-+	avcodec_get_context_defaults3(c, NULL);
- 	if (s->codec==CODEC_ID_MJPEG)
- 	{
- 		ms_message("Codec bitrate set to %i",c->bit_rate);
-@@ -348,9 +348,9 @@ static void enc_preprocess(MSFilter *f){
- 		ms_error("could not find encoder for codec id %i",s->codec);
- 		return;
- 	}
--	error=avcodec_open(&s->av_context, s->av_codec);
-+	error=avcodec_open2(&s->av_context, s->av_codec, NULL);
- 	if (error!=0) {
--		ms_error("avcodec_open() failed: %i",error);
-+		ms_error("avcodec_open2() failed: %i",error);
- 		return;
- 	}
- 	video_starter_init(&s->starter);

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
deleted file mode 100644
index 3bcb8bd3661..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9f448013bd5ea92ce42c99ef3338932ec694b62 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@g.o>
-Date: Wed, 9 Oct 2013 21:18:28 +0200
-Subject: [PATCH] fix tests
-
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4b923a9..4aec221 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -873,6 +873,9 @@ case "$target_os" in
- 		#hack for macport
- 		CUNIT_LIBS+=" -lncurses"
- 	;;
-+	*linux*)
-+		CUNIT_LIBS+=" -lncurses"
-+	;;
- 	*mingw*)
- 		CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501"
- 		LIBS="$LIBS -lws2_32 -liphlpapi"
--- 
-1.8.3.2
-

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
deleted file mode 100644
index 19d6af803c2..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 497ad9c27385c02f4f038b6e787ada9c7b6f8373 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@g.o>
-Date: Wed, 9 Oct 2013 18:24:28 +0200
-Subject: [PATCH] fix underlinking
-
----
- configure.ac    | 20 ++++++++++++++++++++
- src/Makefile.am |  2 +-
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f402bd..4b923a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -893,6 +893,26 @@ fi
- 
- AM_CONDITIONAL(BUILD_TESTS,test x$found_cunit = xyes)
- 
-+dnl Check for clock_gettime, in libc for FreeBSD, in rt for linux,
-+dnl in rt for Solaris 7, in posix4 for Solaris 2.5.1
-+LIB_CLOCK_GETTIME=
-+clk_saved_libs=$LIBS
-+AC_SEARCH_LIBS([clock_gettime], [rt posix4],
-+    [test "$ac_cv_search_clock_gettime" = "none required" ||
-+    LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-+AC_SUBST([LIB_CLOCK_GETTIME])
-+
-+AC_MSG_CHECKING([for working clock_gettime])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
-+    [[clock_gettime(CLOCK_REALTIME, 0);]])], [gnupg_cv_clock_gettime=yes], [gnupg_cv_clock_gettime=no])
-+AC_MSG_RESULT($gnupg_cv_clock_gettime)
-+
-+if test x"$gnupg_cv_clock_gettime" = xyes; then
-+    AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-+    [Define to 1 if you have the `clock_gettime' function.])
-+fi
-+LIBS=$clk_saved_libs
-+
- 
- dnl ##################################################
- dnl # Check for doxygen
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a315e92..a5e144c 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -266,7 +266,7 @@ voipdescs.h:	Makefile $(libmediastreamer_voip_la_SOURCES)
- 	awk 'BEGIN { print("MSFilterDesc * ms_voip_filter_descs[]={") } { printf("&%s,\n",$$1) } END{ print("NULL\n};\n") } ' $$builddir/voipdescs.txt >> $$builddir/$@
- 
- 
--libmediastreamer_base_la_LIBADD=	$(ORTP_LIBS)
-+libmediastreamer_base_la_LIBADD=	$(ORTP_LIBS) @LIB_CLOCK_GETTIME@
- libmediastreamer_base_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
- 
- if !BUILD_WIN32
--- 
-1.8.3.2
-

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
deleted file mode 100644
index c590aef3b71..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b99ddff6f322c8b466f3cdfd71b0d629cea33aac Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@g.o>
-Date: Wed, 9 Oct 2013 18:12:46 +0200
-Subject: [PATCH] Support disabling V4L support completely
-
----
- configure.ac | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 94b6f18..9f402bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -746,6 +746,16 @@ PACKAGE_DATA_DIR="$prefix/share"
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
- AC_SUBST(PACKAGE_DATA_DIR)
- 
-+AC_ARG_ENABLE(v4l,
-+      [  --disable-v4l       Disable usage of v4l],
-+      [case "${enableval}" in
-+        yes) v4l=yes ;;
-+        no)  v4l=no ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
-+      esac],[v4l=yes])
-+
-+if test "$v4l" = "yes" ; then
-+
- dnl check for video4linux headers
- AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
- if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
-@@ -759,9 +769,6 @@ else
- 	found_v4l2=no
- fi
- 
--AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
--AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
--
- AC_ARG_ENABLE(libv4l1,
- 	[AS_HELP_STRING([--disable-libv4l1], [Disable usage of libv4l1, really discouraged])],
- 	[case "${enableval}" in
-@@ -805,6 +812,11 @@ this check.
- 	fi
- fi
- 
-+fi
-+
-+AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
-+AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
-+
- 
- AC_PATH_PROG(PCAP,pcap-config,false)
- AM_CONDITIONAL(HAVE_PCAP, test $PCAP != false)
--- 
-1.8.3.2
-

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch
deleted file mode 100644
index 2337e134300..00000000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald <hasufell@g.o>
-Date: Fri Oct 11 11:37:19 UTC 2013
-Subject: avoid dependency on vim-core
-
---- mediastreamer-2.9.0/src/Makefile.am
-+++ mediastreamer-2.9.0/src/Makefile.am
-@@ -385,9 +385,9 @@
- yuv2rgb.fs.h: yuv2rgb.fs
- 	builddir=`pwd` && \
- 	cd $(top_srcdir)/src && \
--	xxd -i yuv2rgb.fs | sed s/}\;/,0x00}\;/ > $$builddir/yuv2rgb.fs.h
-+	xxdi.pl yuv2rgb.fs | sed s/}\;/0x00}\;/ > $$builddir/yuv2rgb.fs.h
- 
- yuv2rgb.vs.h: yuv2rgb.vs
- 	builddir=`pwd` && \
- 	cd $(top_srcdir)/src && \
--	xxd -i yuv2rgb.vs | sed s/}\;/,0x00}\;/ > $$builddir/yuv2rgb.vs.h
-+	xxdi.pl yuv2rgb.vs | sed s/}\;/0x00}\;/ > $$builddir/yuv2rgb.vs.h

diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
deleted file mode 100644
index e74122e5af5..00000000000
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="https://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
-	ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
-	+speex static-libs test theora upnp v4l video x264 X"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
-	opengl? ( video )
-	theora? ( video )
-	v4l? ( video )
-	video? ( || ( opengl sdl X ) )
-	X? ( video )"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	g726? ( >=media-libs/spandsp-0.0.6_pre1 )
-	gsm? ( media-sound/gsm )
-	opus? ( media-libs/opus )
-	ortp? ( >=net-libs/ortp-0.21.0:=[ipv6?] )
-	pcap? ( sys-libs/libcap )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	upnp? ( net-libs/libupnp:0 )
-	video? (
-		libav? ( >=media-video/libav-9.12:0= )
-		!libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
-		opengl? (
-			media-libs/glew:=
-			virtual/opengl
-			x11-libs/libX11
-		)
-		sdl? ( media-libs/libsdl[video,X] )
-		theora? ( media-libs/libtheora )
-		v4l? (
-			media-libs/libv4l
-			sys-kernel/linux-headers
-		)
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cunit-2.1_p2[ncurses] )
-	video? ( dev-util/xxdi )
-	X? ( x11-base/xorg-proto )
-"
-PDEPEND="
-	amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
-	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
-	ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-v4l-automagic.patch"
-	"${FILESDIR}/${P}-libav9.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-xxd.patch"
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-ffmpeg4.patch"
-)
-
-src_prepare() {
-	default
-
-	# variable causes "command not found" warning and is not
-	# needed anyway
-	sed -i \
-		-e 's/$(ACLOCAL_MACOS_FLAGS)//' \
-		Makefile.am || die
-
-	# respect user's CFLAGS
-	sed -i \
-		-e "s:-O2::;s: -g::" \
-		configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i \
-		-e "s:\(prefix/share\):\1/${PN}:" \
-		configure.ac || die "patching configure.ac failed"
-
-	# fix doc installation dir
-	sed -i \
-		-e "s:\$(pkgdocdir):\$(docdir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# fix html installation dir
-	sed -i \
-		-e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
-		help/Makefile.am || die "patching help/Makefile.am failed"
-
-	# linux/videodev.h dropped in 2.6.38
-	sed -i \
-		-e 's:linux/videodev.h ::' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		# arts is deprecated
-		--disable-artsc
-		# don't want -Werror
-		--disable-strict
-		--disable-libv4l1
-		# don't use bundled libs
-		--enable-external-ortp
-		$(use_enable alsa)
-		$(use_enable coreaudio macsnd)
-		$(use_enable debug)
-		$(use_enable filters)
-		$(use_enable g726 spandsp)
-		$(use_enable gsm)
-		$(use_enable ipv6)
-		$(use_enable ntp-timestamp)
-		$(use_enable opengl glx)
-		$(use_enable opus)
-		$(use_enable ortp)
-		$(use_enable oss)
-		$(use_enable pcap)
-		$(use_enable portaudio)
-		$(use_enable pulseaudio)
-		$(use_enable sdl)
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable theora)
-		$(use_enable upnp)
-		$(use_enable v4l)
-		$(use_enable v4l libv4l2)
-		$(use_enable video)
-		$(use_enable X x11)
-		$(use_enable X xv)
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	# Mac OS X Audio Queue is an audio recording facility, available on
-	# 10.5 (Leopard, Darwin9) and onward
-	if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
-	then
-		myeconfargs+=( --enable-macaqsnd )
-	else
-		myeconfargs+=( --disable-macaqsnd )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tester || die
-	./mediastreamer2_tester || die
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tester/*.c
-	fi
-}

diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
deleted file mode 100644
index dd4bdefeb44..00000000000
--- a/media-libs/mediastreamer/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@g.o</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<use>
-		<flag name="amr">Use of AMR Narrow Band codec plugin</flag>
-		<flag name="filters">Enable compilation of filters</flag>
-		<flag name="g726">Support g726 codec</flag>
-		<flag name="g729">Use g726 codec plugin</flag>
-		<flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
-		<flag name="ntp-timestamp">Turn on NTP timestamping on received
-			packet</flag>
-		<flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
-		<flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
-		<flag name="video">Enable video support</flag>
-	</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 777851ff678..76cb8a5ecf2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -697,12 +697,6 @@ dev-python/quixote
 dev-go/zglob
 dev-go/logrus
 
-# Andreas Sturmlechner <asturm@g.o> (2019-11-30)
-# Version in Gentoo is multiple years old, broken by several dependencies
-# Bugs aren't being fixed: #497412, #509334, #511794, #651010, #654484, #701022
-# Removal in 30 days.
-media-libs/mediastreamer
-
 # Bernard Cafarelli <voyageur@g.o> (2019-11-29)
 # Beta for new major version with initial Python 3 support
 =app-backup/rdiff-backup-1.4.0_beta*