[packages/gtatool] - fix building with ffmpeg 4.0 - rel 18

[baggins]

commit 575f20de43be8ba57aadda9f0349c702699a7602
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 29 19:02:07 2018 +0200

    - fix building with ffmpeg 4.0
    - rel 18

 ffmpeg4.patch | 11 +++++++++++
 gtatool.spec  |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/gtatool.spec b/gtatool.spec
index e3d7c7a..2e61a8a 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -24,7 +24,7 @@ Summary:	Tools to manipulate Generic Tagged Array (GTA) files
 Summary(pl.UTF-8):	Narzędzia do obróbki plików GTA (ogólnych tablic etykietowanych)
 Name:		gtatool
 Version:	2.0.1
-Release:	17
+Release:	18
 License:	GPL v3+
 Group:		Applications/File
 Source0:	http://download.savannah.gnu.org/releases/gta/%{name}-%{version}.tar.xz
@@ -35,6 +35,7 @@ Patch2:		%{name}-bashcomp.patch
 Patch3:		pfstools2.patch
 Patch4:		ffmpeg3.patch
 Patch5:		imagemagick7.patch
+Patch6:		ffmpeg4.patch
 URL:		http://gta.nongnu.org/gtatool.html
 %{?with_magick:BuildRequires:	ImageMagick-c++-devel}
 %{?with_openexr:BuildRequires:	OpenEXR-devel}
@@ -290,6 +291,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..d60f54e
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,11 @@
+--- gtatool-2.0.1/src/conv-ffmpeg/media_object.cpp~	2018-04-29 18:57:24.000000000 +0200
++++ gtatool-2.0.1/src/conv-ffmpeg/media_object.cpp	2018-04-29 18:59:29.051110754 +0200
+@@ -908,8 +908,6 @@
+ #ifdef FF_API_LOWRES
+             lowres = codec_ctx->lowres;
+ #endif
+-            if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
+-                codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
+         }
+         // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
+         if (codec_ctx->codec_id != AV_CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtatool.git/commitdiff/575f20de43be8ba57aadda9f0349c702699a7602