Updated to 0.7.7, new source URL

Removed obsolete patches
Added fix to build with gcc 4.7

diff --git a/strigi-ffmpeg.patch b/strigi-ffmpeg.patch
deleted file mode 100644 (file)
index 4954dbc..0000000
--- a/strigi-ffmpeg.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From: Tirtha Chatterjee <tirtha.p.chatterjee@gmail.com>
-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&amp;a=commitdiff&amp;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);
-

diff --git a/strigi-gcc47.patch b/strigi-gcc47.patch
new file mode 100644 (file)
index 0000000..9b42771
--- /dev/null
+++ b/strigi-gcc47.patch
@@ -0,0 +1,13 @@
+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-lib.patch b/strigi-lib.patch
deleted file mode 100644 (file)
index d5dc4dc..0000000
--- a/strigi-lib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- strigi-0.7.5/strigiutils/bin/xmlindexer/CMakeLists.txt~    2011-04-23 13:00:17.000000000 +0200
-+++ strigi-0.7.5/strigiutils/bin/xmlindexer/CMakeLists.txt     2011-07-27 10:22:05.164488881 +0200
-@@ -1,11 +1,11 @@
--add_library(librdfindexer
-+add_library(librdfindexer STATIC
-         rdfindexer.cpp
-         tagmapping.cpp
-       rdfindexwriter.cpp
- )
- target_link_libraries(librdfindexer ${LIBSTREAMANALYZER_LIBRARIES} ${LIBSTREAMS_LIBRARIES})
- 
--add_library(libxmlindexer
-+add_library(libxmlindexer STATIC
-         xmlindexer.cpp
-         tagmapping.cpp
-       xmlindexwriter.cpp

diff --git a/strigi.spec b/strigi.spec
index d7fa7cd763e4c59469dfa53ba10b232f0cbd6795..010b8b84992e59f51e7a2f3afc0d843df3f1a8b1 100644 (file)
--- a/strigi.spec
+++ b/strigi.spec
@@ -8,14 +8,14 @@
 Summary:       Strigi desktop search
 Summary(pl.UTF-8):     System wyszukiwania Strigi
 Name:          strigi
-Version:       0.7.5
-Release:       3
+Version:       0.7.7
+Release:       0.1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
-# Source0-md5: 0559e2ab65d187d30916e9ffe36e0fb6
-Patch0:                %{name}-ffmpeg.patch
-Patch1:                %{name}-lib.patch
+#Source0:      http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
+Source0:       http://rdieter.fedorapeople.org/strigi/%{name}-%{version}.tar.bz2
+# Source0-md5: d3ba1bf03978dfa793ab18c3f0c57d02
+Patch2:                %{name}-gcc47.patch
 URL:           http://strigi.sourceforge.net/
 BuildRequires: QtDBus-devel >= %{qtver}
 BuildRequires: QtGui-devel >= %{qtver}
@@ -82,10 +82,7 @@ Pliki nagłówkowe dla strigi.
 
 %prep
 %setup -q
-cd libstreamanalyzer
-%patch0 -p1
-cd ..
-%patch1 -p1
+%patch2 -p1
 
 %build
 install -d build