[packages/strigi] - fix building with ffmpeg 4.0 - rel 11

[baggins]

commit 3a3e482a3726fdd3b7bbf2293c51d3aec6ed1f33
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 28 20:12:44 2018 +0200

    - fix building with ffmpeg 4.0
    - rel 11

 ffmpeg4.patch | 15 +++++++++++++++
 strigi.spec   |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/strigi.spec b/strigi.spec
index 7d3e759..56d4f30 100644
--- a/strigi.spec
+++ b/strigi.spec
@@ -8,7 +8,7 @@ Summary:	Strigi desktop search
 Summary(pl.UTF-8):	System wyszukiwania Strigi
 Name:		strigi
 Version:	0.7.8
-Release:	10
+Release:	11
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
@@ -16,6 +16,7 @@ Source0:	http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-as-needed.patch
 Patch1:		ffmpeg3.patch
 Patch2:		gcc7.patch
+Patch3:		ffmpeg4.patch
 URL:		http://strigi.sourceforge.net/
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -94,6 +95,7 @@ Pliki nagłówkowe dla strigi.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..85d2b3f
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,15 @@
+--- strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig	2018-04-28 19:56:25.000000000 +0200
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2018-04-28 20:07:38.344872689 +0200
+@@ -412,8 +412,10 @@
+         if (size_t len = strlen(p->name)) {
+           ar.addTriplet(streamuri, codecPropertyName, string(p->name, len));
+         }
+-      } else if (size_t len = strlen(codec.codec_name)) {
+-        ar.addTriplet(streamuri, codecPropertyName, string(codec.codec_name, len));
++      } else if (codec.codec) {
++              if (size_t len = strlen(codec.codec->name)) {
++                    ar.addTriplet(streamuri, codecPropertyName, string(codec.codec->name, len));
++              }
+       }
+ /*
+ 00792     } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/strigi.git/commitdiff/3a3e482a3726fdd3b7bbf2293c51d3aec6ed1f33