diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2019-07-18 16:24:39 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:27:26 -0500 |
| commit | 7f26423849c3b492b0123952356ed69f11e40134 (patch) | |
| tree | d2c5f08589868816af7567e4810d6c3b6f99857c /multimedia/gpac | |
| parent | 2012566954daf6273ece3130bdf17b8eee8aaf55 (diff) | |
multimedia/gpac: Patch for ffmpeg-4.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia/gpac')
| -rw-r--r-- | multimedia/gpac/gpac-ffmpeg-4.0.patch | 42 | ||||
| -rw-r--r-- | multimedia/gpac/gpac.SlackBuild | 6 |
2 files changed, 48 insertions, 0 deletions
diff --git a/multimedia/gpac/gpac-ffmpeg-4.0.patch b/multimedia/gpac/gpac-ffmpeg-4.0.patch new file mode 100644 index 000000000000..05132e19e8ff --- /dev/null +++ b/multimedia/gpac/gpac-ffmpeg-4.0.patch @@ -0,0 +1,42 @@ +diff -rupN gpac-0.7.1.orig/applications/dashcast/video_encoder.c gpac-0.7.1/applications/dashcast/video_encoder.c +--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c 2018-04-26 09:19:52.938118328 +0200 ++++ gpac-0.7.1/applications/dashcast/video_encoder.c 2018-04-26 09:20:03.165170164 +0200 +@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil + } + + //the global header gives access to the extradata (SPS/PPS) +- video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + video_output_file->vstream_idx = 0;//video_stream->index; + +diff -rupN gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c +--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c 2018-04-26 09:19:53.034788555 +0200 ++++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c 2018-04-26 09:30:09.739463486 +0200 +@@ -49,7 +49,7 @@ + static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) { + uint8_t * buffer; + /* Size of buffer must be larger, see avcodec_decode_video2 documentation */ +- u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size); ++ u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size); + if (oldBuffer) + gf_free(oldBuffer); + buffer = (uint8_t*)gf_malloc( allocatedSz ); +@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B + capability->cap.valueInt = 1; + return GF_OK; + case GF_CODEC_PADDING_BYTES: +- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE; ++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE; + return GF_OK; + case GF_CODEC_REORDER: + capability->cap.valueInt = 1; +@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B + break; + + case GF_CODEC_PADDING_BYTES: +- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE; ++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE; + break; + default: + capability->cap.valueInt = 0; diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild index 396ceae938fb..c7cd430d33d2 100644 --- a/multimedia/gpac/gpac.SlackBuild +++ b/multimedia/gpac/gpac.SlackBuild @@ -88,6 +88,12 @@ find -L . \ # configure doesn't have --libdir option. sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure +# remove this to let it build against openssl-1.1.x +sed -i "/SSLeay_add_all_algorithms/d" src/utils/downloader.c + +# patch for ffmpeg-4.x +patch -p1 < $CWD/gpac-ffmpeg-4.0.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ |