Hello community, here is the log from the commit of package strigi for openSUSE:Factory checked in at 2016-05-08 10:40:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/strigi (Old) and /work/SRC/openSUSE:Factory/.strigi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "strigi" Changes: -------- --- /work/SRC/openSUSE:Factory/strigi/strigi.changes 2016-01-08 15:39:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.strigi.new/strigi.changes 2016-05-08 10:41:00.000000000 +0200 @@ -1,0 +2,12 @@ +Tue May 3 12:21:57 UTC 2016 - aloisio@gmx.com + +- Added strigi-ffmpeg_3.0.patch (deb#803862) and switched + to ffmpeg 3.0 on PMBS + +------------------------------------------------------------------- +Tue Apr 19 10:06:21 UTC 2016 - joerg.lorenzen@ki.tng.de + +- Force build against ffmpeg < 3.0 on PMBS (build against ffmpeg + version >= 3.0 currently fails). + +------------------------------------------------------------------- New: ---- strigi-ffmpeg_3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strigi.spec ++++++ --- /var/tmp/diff_new_pack.y4kMFf/_old 2016-05-08 10:41:01.000000000 +0200 +++ /var/tmp/diff_new_pack.y4kMFf/_new 2016-05-08 10:41:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package strigi # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Patch2: bug_304439.diff # PATCH-FIX-UPSTREAM strigi-gcc48.patch -- Add STREAMS_EXPORT to class decl., fixes build with gcc48 Patch3: strigi-gcc48.patch +# Via (deb#803862) +Patch4: strigi-ffmpeg_3.0.patch BuildRequires: bison BuildRequires: c++_compiler BuildRequires: clucene-core-devel @@ -94,6 +96,9 @@ %patch1 %patch2 -p1 %patch3 -p1 +%if %{with ffmpeg} +%patch4 -p1 +%endif %build %cmake_kde4 -d build -- -DENABLE_REGENERATEXSD=off ++++++ strigi-ffmpeg_3.0.patch ++++++ Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp =================================================================== --- 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.r_frame_rate.num / stream.r_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 } }