Author: arekm Date: Wed Jul 27 07:52:30 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.7.5
---- Files affected: packages/strigi: strigi.spec (1.40 -> 1.41) , strigi-ffmpeg.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/strigi/strigi.spec diff -u packages/strigi/strigi.spec:1.40 packages/strigi/strigi.spec:1.41 --- packages/strigi/strigi.spec:1.40 Wed Mar 23 09:57:41 2011 +++ packages/strigi/strigi.spec Wed Jul 27 09:52:25 2011 @@ -3,18 +3,19 @@ # Conditional build: %bcond_without dbus # dbus support # -%define qtver 4.6.1 +%define qtver 4.6.3 #%define _svnver 850421 Summary: Strigi desktop search Summary(pl.UTF-8): System wyszukiwania Strigi Name: strigi -Version: 0.7.2 -Release: 4 +Version: 0.7.5 +Release: 1 License: GPL Group: X11/Applications Source0: http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2 -# Source0-md5: ca09ba176cf3ffe9afce4d92f38f9a85 +# Source0-md5: 0559e2ab65d187d30916e9ffe36e0fb6 +Patch0: %{name}-ffmpeg.patch URL: http://strigi.sourceforge.net/ BuildRequires: QtDBus-devel >= %{qtver} BuildRequires: QtGui-devel >= %{qtver} @@ -80,6 +81,8 @@ %prep %setup -q +cd libstreamanalyzer +%patch0 -p1 %build install -d build @@ -138,6 +141,12 @@ %attr(755,root,root) %{_libdir}/libstrigihtmlgui.so %attr(755,root,root) %{_libdir}/libstrigiqtdbusclient.so %{_libdir}/strigi/*.cmake +%dir %{_libdir}/libsearchclient +%{_libdir}/libsearchclient/LibSearchClientConfig.cmake +%dir %{_libdir}/libstreamanalyzer +%{_libdir}/libstreamanalyzer/LibStreamAnalyzerConfig.cmake +%dir %{_libdir}/libstreams +%{_libdir}/libstreams/LibStreamsConfig.cmake %dir %{_includedir}/strigi %{_includedir}/strigi/*.h %{_includedir}/strigi/qtdbus @@ -150,6 +159,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.41 2011/07/27 07:52:25 arekm +- up to 0.7.5 + Revision 1.40 2011/03/23 08:57:41 jajcus - Release: 4 (rebuild with exiv 0.21) ================================================================ Index: packages/strigi/strigi-ffmpeg.patch diff -u /dev/null packages/strigi/strigi-ffmpeg.patch:1.1 --- /dev/null Wed Jul 27 09:52:30 2011 +++ packages/strigi/strigi-ffmpeg.patch Wed Jul 27 09:52:25 2011 @@ -0,0 +1,193 @@ +From: Tirtha Chatterjee <[email protected]> +Date: Tue, 21 Jun 2011 19:16:55 +0000 +Subject: used the new API of ffmpeg, fixes a build issue with ffmpeg from git. +X-Git-Tag: v0.7.6 +X-Git-Url: http://quickgit.kde.org/?p=libstreamanalyzer.git&a=commitdiff&h=4cfbe1fe673b48797bbea0b98c81d7ccf05a1d72 +--- +used the new API of ffmpeg, fixes a build issue with ffmpeg from git. +--- + + +--- a/plugins/endplugins/ffmpegendanalyzer.cpp ++++ b/plugins/endplugins/ffmpegendanalyzer.cpp +@@ -348,7 +348,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + if ((size = in->size()) >= 0) + ar.addValue(factory->durationProperty, (uint32_t)(size/(fc->bit_rate/8))); + } +- if(fc->nb_streams==1 && fc->streams[0]->codec->codec_type == CODEC_TYPE_AUDIO) { ++ if(fc->nb_streams==1 && fc->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + ar.addValue(factory->typeProperty, NFO "Audio"); + ar.addValue(factory->typeProperty, NMM_DRAFT "MusicPiece"); + } else { +@@ -359,7 +359,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + const AVStream &stream = *fc->streams[i]; + const AVCodecContext &codec = *stream.codec; + +- if (codec.codec_type == CODEC_TYPE_AUDIO || codec.codec_type == CODEC_TYPE_VIDEO) { ++ if (codec.codec_type == AVMEDIA_TYPE_AUDIO || codec.codec_type == AVMEDIA_TYPE_VIDEO) { + const string streamuri = ar.newAnonymousUri(); + ar.addValue(factory->hasPartProperty, streamuri); + ar.addTriplet(streamuri, partOfPropertyName, ar.path()); +@@ -370,8 +370,16 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + outs << (stream.duration * stream.time_base.num / stream.time_base.den); + ar.addTriplet(streamuri, durationPropertyName,outs.str()); + } +- if (size_t len = strlen(stream.language)) { +- ar.addTriplet(streamuri, languagePropertyName, string(stream.language, len)); ++#if FF_API_OLD_METADATA2 ++ AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0); ++#else ++ AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0); ++#endif ++ if (entry != NULL) { ++ const char *languageValue = entry->value; ++ if (size_t len = strlen(languageValue)) { ++ ar.addTriplet(streamuri, languagePropertyName, string(languageValue, len)); ++ } + } + const AVCodec *p = avcodec_find_decoder(codec.codec_id); + if (p) { +@@ -408,7 +416,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + ar.addTriplet(streamuri, bitratePropertyName, outs.str()); + } + +- if (codec.codec_type == CODEC_TYPE_AUDIO) { ++ if (codec.codec_type == AVMEDIA_TYPE_AUDIO) { + + ar.addTriplet(streamuri, typePropertyName, audioClassName); + if (codec.channels) { +@@ -458,36 +466,107 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul + } + + // Tags +- +- if (int32_t len = strlen(fc->title)) { +- ar.addValue(factory->titleProperty, string(fc->title, len) ); +- } +- if (int32_t len = strlen(fc->author)) { +- const string creatoruri = ar.newAnonymousUri(); +- ar.addValue(factory->creatorProperty, creatoruri); +- ar.addTriplet(creatoruri, typePropertyName, contactClassName); +- ar.addTriplet(creatoruri, fullnamePropertyName, string(fc->author, len) ); +- } +- if (int32_t len = strlen(fc->copyright)) { +- ar.addValue(factory->copyrightProperty, string(fc->copyright, len) ); +- } +- if (int32_t len = strlen(fc->comment)) { +- ar.addValue(factory->commentProperty, string(fc->comment, len) ); +- } +- if (int32_t len = strlen(fc->album)) { +- const string album = ar.newAnonymousUri(); +- ar.addValue(factory->albumProperty, album); ++#if FF_API_OLD_METADATA2 ++ AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0); ++#else ++ AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *titleValue = entry->value; ++ if (int32_t len = strlen(titleValue)) { ++ ar.addValue(factory->titleProperty, string(titleValue, len) ); ++ } ++ } ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "author", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "author", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *authorValue = entry->value; ++ if (int32_t len = strlen(authorValue)) { ++ const string creatoruri = ar.newAnonymousUri(); ++ ar.addValue(factory->creatorProperty, creatoruri); ++ ar.addTriplet(creatoruri, typePropertyName, contactClassName); ++ ar.addTriplet(creatoruri, fullnamePropertyName, string(authorValue, len) ); ++ } ++ } ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "copyright", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "copyright", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *copyrightValue = entry->value; ++ if (int32_t len = strlen(copyrightValue)) { ++ ar.addValue(factory->copyrightProperty, string(copyrightValue, len) ); ++ } ++ } ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "comment", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "comment", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *commentValue = entry->value; ++ if (int32_t len = strlen(commentValue)) { ++ ar.addValue(factory->commentProperty, string(commentValue, len) ); ++ } ++ } ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "album", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "album", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *albumValue = entry->value; ++ if (int32_t len = strlen(albumValue)) { ++ const string album = ar.newAnonymousUri(); ++ ar.addValue(factory->albumProperty, album); + ar.addTriplet(album, typePropertyName, albumClassName); +- ar.addTriplet(album, titlePropertyName, string(fc->album, len) ); ++ ar.addTriplet(album, titlePropertyName, string(albumValue, len) ); ++ } + } +- if (int32_t len = strlen(fc->genre)) { +- ar.addValue(factory->genreProperty, string(fc->genre, len) ); ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "genre", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "genre", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *genreValue = entry->value; ++ if (int32_t len = strlen(genreValue)) { ++ ar.addValue(factory->genreProperty, string(genreValue, len) ); ++ } + } +- if (fc->track) { +- ar.addValue(factory->trackProperty, fc->track); ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "track", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "track", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *trackValue = entry->value; ++ if (int32_t len = strlen(trackValue)) { ++ ar.addValue(factory->trackProperty, string(trackValue, len) ); ++ } + } +- if (fc->year) { +- ar.addValue(factory->createdProperty, fc->year); ++#if FF_API_OLD_METADATA2 ++ entry = av_metadata_get(fc->metadata, "year", NULL, 0); ++#else ++ entry = av_dict_get(fc->metadata, "year", NULL, 0); ++#endif ++ if (entry != NULL) ++ { ++ const char *yearValue = entry->value; ++ if (int32_t len = strlen(yearValue)) { ++ ar.addValue(factory->createdProperty, string(yearValue, len) ); ++ } + } + + av_close_input_stream(fc); + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/strigi/strigi.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
