From d00bd6231922986910cf0bbc13619d3d0350b261 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Tue, 29 Jan 2019 18:15:19 -0500 Subject: [PATCH] update patches --- .../dont-err-build-on-uknown-system.patch | 4 +--- debian/patches/ffmpeg_4.patch | 16 ++++++++-------- debian/patches/gcc-optflags.patch | 8 ++++---- debian/patches/series | 8 ++++---- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/debian/patches/dont-err-build-on-uknown-system.patch b/debian/patches/dont-err-build-on-uknown-system.patch index 2d57c36..7912f68 100644 --- a/debian/patches/dont-err-build-on-uknown-system.patch +++ b/debian/patches/dont-err-build-on-uknown-system.patch @@ -1,11 +1,9 @@ Description: Don't fail build intentionally on unknown systems Author: Balint Reczey -diff --git a/include/gpac/configuration.h b/include/gpac/configuration.h -index 2c58fc3..70dcafc 100644 --- a/include/gpac/configuration.h +++ b/include/gpac/configuration.h -@@ -147,8 +147,8 @@ +@@ -159,8 +159,8 @@ #define GPAC_HAS_JPEG #define GPAC_HAS_PNG diff --git a/debian/patches/ffmpeg_4.patch b/debian/patches/ffmpeg_4.patch index 810cf6f..2c705ee 100644 --- a/debian/patches/ffmpeg_4.patch +++ b/debian/patches/ffmpeg_4.patch @@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/modules/ffmpeg_in/ffmpeg_decode.c +++ b/modules/ffmpeg_in/ffmpeg_decode.c -@@ -48,7 +48,7 @@ +@@ -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 */ @@ -25,8 +25,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size); if (oldBuffer) gf_free(oldBuffer); - buffer = gf_malloc( allocatedSz ); -@@ -530,7 +530,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B + 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: @@ -35,7 +35,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ return GF_OK; case GF_CODEC_REORDER: capability->cap.valueInt = 1; -@@ -614,7 +614,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B +@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B break; case GF_CODEC_PADDING_BYTES: @@ -46,7 +46,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ capability->cap.valueInt = 0; --- a/modules/redirect_av/ffmpeg_ts_muxer.c +++ b/modules/redirect_av/ffmpeg_ts_muxer.c -@@ -195,7 +195,7 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe +@@ -201,7 +201,7 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe c->time_base.den = 1000; // some formats want stream headers to be separate if (ts->oc->oformat->flags & AVFMT_GLOBALHEADER) @@ -55,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } #endif -@@ -230,7 +230,7 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe +@@ -240,7 +240,7 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe } // some formats want stream headers to be separate if (ts->oc->oformat->flags & AVFMT_GLOBALHEADER) @@ -66,12 +66,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ //av_set_pts_info(ts->audio_st, 33, 1, audioBitRateInBitsPerSec); --- a/modules/redirect_av/redirect_av.c +++ b/modules/redirect_av/redirect_av.c -@@ -128,7 +128,7 @@ static u32 audio_encoding_thread_run(voi +@@ -133,7 +133,7 @@ static u32 audio_encoding_thread_run(voi AVCodecContext * ctx = NULL; assert( avr ); - outBuffSize = FF_MIN_BUFFER_SIZE; + outBuffSize = AV_INPUT_BUFFER_MIN_SIZE; - outBuff = gf_malloc(outBuffSize* sizeof(u8)); + outBuff = (u8*)gf_malloc(outBuffSize* sizeof(u8)); inBuff = NULL; diff --git a/debian/patches/gcc-optflags.patch b/debian/patches/gcc-optflags.patch index b3e5c9a..7015faa 100644 --- a/debian/patches/gcc-optflags.patch +++ b/debian/patches/gcc-optflags.patch @@ -5,9 +5,9 @@ Forwarded: not-needed configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- gpac.orig/configure -+++ gpac/configure -@@ -351,7 +351,7 @@ for opt do +--- a/configure ++++ b/configure +@@ -360,7 +360,7 @@ for opt do ;; --cpu=*) cpu=`echo $opt | cut -d '=' -f 2` ;; @@ -16,7 +16,7 @@ Forwarded: not-needed ;; --disable-opt) no_gcc_opt="yes" ;; -@@ -686,7 +686,7 @@ fi +@@ -708,7 +708,7 @@ fi #GCC opt if test "$no_gcc_opt" = "no"; then diff --git a/debian/patches/series b/debian/patches/series index 4a88710..21c9e3f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ gcc-optflags.patch -libav10.patch -export_gf_isom_set_pixel_aspect_ratio.patch +#libav10.patch +#export_gf_isom_set_pixel_aspect_ratio.patch dont-err-build-on-uknown-system.patch -skip-swf-test.patch -ffmpeg_2.9.patch +#skip-swf-test.patch +#ffmpeg_2.9.patch ffmpeg_4.patch -- 2.30.2