rev 20374 - in kde-extras/strigi/trunk/debian: . patches

[Maximiliano Curia]

Author: maxy
Date: 2016-03-09 10:26:39 +0000 (Wed, 09 Mar 2016)
New Revision: 20374

Added:
   kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch
Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/patches/series
Log:
Fix build against ffmpeg 3.0. (Closes: #803862)

Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2016-02-17 13:40:13 UTC (rev 20373)
+++ kde-extras/strigi/trunk/debian/changelog	2016-03-09 10:26:39 UTC (rev 20374)
@@ -1,3 +1,12 @@
+strigi (0.7.8-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Andreas Cadhalpun ]
+  * Fix build against ffmpeg 3.0. (Closes: #803862)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Tue, 08 Mar 2016 23:23:53 +0100
+
 strigi (0.7.8-2) unstable; urgency=medium
 
   * Rename lib packages to their v5 version (gcc5 transition).

Added: kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch
===================================================================
--- kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/ffmpeg_2.9.patch	2016-03-09 10:26:39 UTC (rev 20374)
@@ -0,0 +1,35 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+@@ -355,7 +355,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ #endif
+ 
+   if(fc->bit_rate)
+-    ar.addValue(factory->bitrateProperty, fc->bit_rate);
++    ar.addValue(factory->bitrateProperty, (uint32_t)fc->bit_rate);
+   else if (fc->duration!= no_bitrate && fc->duration > 0) {
+     cout<<"Trying to estimate bitrate\n";
+     int64_t size;
+@@ -412,8 +412,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+         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 (size_t len = strlen(avcodec_get_name(codec.codec_id))) {
++        ar.addTriplet(streamuri, codecPropertyName, string(avcodec_get_name(codec.codec_id), len));
+       }
+ /*
+ 00792     } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
+@@ -486,7 +486,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+           outs << stream.avg_frame_rate.num / stream.avg_frame_rate.den;
+           ar.addTriplet(streamuri, frameRatePropertyName, outs.str());
+         }
+-        if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format
++        if (codec.pix_fmt != AV_PIX_FMT_NONE) {}//FIXME pixel format
+       }
+       
+     }

Modified: kde-extras/strigi/trunk/debian/patches/series
===================================================================
--- kde-extras/strigi/trunk/debian/patches/series	2016-02-17 13:40:13 UTC (rev 20373)
+++ kde-extras/strigi/trunk/debian/patches/series	2016-03-09 10:26:39 UTC (rev 20374)
@@ -1,2 +1,3 @@
 deepgrep_mayhem_fix.diff
 libav10.patch
+ffmpeg_2.9.patch