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

[Maximiliano Curia]

Author: maxy
Date: 2015-08-08 14:51:17 +0000 (Sat, 08 Aug 2015)
New Revision: 20073

Added:
   kde-extras/strigi/trunk/debian/patches/libav10.patch
Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
   kde-extras/strigi/trunk/debian/patches/series
Log:
Import 0.7.8-1.1 NMU

Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2015-08-08 14:50:37 UTC (rev 20072)
+++ kde-extras/strigi/trunk/debian/changelog	2015-08-08 14:51:17 UTC (rev 20073)
@@ -1,3 +1,10 @@
+strigi (0.7.8-1.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add libav10.patch and build against libav10 (Closes: #739442)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 19 Mar 2014 01:03:17 +0000
+
 strigi (0.7.8-1) unstable; urgency=low
 
   * Team upload.

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2015-08-08 14:50:37 UTC (rev 20072)
+++ kde-extras/strigi/trunk/debian/control	2015-08-08 14:51:17 UTC (rev 20073)
@@ -7,8 +7,8 @@
 Build-Depends: cmake (>= 2.8.9),
                dbus-x11,
                debhelper (>= 9),
-               libavcodec-dev,
-               libavformat-dev,
+               libavcodec-dev (>= 6:10~),
+               libavformat-dev (>= 6:10~),
                libboost-dev,
                libbz2-dev,
                libclucene-dev (>= 2),

Added: kde-extras/strigi/trunk/debian/patches/libav10.patch
===================================================================
--- kde-extras/strigi/trunk/debian/patches/libav10.patch	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/libav10.patch	2015-08-08 14:51:17 UTC (rev 20073)
@@ -0,0 +1,16 @@
+Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+===================================================================
+--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2013-02-05 21:34:52.000000000 +0000
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2014-02-28 21:45:10.570587443 +0000
+@@ -481,9 +481,9 @@
+           outs << codec.height;
+           ar.addTriplet(streamuri, heightPropertyName, outs.str());
+         }
+-        if (stream.r_frame_rate.num && stream.r_frame_rate.den) {
++        if (stream.avg_frame_rate.num && stream.avg_frame_rate.den) {
+           ostringstream outs;
+-          outs << stream.r_frame_rate.num / stream.r_frame_rate.den;
++          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

Modified: kde-extras/strigi/trunk/debian/patches/series
===================================================================
--- kde-extras/strigi/trunk/debian/patches/series	2015-08-08 14:50:37 UTC (rev 20072)
+++ kde-extras/strigi/trunk/debian/patches/series	2015-08-08 14:51:17 UTC (rev 20073)
@@ -1 +1,2 @@
 deepgrep_mayhem_fix.diff
+libav10.patch