From 4ba89c1e03ad9f60cefb879f6f6b906cb9653bf2 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 29 Apr 2017 08:51:36 +0100 Subject: [PATCH] Update to 0.7.1 --- .gitignore | 1 + fix_typo.patch | 23 +++++++++++++++++++++++ gpac.spec | 10 ++++++++-- sources | 2 +- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 fix_typo.patch diff --git a/.gitignore b/.gitignore index 7781625..b4fffff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gpac-20141206.tar.xz gpac-0.6.0.tar.gz gpac-0.6.1.tar.gz +/gpac-0.7.1.tar.gz diff --git a/fix_typo.patch b/fix_typo.patch new file mode 100644 index 0000000..0f5f1da --- /dev/null +++ b/fix_typo.patch @@ -0,0 +1,23 @@ +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 bedb0e0..0d6cd3b 100644 --- a/gpac.spec +++ b/gpac.spec @@ -16,8 +16,8 @@ Name: gpac Summary: MPEG-4 multimedia framework -Version: 0.6.1 -Release: 4%{?git:.%{git}git}%{?dist} +Version: 0.7.1 +Release: 1%{?git:.%{git}git}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ @@ -25,6 +25,8 @@ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.ta # 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 #Source9: gpac-snapshot.sh BuildRequires: ImageMagick @@ -143,6 +145,7 @@ web browsers. %if 0%{?fedora} >= 26 %patch0 -p1 %endif +%patch1 -p1 rm -r extra_lib/ # Fix encoding warnings cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine @@ -311,6 +314,9 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h %changelog +* Sat Apr 29 2017 Leigh Scott - 0.7.1-1 +- Update to 0.7.1 + * Sun Mar 19 2017 RPM Fusion Release Engineering - 0.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index fd6d81a..b8b37ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29c02dcb870073150f9d26e7410cc433 gpac-0.6.1.tar.gz +3b78b7b5bc022bbdeca193cc80281960 gpac-0.7.1.tar.gz