commit: 7609dc75c695e48c508cb5c13ac6afa88b384bb2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Fri Feb 24 08:59:27 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Fri Feb 24 08:59:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7609dc75
media-video/gpac: remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-video/gpac/Manifest | 1 - media-video/gpac/files/ffmpeg25.patch | 43 --- media-video/gpac/files/gpac-0.5.2-avpixfmt.patch | 57 ---- media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch | 307 --------------------- .../gpac/files/gpac-0.5.2-static-libs.patch | 80 ------ media-video/gpac/gpac-0.5.2.ebuild | 120 -------- media-video/gpac/gpac-0.6.1-r1.ebuild | 119 -------- 7 files changed, 727 deletions(-) diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index fed26a3dcd..82a0e27b6d 100644 --- a/media-video/gpac/Manifest +++ b/media-video/gpac/Manifest @@ -1,2 +1 @@ -DIST gpac-0.5.2.tar.gz 9044537 SHA256 14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 b6828953333c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979 WHIRLPOOL d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122 DIST gpac-0.6.1.tar.gz 9113143 SHA256 67d1ac8f8b3e74da0e4e38ea926dc15bca6e9941e8f366e3538abcf13c103c09 SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595 WHIRLPOOL bd0c87841036220623021898f0b82d2364fd37c5254f58cd7db33617350f0864ce9672b8cbfa10f0d08948f2842fe9b19db9f562074c43df6d94cf2b13a7d141 diff --git a/media-video/gpac/files/ffmpeg25.patch b/media-video/gpac/files/ffmpeg25.patch deleted file mode 100644 index 5451b8e119..0000000000 --- a/media-video/gpac/files/ffmpeg25.patch +++ /dev/null @@ -1,43 +0,0 @@ -Add proper versionned checks for avformat_close_input -https://bugs.gentoo.org/show_bug.cgi?id=536526 - -diff --git a/modules/ffmpeg_in/ffmpeg_demux.c b/modules/ffmpeg_in/ffmpeg_demux.c -index a5202ee..975a945 100644 ---- a/modules/ffmpeg_in/ffmpeg_demux.c -+++ b/modules/ffmpeg_in/ffmpeg_demux.c -@@ -301,7 +301,7 @@ static Bool FFD_CanHandleURL(GF_InputService *plug, const char *url) - } - - exit: --#ifndef FF_API_CLOSE_INPUT_FILE -+#if LIBAVFORMAT_VERSION_MAJOR < 54 - if (ctx) av_close_input_file(ctx); - #else - if (ctx) avformat_close_input(&ctx); -@@ -680,7 +680,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv, - - ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1; - if (!ffd->seekable) { --#ifndef FF_API_CLOSE_INPUT_FILE -+#if LIBAVFORMAT_VERSION_MAJOR < 54 - av_close_input_file(ffd->ctx); - #else - avformat_close_input(&ffd->ctx); -@@ -699,7 +699,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv, - - err_exit: - GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e))); --#ifndef FF_API_CLOSE_INPUT_FILE -+#if LIBAVFORMAT_VERSION_MAJOR < 54 - if (ffd->ctx) av_close_input_file(ffd->ctx); - #else - if (ffd->ctx) avformat_close_input(&ffd->ctx); -@@ -757,7 +757,7 @@ static GF_Err FFD_CloseService(GF_InputService *plug) - - ffd->is_running = 0; - --#ifndef FF_API_CLOSE_INPUT_FILE -+#if LIBAVFORMAT_VERSION_MAJOR < 54 - if (ffd->ctx) av_close_input_file(ffd->ctx); - #else - if (ffd->ctx) avformat_close_input(&ffd->ctx); diff --git a/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch b/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch deleted file mode 100644 index 0137a3ba64..0000000000 --- a/media-video/gpac/files/gpac-0.5.2-avpixfmt.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: gpac-0.5.2/applications/dashcast/video_encoder.c -=================================================================== ---- gpac-0.5.2.orig/applications/dashcast/video_encoder.c -+++ gpac-0.5.2/applications/dashcast/video_encoder.c -@@ -86,7 +86,7 @@ int dc_video_encoder_open(VideoOutputFil - video_output_file->codec_ctx->time_base.den = video_data_conf->time_base.den; - video_output_file->codec_ctx->time_base.num = video_data_conf->time_base.num * video_data_conf->time_base.den / video_data_conf->framerate; - } -- video_output_file->codec_ctx->pix_fmt = PIX_FMT_YUV420P; -+ video_output_file->codec_ctx->pix_fmt = AV_PIX_FMT_YUV420P; - video_output_file->codec_ctx->gop_size = video_data_conf->framerate; - - // video_output_file->codec_ctx->codec_id = video_codec->id; -@@ -96,7 +96,7 @@ int dc_video_encoder_open(VideoOutputFil - // video_output_file->codec_ctx->height = video_data_conf->height; - // video_output_file->codec_ctx->time_base = (AVRational) {1 , - // video_output_file->video_data_conf->framerate}; --// video_output_file->codec_ctx->codec->pix_fmt = PIX_FMT_YUV420P; -+// video_output_file->codec_ctx->codec->pix_fmt = AV_PIX_FMT_YUV420P; - video_output_file->codec_ctx->gop_size = video_data_conf->framerate; - // - // av_opt_set(video_output_file->codec_ctx->priv_data, "preset", "ultrafast", 0); -Index: gpac-0.5.2/applications/dashcast/video_muxer.c -=================================================================== ---- gpac-0.5.2.orig/applications/dashcast/video_muxer.c -+++ gpac-0.5.2/applications/dashcast/video_muxer.c -@@ -643,7 +643,7 @@ int dc_ffmpeg_video_muxer_open(VideoOutp - - video_stream->codec->time_base = video_codec_ctx->time_base; - -- video_stream->codec->pix_fmt = PIX_FMT_YUV420P; -+ video_stream->codec->pix_fmt = AV_PIX_FMT_YUV420P; - video_stream->codec->gop_size = video_codec_ctx->time_base.den; //video_output_file->video_data_conf->framerate; - - av_opt_set(video_stream->codec->priv_data, "preset", "ultrafast", 0); -Index: gpac-0.5.2/applications/dashcast/video_scaler.c -=================================================================== ---- gpac-0.5.2.orig/applications/dashcast/video_scaler.c -+++ gpac-0.5.2/applications/dashcast/video_scaler.c -@@ -125,7 +125,7 @@ int dc_video_scaler_data_init(VideoInput - dc_consumer_init(&video_scaled_data->consumer, video_cb_size, name); - - video_scaled_data->num_producers = max_source; -- video_scaled_data->out_pix_fmt = PIX_FMT_YUV420P; -+ video_scaled_data->out_pix_fmt = AV_PIX_FMT_YUV420P; - GF_SAFE_ALLOC_N(video_scaled_data->vsprop, max_source, VideoScaledProp); - memset(video_scaled_data->vsprop, 0, max_source * sizeof(VideoScaledProp)); - -@@ -198,7 +198,7 @@ int dc_video_scaler_scale(VideoInputData - video_scaled_data_node->cropped_frame->width = video_input_data->vprop[index].width - video_input_data->vprop[index].crop_x; - video_scaled_data_node->cropped_frame->height = video_input_data->vprop[index].height - video_input_data->vprop[index].crop_y; - #endif -- if (av_picture_crop((AVPicture*)video_scaled_data_node->cropped_frame, (AVPicture*)video_data_node->vframe, PIX_FMT_YUV420P, video_input_data->vprop[index].crop_y, video_input_data->vprop[index].crop_x) < 0) { -+ if (av_picture_crop((AVPicture*)video_scaled_data_node->cropped_frame, (AVPicture*)video_data_node->vframe, AV_PIX_FMT_YUV420P, video_input_data->vprop[index].crop_y, video_input_data->vprop[index].crop_x) < 0) { - GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler: error while cropping picture.\n")); - return -1; - } diff --git a/media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch b/media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch deleted file mode 100644 index 1cf5487b87..0000000000 --- a/media-video/gpac/files/gpac-0.5.2-ffmpeg29.patch +++ /dev/null @@ -1,307 +0,0 @@ -Index: gpac-0.5.2/modules/ffmpeg_in/ffmpeg_decode.c -=================================================================== ---- gpac-0.5.2.orig/modules/ffmpeg_in/ffmpeg_decode.c -+++ gpac-0.5.2/modules/ffmpeg_in/ffmpeg_decode.c -@@ -102,7 +102,7 @@ static void FFDEC_LoadDSI(FFDec *ffd, GF - } - - switch (codec->id) { -- case CODEC_ID_SVQ3: -+ case AV_CODEC_ID_SVQ3: - { - u32 at_type, size; - size = gf_bs_read_u32(bs); -@@ -240,10 +240,10 @@ static GF_Err FFDEC_AttachStream(GF_Base - (*ctx)->codec_type = AVMEDIA_TYPE_VIDEO; - switch (ffd->oti) { - case GPAC_OTI_VIDEO_MPEG4_PART2: -- codec_id = CODEC_ID_MPEG4; -+ codec_id = AV_CODEC_ID_MPEG4; - break; - case GPAC_OTI_VIDEO_AVC: -- codec_id = CODEC_ID_H264; -+ codec_id = AV_CODEC_ID_H264; - break; - #ifdef HAS_HEVC - case GPAC_OTI_VIDEO_HEVC: -@@ -257,14 +257,14 @@ static GF_Err FFDEC_AttachStream(GF_Base - case GPAC_OTI_VIDEO_MPEG2_SPATIAL: - case GPAC_OTI_VIDEO_MPEG2_HIGH: - case GPAC_OTI_VIDEO_MPEG2_422: -- codec_id = CODEC_ID_MPEG2VIDEO; -+ codec_id = AV_CODEC_ID_MPEG2VIDEO; - break; - case GPAC_OTI_IMAGE_JPEG: -- codec_id = CODEC_ID_MJPEG; -+ codec_id = AV_CODEC_ID_MJPEG; - ffd->is_image=1; - break; - case 0xFF: -- codec_id = CODEC_ID_SVQ3; -+ codec_id = AV_CODEC_ID_SVQ3; - break; - } - } else if (ffd->st==GF_STREAM_AUDIO) { -@@ -273,18 +273,18 @@ static GF_Err FFDEC_AttachStream(GF_Base - case GPAC_OTI_AUDIO_MPEG2_PART3: - case GPAC_OTI_AUDIO_MPEG1: - (*ctx)->frame_size = 1152; -- codec_id = CODEC_ID_MP2; -+ codec_id = AV_CODEC_ID_MP2; - break; - case GPAC_OTI_AUDIO_AC3: -- codec_id = CODEC_ID_AC3; -+ codec_id = AV_CODEC_ID_AC3; - break; - case GPAC_OTI_AUDIO_EAC3: -- codec_id = CODEC_ID_EAC3; -+ codec_id = AV_CODEC_ID_EAC3; - break; - } - } - else if ((ffd->st==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0)) { -- codec_id = CODEC_ID_DVD_SUBTITLE; -+ codec_id = AV_CODEC_ID_DVD_SUBTITLE; - } - *codec = avcodec_find_decoder(codec_id); - } -@@ -375,8 +375,8 @@ static GF_Err FFDEC_AttachStream(GF_Base - #endif //HAS_HEVC - if (!ffd->output_cb_size) ffd->output_cb_size = 4; - -- if (codec_id == CODEC_ID_RAWVIDEO) { -- (*ctx)->codec_id = CODEC_ID_RAWVIDEO; -+ if (codec_id == AV_CODEC_ID_RAWVIDEO) { -+ (*ctx)->codec_id = AV_CODEC_ID_RAWVIDEO; - (*ctx)->pix_fmt = ffd->raw_pix_fmt; - if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = 1; - } else { -@@ -388,7 +388,7 @@ static GF_Err FFDEC_AttachStream(GF_Base - } - /*setup audio streams*/ - if (ffd->st==GF_STREAM_AUDIO) { -- if ((*codec)->id == CODEC_ID_MP2) { -+ if ((*codec)->id == AV_CODEC_ID_MP2) { - (*ctx)->frame_size = ((*ctx)->sample_rate > 24000) ? 1152 : 576; - } - /*may be 0 (cfg not known yet)*/ -@@ -408,17 +408,17 @@ static GF_Err FFDEC_AttachStream(GF_Base - - } else { - switch ((*codec)->id) { -- case CODEC_ID_MJPEG: -- case CODEC_ID_MJPEGB: -- case CODEC_ID_LJPEG: -+ case AV_CODEC_ID_MJPEG: -+ case AV_CODEC_ID_MJPEGB: -+ case AV_CODEC_ID_LJPEG: - #if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(51, 20, 0)) -- case CODEC_ID_GIF: -+ case AV_CODEC_ID_GIF: - #endif -- case CODEC_ID_RAWVIDEO: -+ case AV_CODEC_ID_RAWVIDEO: - ffd->pix_fmt = GF_PIXEL_RGB_24; - break; - -- case CODEC_ID_DVD_SUBTITLE: -+ case AV_CODEC_ID_DVD_SUBTITLE: - #if !defined(FF_API_AVFRAME_LAVC) - *frame = avcodec_alloc_frame(); - #else -@@ -843,7 +843,7 @@ redecode: - } - - -- if ( ctx->codec_id == CODEC_ID_RAWVIDEO) { -+ if ( ctx->codec_id == AV_CODEC_ID_RAWVIDEO) { - if (*outBufferLength != ffd->out_size) { - *outBufferLength = ffd->out_size; - return GF_BUFFER_TOO_SMALL; -@@ -852,7 +852,7 @@ redecode: - *outBufferLength = ffd->out_size; - assert(inBufferLength==ffd->out_size); - -- if (ffd->raw_pix_fmt==PIX_FMT_BGR24) { -+ if (ffd->raw_pix_fmt==AV_PIX_FMT_BGR24) { - s32 i, j; - for (j=0; j<ctx->height; j++) { - u8 *src = (u8 *) inBuffer + j*3*ctx->width; -@@ -940,7 +940,7 @@ redecode: - /*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're - here this means the DSI was broken, so no big deal*/ - avcodec_close(ctx); -- *codec = avcodec_find_decoder(CODEC_ID_H263); -+ *codec = avcodec_find_decoder(AV_CODEC_ID_H263); - - #ifdef USE_AVCTX3 - if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM; -@@ -991,7 +991,7 @@ redecode: - - stride = frame->linesize[0]; - #ifndef NO_10bit -- if ((ctx->pix_fmt == PIX_FMT_YUV420P10LE) && ffd->output_as_8bit && (frame->linesize[0] >= 2*w) ) { -+ if ((ctx->pix_fmt == AV_PIX_FMT_YUV420P10LE) && ffd->output_as_8bit && (frame->linesize[0] >= 2*w) ) { - ffd->conv_to_8bit = 1; - stride=w; - } -@@ -1000,7 +1000,7 @@ redecode: - /*recompute outsize in case on-the-fly change*/ - if ((w != ctx->width) || (h != ctx->height) - || (ffd->direct_output && (stride != ffd->stride)) -- || ((ffd->out_pix_fmt==GF_PIXEL_YV12) && (ctx->pix_fmt != PIX_FMT_YUV420P) && !ffd->output_as_8bit ) -+ || ((ffd->out_pix_fmt==GF_PIXEL_YV12) && (ctx->pix_fmt != AV_PIX_FMT_YUV420P) && !ffd->output_as_8bit ) - //need to realloc the conversion buffer - || (ffd->conv_to_8bit && !ffd->conv_buffer && ffd->direct_output) - ) { -@@ -1011,7 +1011,7 @@ redecode: - } - #ifndef NO_10bit - //this YUV format is handled natively in GPAC -- else if ((ctx->pix_fmt == PIX_FMT_YUV420P10LE) && !ffd->output_as_8bit) { -+ else if ((ctx->pix_fmt == AV_PIX_FMT_YUV420P10LE) && !ffd->output_as_8bit) { - ffd->stride = ffd->direct_output ? frame->linesize[0] : ctx->width*2; - outsize = ffd->stride * ctx->height * 3 / 2; - ffd->out_pix_fmt = GF_PIXEL_YV12_10; -@@ -1157,23 +1157,20 @@ redecode: - if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) { - pict.data[0] = (uint8_t *)outBuffer; - pict.linesize[0] = 3*ctx->width; -- pix_out = PIX_FMT_RGB24; -+ pix_out = AV_PIX_FMT_RGB24; - } else { - pict.data[0] = (uint8_t *)outBuffer; - pict.data[1] = (uint8_t *)outBuffer + ffd->stride * ctx->height; - pict.data[2] = (uint8_t *)outBuffer + 5 * ffd->stride * ctx->height / 4; - pict.linesize[0] = ffd->stride; - pict.linesize[1] = pict.linesize[2] = ffd->stride/2; -- pix_out = PIX_FMT_YUV420P; -+ pix_out = AV_PIX_FMT_YUV420P; - #ifndef NO_10bit - //this YUV format is handled natively in GPAC -- if (ctx->pix_fmt==PIX_FMT_YUV420P10LE) { -- pix_out = PIX_FMT_YUV420P10LE; -+ if (ctx->pix_fmt==AV_PIX_FMT_YUV420P10LE) { -+ pix_out = AV_PIX_FMT_YUV420P10LE; - } - #endif -- if (!mmlevel && frame->interlaced_frame) { -- avpicture_deinterlace((AVPicture *) frame, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height); -- } - } - pict.data[3] = 0; - pict.linesize[3] = 0; -@@ -1263,13 +1260,13 @@ static u32 FFDEC_CanHandleStream(GF_Base - switch (ffd->oti) { - case GPAC_OTI_AUDIO_MPEG2_PART3: - case GPAC_OTI_AUDIO_MPEG1: -- codec_id = CODEC_ID_MP2; -+ codec_id = AV_CODEC_ID_MP2; - break; - case GPAC_OTI_AUDIO_AC3: -- codec_id = CODEC_ID_AC3; -+ codec_id = AV_CODEC_ID_AC3; - break; - case GPAC_OTI_AUDIO_EAC3: -- codec_id = CODEC_ID_EAC3; -+ codec_id = AV_CODEC_ID_EAC3; - break; - } - } -@@ -1309,11 +1306,11 @@ static u32 FFDEC_CanHandleStream(GF_Base - switch (ffd->oti) { - /*MPEG-4 v1 simple profile*/ - case GPAC_OTI_VIDEO_MPEG4_PART2: -- codec_id = CODEC_ID_MPEG4; -+ codec_id = AV_CODEC_ID_MPEG4; - break; - /*H264 (not std OTI, just the way we use it internally)*/ - case GPAC_OTI_VIDEO_AVC: -- codec_id = CODEC_ID_H264; -+ codec_id = AV_CODEC_ID_H264; - break; - #ifdef HAS_HEVC - case GPAC_OTI_VIDEO_HEVC: -@@ -1329,11 +1326,11 @@ static u32 FFDEC_CanHandleStream(GF_Base - case GPAC_OTI_VIDEO_MPEG2_SPATIAL: - case GPAC_OTI_VIDEO_MPEG2_HIGH: - case GPAC_OTI_VIDEO_MPEG2_422: -- codec_id = CODEC_ID_MPEG2VIDEO; -+ codec_id = AV_CODEC_ID_MPEG2VIDEO; - break; - /*JPEG*/ - case GPAC_OTI_IMAGE_JPEG: -- codec_id = CODEC_ID_MJPEG; -+ codec_id = AV_CODEC_ID_MJPEG; - /*return maybe supported as FFMPEG JPEG decoder has some issues with many files, so let's use it only if no - other dec is available*/ - if (avcodec_find_decoder(codec_id) != NULL) -Index: gpac-0.5.2/modules/ffmpeg_in/ffmpeg_demux.c -=================================================================== ---- gpac-0.5.2.orig/modules/ffmpeg_in/ffmpeg_demux.c -+++ gpac-0.5.2/modules/ffmpeg_in/ffmpeg_demux.c -@@ -333,13 +333,13 @@ static GF_ESD *FFD_GetESDescriptor(FFDem - AVCodecContext *dec = ffd->ctx->streams[ffd->audio_st]->codec; - esd->slConfig->timestampResolution = ffd->audio_tscale.den; - switch (dec->codec_id) { -- case CODEC_ID_MP2: -+ case AV_CODEC_ID_MP2: - esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1; - break; -- case CODEC_ID_MP3: -+ case AV_CODEC_ID_MP3: - esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3; - break; -- case CODEC_ID_AAC: -+ case AV_CODEC_ID_AAC: - if (!dec->extradata_size) goto opaque_audio; - esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4; - esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size; -@@ -374,25 +374,25 @@ opaque_audio: - AVCodecContext *dec = ffd->ctx->streams[ffd->video_st]->codec; - esd->slConfig->timestampResolution = ffd->video_tscale.den; - switch (dec->codec_id) { -- case CODEC_ID_MPEG4: -+ case AV_CODEC_ID_MPEG4: - /*there is a bug in fragmentation of raw H264 in ffmpeg, the NALU startcode (0x00000001) is split across - two frames - we therefore force internal ffmpeg codec ID to avoid NALU size recompute - at the decoder level*/ --// case CODEC_ID_H264: -+// case AV_CODEC_ID_H264: - /*if dsi not detected force use ffmpeg*/ - if (!dec->extradata_size) goto opaque_video; - /*otherwise use any MPEG-4 Visual*/ -- esd->decoderConfig->objectTypeIndication = (dec->codec_id==CODEC_ID_H264) ? GPAC_OTI_VIDEO_AVC : GPAC_OTI_VIDEO_MPEG4_PART2; -+ esd->decoderConfig->objectTypeIndication = (dec->codec_id==AV_CODEC_ID_H264) ? GPAC_OTI_VIDEO_AVC : GPAC_OTI_VIDEO_MPEG4_PART2; - esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size; - esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*dec->extradata_size); - memcpy(esd->decoderConfig->decoderSpecificInfo->data, - dec->extradata, - sizeof(char)*dec->extradata_size); - break; -- case CODEC_ID_MPEG1VIDEO: -+ case AV_CODEC_ID_MPEG1VIDEO: - esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1; - break; -- case CODEC_ID_MPEG2VIDEO: -+ case AV_CODEC_ID_MPEG2VIDEO: - esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422; - break; - default: -Index: gpac-0.5.2/modules/Makefile -=================================================================== ---- gpac-0.5.2.orig/modules/Makefile -+++ gpac-0.5.2/modules/Makefile -@@ -100,12 +100,10 @@ endif - - - ifneq ($(CONFIG_FFMPEG), no) --ifneq ($(CONFIG_LIBAV), new) #we don't support libav newest APIs - ifeq ($(CONFIG_OPENHEVC),no) - PLUGDIRS+=ffmpeg_in - endif - endif --endif - - ifeq ($(CONFIG_OPENHEVC), yes) - ifeq ($(CONFIG_FFMPEG), no) diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch b/media-video/gpac/files/gpac-0.5.2-static-libs.patch deleted file mode 100644 index 91c89c4404..0000000000 --- a/media-video/gpac/files/gpac-0.5.2-static-libs.patch +++ /dev/null @@ -1,80 +0,0 @@ -Index: gpac-0.5.2/configure -=================================================================== ---- gpac-0.5.2.orig/configure -+++ gpac-0.5.2/configure -@@ -101,6 +101,7 @@ has_xmlrpc="no" - has_openjpeg="no" - gprof_build="no" - static_build="no" -+static_libs="no" - want_pic="no" - want_gcov="no" - has_joystick="no" -@@ -248,6 +249,7 @@ GPAC configuration options: - --enable-amr-wb enable AMR WB library - --enable-amr enable both AMR NB and WB libraries - --enable-static-bin GPAC static build -+ --enable-static-lib GPAC static libraries build - --static-mp4box configure for static linking of MP4Box. - --enable-depth enables depth handling in the compositor - -@@ -1775,6 +1777,8 @@ for opt do - ;; - --enable-static-bin) static_build="yes"; - ;; -+ --enable-static-lib) static_libs="yes"; -+ ;; - --disable-ipv6) has_ipv6="no" - ;; - --disable-wx) has_wx="no" -@@ -2452,6 +2456,7 @@ echo "** GPAC $version rev$revision Core - echo "debug version: $debuginfo" - echo "GProf enabled: $gprof_build" - echo "Static build enabled: $static_build" -+echo "Static libs build enabled: $static_libs" - echo "Memory tracking enabled: $use_memory_tracking" - echo "Use standard memory allocator: $use_std_alloc" - echo "Fixed-Point Version: $use_fixed_point" -@@ -3064,6 +3069,7 @@ echo "CONFIG_AMR_WB_FT=$has_amr_wb" >> c - echo "DEBUGBUILD=$debuginfo" >> config.mak - echo "GPROFBUILD=$gprof_build" >> config.mak - echo "STATICBUILD=$static_build" >> config.mak -+echo "STATICLIBS=$static_libs" >> config.mak - - echo "CONFIG_IPV6=$has_ipv6" >> config.mak - if test "$has_ipv6" = "yes" ; then -Index: gpac-0.5.2/Makefile -=================================================================== ---- gpac-0.5.2.orig/Makefile -+++ gpac-0.5.2/Makefile -@@ -203,7 +203,9 @@ ifeq ($(GPAC_ENST), yes) - $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst" - endif - mkdir -p "$(DESTDIR)$(prefix)/$(libdir)" -+ifeq ($(STATICLIBS),yes) - $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)" -+endif - $(MAKE) installdylib - - uninstall-lib: -Index: gpac-0.5.2/src/Makefile -=================================================================== ---- gpac-0.5.2.orig/src/Makefile -+++ gpac-0.5.2/src/Makefile -@@ -606,12 +606,16 @@ compositor: $(LIBGPAC_COMPOSITOR) - @echo "OBJS $(OBJS)" - @echo "LIBS $(EXTRALIBS)" - ifeq ($(CONFIG_DARWIN),yes) -+ifeq ($(STATICLIBS),yes) - $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS) - $(RANLIB) ../bin/gcc/libgpac_static.a -+endif - $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) - else -+ifeq ($(STATICLIBS),yes) - $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS) - $(RANLIB) ../bin/gcc/libgpac_static.a -+endif - $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) - ifeq (,$(findstring yes, $(CONFIG_WIN32))) - mv $@ $@.$(VERSION_SONAME) diff --git a/media-video/gpac/gpac-0.5.2.ebuild b/media-video/gpac/gpac-0.5.2.ebuild deleted file mode 100644 index 31467af3ce..0000000000 --- a/media-video/gpac/gpac-0.5.2.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/gpac/gpac"; - KEYWORDS="alpha" -else - SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" -HOMEPAGE="http://gpac.wp.mines-telecom.fr/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid" - -RDEPEND=" - a52? ( media-libs/a52dec ) - aac? ( >=media-libs/faad2-2.0 ) - alsa? ( media-libs/alsa-lib ) - dvb? ( media-tv/linuxtv-dvb-apps ) - ffmpeg? ( virtual/ffmpeg ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg ) - mad? ( >=media-libs/libmad-0.15.1b ) - opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) - >=media-libs/libogg-1.1 - png? ( >=media-libs/libpng-1.4 ) - vorbis? ( >=media-libs/libvorbis-1.1 ) - theora? ( media-libs/libtheora ) - truetype? ( >=media-libs/freetype-2.1.4 ) - xml? ( >=dev-libs/libxml2-2.6.0 ) - xvid? ( >=media-libs/xvid-1.0.1 ) - sdl? ( media-libs/libsdl ) - jpeg2k? ( media-libs/openjpeg:0 ) - ssl? ( dev-libs/openssl ) - pulseaudio? ( media-sound/pulseaudio ) - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXext" -# disabled upstream, see applications/Makefile -# wxwidgets? ( =x11-libs/wxGTK-2.8* ) - -DEPEND="${RDEPEND}" - -my_use() { - local flag="$1" pflag="${2:-$1}" - if use ${flag}; then - echo "--use-${pflag}=system" - else - echo "--use-${pflag}=no" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/110_all_implicitdecls.patch \ - "${FILESDIR}"/${PN}-0.5.2-static-libs.patch \ - "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch \ - "${FILESDIR}"/${PN}-0.5.2-avpixfmt.patch - has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}"/${PN}-0.5.2-ffmpeg29.patch - sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die -} - -src_configure() { - tc-export CC CXX AR RANLIB - # upstream used this internal define to check whether to use the new API - # when it is a guard for deprecating the old one... - append-cflags "-DFF_API_AVFRAME_LAVC=1" - - econf \ - --enable-svg \ - --enable-pic \ - --disable-amr \ - --use-js=no \ - --use-ogg=system \ - $(use_enable alsa) \ - $(use_enable debug) \ - $(use_enable ipv6) \ - $(use_enable jack jack yes) \ - $(use_enable opengl) \ - $(use_enable oss oss-audio) \ - $(use_enable pulseaudio pulseaudio yes) \ - $(use_enable sdl) \ - $(use_enable ssl) \ - $(use_enable static-libs static-lib) \ - --disable-wx \ - $(my_use a52) \ - $(my_use aac faad) \ - $(my_use dvb dvbx) \ - $(my_use ffmpeg) \ - $(my_use jpeg) \ - $(my_use jpeg2k openjpeg) \ - $(my_use mad) \ - $(my_use png) \ - $(my_use theora) \ - $(my_use truetype ft) \ - $(my_use vorbis) \ - $(my_use xvid) \ - --extra-cflags="${CFLAGS}" \ - --cc="$(tc-getCC)" \ - --libdir="/$(get_libdir)" \ - --verbose -} - -src_install() { - emake STRIP="true" DESTDIR="${D}" install - emake STRIP="true" DESTDIR="${D}" install-lib - dodoc AUTHORS BUGS Changelog README TODO - dodoc doc/*.txt - dohtml doc/*.html -} diff --git a/media-video/gpac/gpac-0.6.1-r1.ebuild b/media-video/gpac/gpac-0.6.1-r1.ebuild deleted file mode 100644 index 566713ada3..0000000000 --- a/media-video/gpac/gpac-0.6.1-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/gpac/gpac"; - KEYWORDS="" -else - SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" -HOMEPAGE="http://gpac.wp.mines-telecom.fr/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png - pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" - -RDEPEND=" - a52? ( media-libs/a52dec ) - aac? ( >=media-libs/faad2-2.0 ) - alsa? ( media-libs/alsa-lib ) - dvb? ( media-tv/linuxtv-dvb-apps ) - ffmpeg? ( virtual/ffmpeg ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg ) - mad? ( >=media-libs/libmad-0.15.1b ) - opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) - >=media-libs/libogg-1.1 - png? ( >=media-libs/libpng-1.4 ) - vorbis? ( >=media-libs/libvorbis-1.1 ) - theora? ( media-libs/libtheora ) - truetype? ( >=media-libs/freetype-2.1.4 ) - xml? ( >=dev-libs/libxml2-2.6.0 ) - xvid? ( >=media-libs/xvid-1.0.1 ) - sdl? ( media-libs/libsdl ) - jpeg2k? ( media-libs/openjpeg:0 ) - ssl? ( dev-libs/openssl ) - pulseaudio? ( media-sound/pulseaudio ) - X? ( - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXext - )" -# disabled upstream, see applications/Makefile -# wxwidgets? ( =x11-libs/wxGTK-2.8* ) - -DEPEND="${RDEPEND}" - -my_use() { - local flag="$1" pflag="${2:-$1}" - if use ${flag}; then - echo "--use-${pflag}=system" - else - echo "--use-${pflag}=no" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/110_all_implicitdecls.patch \ - "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \ - "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch - sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die -} - -src_configure() { - tc-export CC CXX AR RANLIB - - econf \ - --enable-svg \ - --enable-pic \ - --disable-amr \ - --use-js=no \ - --use-ogg=system \ - $(use_enable alsa) \ - $(use_enable debug) \ - $(use_enable ipv6) \ - $(use_enable jack jack yes) \ - $(use_enable opengl 3d) \ - $(use_enable oss oss-audio) \ - $(use_enable pulseaudio pulseaudio yes) \ - $(use_enable sdl) \ - $(use_enable ssl) \ - $(use_enable static-libs static-lib) \ - $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \ - --disable-wx \ - $(my_use a52) \ - $(my_use aac faad) \ - $(my_use dvb dvbx) \ - $(my_use ffmpeg) \ - $(my_use jpeg) \ - $(my_use jpeg2k openjpeg) \ - $(my_use mad) \ - $(my_use png) \ - $(my_use theora) \ - $(my_use truetype ft) \ - $(my_use vorbis) \ - $(my_use xvid) \ - --extra-cflags="${CFLAGS}" \ - --cc="$(tc-getCC)" \ - --libdir="/$(get_libdir)" \ - --verbose -} - -src_install() { - emake STRIP="true" DESTDIR="${D}" install - emake STRIP="true" DESTDIR="${D}" install-lib - dodoc AUTHORS BUGS Changelog README.md TODO - dodoc doc/*.txt - dohtml doc/*.html -}
