strigi 0.7.7-2 ajout patchs ffmpeg+glibc

8 files changed, 189 insertions, 6 deletions

diff --git a/strigi/.footprint.i686 b/strigi/.footprint.i686
index 91066d0d1..a61494d44 100644
--- a/strigi/.footprint.i686
+++ b/strigi/.footprint.i686
@@ -105,6 +105,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 drwxr-xr-x	root/root	usr/lib/strigi/
 -rw-r--r--	root/root	usr/lib/strigi/StrigiConfig.cmake
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_digest.so
+-rwxr-xr-x	root/root	usr/lib/strigi/strigiea_ffmpeg.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_jpeg.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_riff.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiindex_clucene.so
diff --git a/strigi/.footprint.x86_64 b/strigi/.footprint.x86_64
index 91066d0d1..a61494d44 100644
--- a/strigi/.footprint.x86_64
+++ b/strigi/.footprint.x86_64
@@ -105,6 +105,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 drwxr-xr-x	root/root	usr/lib/strigi/
 -rw-r--r--	root/root	usr/lib/strigi/StrigiConfig.cmake
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_digest.so
+-rwxr-xr-x	root/root	usr/lib/strigi/strigiea_ffmpeg.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_jpeg.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiea_riff.so
 -rwxr-xr-x	root/root	usr/lib/strigi/strigiindex_clucene.so
diff --git a/strigi/.md5sum.i686 b/strigi/.md5sum.i686
index 6b33868f6..f2197dae9 100644
--- a/strigi/.md5sum.i686
+++ b/strigi/.md5sum.i686
@@ -1 +1,4 @@
+28bf1ff3ac1e0801e5896b04002c79de  strigi-0.7.7-ffmpeg-0.11.patch
+a6c38f4f46c8fb2914d332fd509b1a6c  strigi-0.7.7-glibc-2.15.patch
+9984b9514fe9e146ae6dd34e52ac4e22  strigi-0.7.7-missinglink.patch
 d3ba1bf03978dfa793ab18c3f0c57d02  strigi_0.7.7.orig.tar.bz2
diff --git a/strigi/.md5sum.x86_64 b/strigi/.md5sum.x86_64
index 6b33868f6..f2197dae9 100644
--- a/strigi/.md5sum.x86_64
+++ b/strigi/.md5sum.x86_64
@@ -1 +1,4 @@
+28bf1ff3ac1e0801e5896b04002c79de  strigi-0.7.7-ffmpeg-0.11.patch
+a6c38f4f46c8fb2914d332fd509b1a6c  strigi-0.7.7-glibc-2.15.patch
+9984b9514fe9e146ae6dd34e52ac4e22  strigi-0.7.7-missinglink.patch
 d3ba1bf03978dfa793ab18c3f0c57d02  strigi_0.7.7.orig.tar.bz2
diff --git a/strigi/Pkgfile b/strigi/Pkgfile
index 42e4f0bc4..629fe6f0c 100755
--- a/strigi/Pkgfile
+++ b/strigi/Pkgfile
@@ -7,20 +7,24 @@
 
 name=strigi
 version=0.7.7
-release=1
-source=(http://cdn.debian.net/debian/pool/main/s/$name/${name}_$version.orig.tar.bz2)
+release=2
+source=(http://cdn.debian.net/debian/pool/main/s/$name/${name}_$version.orig.tar.bz2
+	strigi-0.7.7-ffmpeg-0.11.patch
+	strigi-0.7.7-glibc-2.15.patch
+	strigi-0.7.7-missinglink.patch)
 
 build() {
 	cd $name-$version
+	patch -p1 < ../strigi-0.7.7-ffmpeg-0.11.patch
+	patch -p1 < ../strigi-0.7.7-glibc-2.15.patch
+	patch -p1 < ../strigi-0.7.7-missinglink.patch
 	mkdir build
 	cd build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_EXPAT=ON \
 		-DENABLE_FAM=ON \
 		-DENABLE_INOTIFY=ON \
-		-DENABLE_LOG4CXX=OFF \
-		-DENABLE_SQLITE=OFF \
-		-DENABLE_FFMPEG=OFF ..
+		-DENABLE_LOG4CXX=ON \
+		-DENABLE_FFMPEG=ON ..
 	make
 	make DESTDIR=$PKG install
 }
diff --git a/strigi/strigi-0.7.7-ffmpeg-0.11.patch b/strigi/strigi-0.7.7-ffmpeg-0.11.patch
new file mode 100644
index 000000000..128292566
--- /dev/null
+++ b/strigi/strigi-0.7.7-ffmpeg-0.11.patch
@@ -0,0 +1,152 @@
+--- 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/strigi-0.7.7-glibc-2.15.patch b/strigi/strigi-0.7.7-glibc-2.15.patch
new file mode 100644
index 000000000..0ff9dbb79
--- /dev/null
+++ b/strigi/strigi-0.7.7-glibc-2.15.patch
@@ -0,0 +1,13 @@
+--- strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp.bero	2012-06-08 17:36:40.714890743 +0200
++++ strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp	2012-06-08 17:36:59.768890835 +0200
+@@ -27,9 +27,7 @@
+ #include <iostream>
+ #include <stdio.h>
+ 
+-#if defined(__SUNPRO_CC)
+-#include <unistd.h>
+-#endif
++#include <unistd.h> // for sleep()
+ 
+ using namespace std;
+ 
diff --git a/strigi/strigi-0.7.7-missinglink.patch b/strigi/strigi-0.7.7-missinglink.patch
new file mode 100644
index 000000000..b7a31307e
--- /dev/null
+++ b/strigi/strigi-0.7.7-missinglink.patch
@@ -0,0 +1,6 @@
+--- strigi-0.7.7/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt.bero	2012-06-08 17:34:15.490890036 +0200
++++ strigi-0.7.7/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt	2012-06-08 17:34:28.232890101 +0200
+@@ -1,2 +1,2 @@
+ add_executable(index2dump indexdump.cpp ../tcharutils.cpp)
+-target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS})
++target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS} clucene-shared)