diff --git a/.gitignore b/.gitignore index b4fffff..47e12ab 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gpac-20141206.tar.xz gpac-0.6.0.tar.gz gpac-0.6.1.tar.gz /gpac-0.7.1.tar.gz +/gpac-0.8.0.tar.gz diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch deleted file mode 100644 index f6f718f..0000000 --- a/ffmpeg35_buildfix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/applications/dashcast/video_encoder.c -+++ b/applications/dashcast/video_encoder.c -@@ -144,7 +144,7 @@ - } - - //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; - - ---- a/modules/ffmpeg_in/ffmpeg_decode.c -+++ b/modules/ffmpeg_in/ffmpeg_decode.c -@@ -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 @@ - 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 @@ - 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/fix_typo.patch b/fix_typo.patch deleted file mode 100644 index 0f5f1da..0000000 --- a/fix_typo.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 669258a21dcc9827e1496c460af0bff83aa5d654 Mon Sep 17 00:00:00 2001 -From: Romain Bouqueau -Date: Thu, 27 Apr 2017 13:32:14 +0200 -Subject: [PATCH] fix typo - -fix #815 ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9849173..1ac8eaf 100644 ---- a/Makefile -+++ b/Makefile -@@ -112,7 +112,7 @@ ifneq ($(CONFIG_WIN32), yes) - ifneq ($(CONFIG_FFMPEG), no) - ifneq ($(DISABLE_CORE_TOOLS), yes) - ifneq ($(DISABLE_AV_PARSERS), yes) -- if [ -f bin/gcc/DashCast$(EXE_SUFFIX)g ] ; then \ -+ if [ -f bin/gcc/DashCast$(EXE_SUFFIX) ] ; then \ - $(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \ - fi - endif diff --git a/gpac.spec b/gpac.spec index d746429..8f39de0 100644 --- a/gpac.spec +++ b/gpac.spec @@ -8,18 +8,11 @@ Name: gpac Summary: MPEG-4 multimedia framework -Version: 0.7.1 -Release: 11%{?git:.%{git}git}%{?dist} +Version: 0.8.0 +Release: 1%{?dist} License: LGPLv2+ URL: http://gpac.sourceforge.net/ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.tar.gz -# https://github.com/openssl/openssl/issues/1543 -# Simply remove the call to SSLeay_add_all_algorithms, the addition is now done automatically and internally in libssl. -Patch0: openssl-1.1.0.patch -# Upstream commit, fix typo -Patch1: https://github.com/gpac/gpac/commit/669258a21dcc9827e1496c460af0bff83aa5d654.patch#/fix_typo.patch -# Build fix for ffmpeg-3.5 -Patch2: ffmpeg35_buildfix.patch #Source9: gpac-snapshot.sh BuildRequires: ImageMagick @@ -152,6 +145,8 @@ touch -r Changelog %{buildroot}%{_includedir}/gpac/*.h touch -r Changelog %{buildroot}%{_includedir}/gpac/internal/*.h touch -r Changelog %{buildroot}%{_includedir}/gpac/modules/*.h rm %{buildroot}%{_includedir}/gpac/config.h +rm %{buildroot}%{_includedir}/win32/* +rm %{buildroot}%{_includedir}/wince/errno.h %ldconfig_scriptlets libs @@ -186,6 +181,9 @@ rm %{buildroot}%{_includedir}/gpac/config.h %changelog +* Tue Aug 06 2019 Sérgio Basto - 0.8.0-1 +- Update GPAC to 0.8.0 + * Tue Aug 06 2019 Leigh Scott - 0.7.1-11 - Rebuild for new ffmpeg version diff --git a/openssl-1.1.0.patch b/openssl-1.1.0.patch deleted file mode 100644 index 5d95a23..0000000 --- a/openssl-1.1.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/utils/downloader.c -+++ b/src/utils/downloader.c -@@ -391,7 +391,6 @@ - } - SSL_library_init(); - SSL_load_error_strings(); -- SSLeay_add_all_algorithms(); - SSLeay_add_ssl_algorithms(); - _ssl_is_initialized = GF_TRUE; - GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n")); - diff --git a/sources b/sources index b8b37ed..9faf7ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b78b7b5bc022bbdeca193cc80281960 gpac-0.7.1.tar.gz +06ecb86b4da83e2d38e108f513c2ed8a gpac-0.8.0.tar.gz