- up to 0.7.8

diff --git a/strigi-0.7.7-ffmpeg-0.11.patch b/strigi-0.7.7-ffmpeg-0.11.patch
deleted file mode 100644 (file)
index 465eda4..0000000
--- a/strigi-0.7.7-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Source: Mandriva patch
-Upstream: No bug report on bugs.kde.org
-Reason: libstreamanalyzer uses deprecated symbols from ffmpeg removed in 0.11
---- strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.bero       2012-06-08 16:49:40.846877030 +0200
-+++ strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp    2012-06-08 17:27:40.416888115 +0200
-@@ -305,13 +305,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-   uint8_t pDataBuffer[32768];//65536];
-   long lSize = 32768;
- 
--  ByteIOContext ByteIOCtx;
--  if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL, seek_data) < 0)
--    return -1;
--
--  //pAVInputFormat->flags |= AVFMT_NOFILE;
--  ByteIOCtx.is_streamed = 0;
--
-   AVProbeData pd;
-   const char *buf;
-   pd.filename ="";
-@@ -324,14 +317,27 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-   if(fmt == NULL)
-     return 1;
- 
--  AVFormatContext *fc = NULL;
--  if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0)
-+  AVFormatContext *fc = avformat_alloc_context();
-+  if(!fc)
-+    return -1;
-+
-+  AVIOContext *pb = avio_alloc_context(pDataBuffer, lSize, 0, in, read_data, NULL, seek_data);
-+  if(!fc->pb) {
-+    av_free(fc);
-     return -1;
-+  }
-+
-+  fc->pb = pb;
-+
-+  if(avformat_open_input(&fc, "", fmt, NULL) < 0) {
-+    av_free(fc);
-+    return -1;
-+  }
- 
--  av_find_stream_info(fc);
-+  avformat_find_stream_info(fc, NULL);
-   
-   // Dump information about file onto standard error
--  dump_format(fc, 0, ar.path().c_str(), false);
-+  av_dump_format(fc, 0, ar.path().c_str(), false);
- 
-   if(fc->bit_rate)
-     ar.addValue(factory->bitrateProperty, fc->bit_rate);
-@@ -372,10 +378,10 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-         ar.addTriplet(streamuri, durationPropertyName,outs.str());
-       }
- 
--      //FIXME we must stop using the deprecated fuction av_metadata_get and use
-+      //FIXME we must stop using the deprecated fuction av_dict_get and use
-       // av_dict_get once we are able to detect the version of FFMpeg being used
-       // using version macros. same goes for all occurences of this function.
--      AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
-+      AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0);
-       if (entry != NULL) {
-         const char *languageValue = entry->value;
-         if (size_t len = strlen(languageValue)) {
-@@ -430,7 +436,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-           outs << codec.sample_rate;
-           ar.addTriplet(streamuri, sampleratePropertyName, outs.str());
-         }
--        if (codec.sample_fmt != SAMPLE_FMT_NONE) {}//FIXME sample format
-+        if (codec.sample_fmt != AV_SAMPLE_FMT_NONE) {}//FIXME sample format
-           
-       } else { // video stream
-         
-@@ -469,7 +475,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
- 
-   // Tags
- 
--  AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
-+  AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *titleValue = entry->value;
-@@ -478,7 +484,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "author", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "author", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *authorValue = entry->value;
-@@ -490,7 +496,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "copyright", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *copyrightValue = entry->value;
-@@ -499,7 +505,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "comment", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *commentValue = entry->value;
-@@ -508,7 +514,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "album", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "album", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *albumValue = entry->value;
-@@ -520,7 +526,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "genre", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *genreValue = entry->value;
-@@ -529,7 +535,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "track", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "track", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *trackValue = entry->value;
-@@ -538,7 +544,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  entry = av_metadata_get(fc->metadata, "year", NULL, 0);
-+  entry = av_dict_get(fc->metadata, "year", NULL, 0);
-   if (entry != NULL)
-   {
-     const char *yearValue = entry->value;
-@@ -547,7 +553,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
-     }
-   }
- 
--  av_close_input_stream(fc);
-+  avformat_close_input(&fc);
-+  av_free(pb);
-   //url_fclose(&ByteIOCtx);
-   
-   return 0;

diff --git a/strigi-gcc47.patch b/strigi-gcc47.patch
deleted file mode 100644 (file)
index 9b42771..0000000
--- a/strigi-gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp.gcc47 strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
---- strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp.gcc47    2011-07-14 20:29:31.000000000 -0500
-+++ strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp  2012-01-09 10:59:14.061837577 -0600
-@@ -27,9 +27,7 @@
- #include <iostream>
- #include <stdio.h>
- 
--#if defined(__SUNPRO_CC)
- #include <unistd.h>
--#endif
- 
- using namespace std;
- 

diff --git a/strigi.spec b/strigi.spec
index 403930c7d5d77d901fafdba01c287a3a40ed0a1b..3f7fa27714a05bae7480ec6d001c1f8d9cdcd91a 100644 (file)
--- a/strigi.spec
+++ b/strigi.spec
@@ -8,16 +8,13 @@
 Summary:       Strigi desktop search
 Summary(pl.UTF-8):     System wyszukiwania Strigi
 Name:          strigi
-Version:       0.7.7
-Release:       6
+Version:       0.7.8
+Release:       1
 License:       GPL
 Group:         X11/Applications
-#Source0:      http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
-Source0:       http://rdieter.fedorapeople.org/strigi/%{name}-%{version}.tar.bz2
-# Source0-md5: d3ba1bf03978dfa793ab18c3f0c57d02
+Source0:       http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
+# Source0-md5: d69443234f4286d71997db9de543331a
 Patch1:                %{name}-as-needed.patch
-Patch2:                %{name}-gcc47.patch
-Patch3:                strigi-0.7.7-ffmpeg-0.11.patch
 URL:           http://strigi.sourceforge.net/
 BuildRequires: QtDBus-devel >= %{qtver}
 BuildRequires: QtGui-devel >= %{qtver}
@@ -85,8 +82,6 @@ Pliki nagłówkowe dla strigi.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 install -d build
@@ -94,7 +89,7 @@ cd build
 # add this to get verbose output
 #-DCMAKE_VERBOSE_MAKEFILE=1 \
 %cmake \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DCMAKE_INSTALL_LIBDIR=%{_lib} \
        -DCMAKE_AR=/usr/bin/ar \
        -DFORCE_DEPS=1 \
        -DENABLE_INOTIFY=1 \
@@ -145,15 +140,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libstreams.so
 %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
-%{_libdir}/libstreams/LibStreamsTargets-pld.cmake
-%{_libdir}/libstreams/LibStreamsTargets.cmake
+%{_libdir}/cmake/Strigi/*.cmake
+%dir %{_libdir}/cmake/LibSearchClient
+%{_libdir}/cmake/LibSearchClient/LibSearchClientConfig.cmake
+%dir %{_libdir}/cmake/LibStreamAnalyzer
+%{_libdir}/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
+%{_libdir}/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
+%dir %{_libdir}/cmake/LibStreams
+%{_libdir}/cmake/LibStreams/LibStreamsConfig.cmake
+%{_libdir}/cmake/LibStreams/LibStreamsConfigVersion.cmake
+%{_libdir}/cmake/LibStreams/LibStreamsTargets-pld.cmake
+%{_libdir}/cmake/LibStreams/LibStreamsTargets.cmake
 %dir %{_includedir}/strigi
 %{_includedir}/strigi/*.h
 %{_includedir}/strigi/qtdbus