Created
December 16, 2012 15:46
-
-
Save guyzmo/4308707 to your computer and use it in GitHub Desktop.
Patch to be applied for homebrew's strigi.rb Formula.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/libstreamanalyzer/include/strigi/analysisresult.h b/libstreamanalyzer/include/strigi/analysisresult.h | |
index 074fc43..0d7b37c 100644 | |
--- a/libstreamanalyzer/include/strigi/analysisresult.h | |
+++ b/libstreamanalyzer/include/strigi/analysisresult.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_ANALYSISRESULT_H | |
#define STRIGI_ANALYSISRESULT_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <string> | |
#include <strigi/strigiconfig.h> | |
diff --git a/libstreamanalyzer/include/strigi/analyzerconfiguration.h b/libstreamanalyzer/include/strigi/analyzerconfiguration.h | |
index 3ddead2..dfafb0b 100644 | |
--- a/libstreamanalyzer/include/strigi/analyzerconfiguration.h | |
+++ b/libstreamanalyzer/include/strigi/analyzerconfiguration.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_ANALYZERCONFIGURATION_H | |
#define STRIGI_ANALYZERCONFIGURATION_H | |
+#include "/usr/include/time.h" | |
+ | |
#include "streamendanalyzer.h" | |
#include "streamsaxanalyzer.h" | |
#include "streamlineanalyzer.h" | |
diff --git a/libstreamanalyzer/include/strigi/analyzerplugin.h b/libstreamanalyzer/include/strigi/analyzerplugin.h | |
index 23c26f8..c4112eb 100644 | |
--- a/libstreamanalyzer/include/strigi/analyzerplugin.h | |
+++ b/libstreamanalyzer/include/strigi/analyzerplugin.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_ANALYZERPLUGIN_H | |
#define STRIGI_ANALYZERPLUGIN_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <list> | |
diff --git a/libstreamanalyzer/include/strigi/classproperties.h b/libstreamanalyzer/include/strigi/classproperties.h | |
index 0a8d5d5..73d5df4 100644 | |
--- a/libstreamanalyzer/include/strigi/classproperties.h | |
+++ b/libstreamanalyzer/include/strigi/classproperties.h | |
@@ -20,6 +20,8 @@ | |
*/ | |
#ifndef STRIGI_CLASSPROPERTIES_H | |
#define STRIGI_CLASSPROPERTIES_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <string> | |
#include <vector> | |
diff --git a/libstreamanalyzer/include/strigi/diranalyzer.h b/libstreamanalyzer/include/strigi/diranalyzer.h | |
index 6e25f68..32be430 100644 | |
--- a/libstreamanalyzer/include/strigi/diranalyzer.h | |
+++ b/libstreamanalyzer/include/strigi/diranalyzer.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_DIRANALYZER_H | |
#define STRIGI_DIRANALYZER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <string> | |
#include <vector> | |
diff --git a/libstreamanalyzer/include/strigi/fieldproperties.h b/libstreamanalyzer/include/strigi/fieldproperties.h | |
index dc53703..aba9a20 100644 | |
--- a/libstreamanalyzer/include/strigi/fieldproperties.h | |
+++ b/libstreamanalyzer/include/strigi/fieldproperties.h | |
@@ -20,6 +20,8 @@ | |
*/ | |
#ifndef STRIGI_FIELDPROPERTIES_H | |
#define STRIGI_FIELDPROPERTIES_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <string> | |
#include <vector> | |
diff --git a/libstreamanalyzer/include/strigi/filelister.h b/libstreamanalyzer/include/strigi/filelister.h | |
index 5fe7f3e..58efbc7 100644 | |
--- a/libstreamanalyzer/include/strigi/filelister.h | |
+++ b/libstreamanalyzer/include/strigi/filelister.h | |
@@ -19,6 +19,8 @@ | |
*/ | |
#ifndef STRIGI_FILELISTER_H | |
#define STRIGI_FILELISTER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <sys/types.h> | |
#include <string> | |
#include <vector> | |
diff --git a/libstreamanalyzer/include/strigi/indexeddocument.h b/libstreamanalyzer/include/strigi/indexeddocument.h | |
index c75398c..ef436e0 100644 | |
--- a/libstreamanalyzer/include/strigi/indexeddocument.h | |
+++ b/libstreamanalyzer/include/strigi/indexeddocument.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_INDEXEDDOCUMENT_H | |
#define STRIGI_INDEXEDDOCUMENT_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <map> | |
#include <string> | |
#ifdef HAVE_STDINT_H | |
diff --git a/libstreamanalyzer/include/strigi/indexmanager.h b/libstreamanalyzer/include/strigi/indexmanager.h | |
index c636480..403ec64 100644 | |
--- a/libstreamanalyzer/include/strigi/indexmanager.h | |
+++ b/libstreamanalyzer/include/strigi/indexmanager.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_INDEXMANAGER_H | |
#define STRIGI_INDEXMANAGER_H | |
+#include "/usr/include/time.h" | |
+ | |
namespace Strigi { | |
class IndexReader; | |
class IndexWriter; | |
diff --git a/libstreamanalyzer/include/strigi/indexpluginloader.h b/libstreamanalyzer/include/strigi/indexpluginloader.h | |
index a0abdf4..3b2e30e 100644 | |
--- a/libstreamanalyzer/include/strigi/indexpluginloader.h | |
+++ b/libstreamanalyzer/include/strigi/indexpluginloader.h | |
@@ -21,6 +21,8 @@ | |
#ifndef INDEXPLUGINLOADER_H | |
#define INDEXPLUGINLOADER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <vector> | |
#include <map> | |
diff --git a/libstreamanalyzer/include/strigi/indexwriter.h b/libstreamanalyzer/include/strigi/indexwriter.h | |
index 55a4753..27f1be1 100644 | |
--- a/libstreamanalyzer/include/strigi/indexwriter.h | |
+++ b/libstreamanalyzer/include/strigi/indexwriter.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_INDEXWRITER_H | |
#define STRIGI_INDEXWRITER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <string> | |
#include <vector> | |
#include <strigi/strigiconfig.h> | |
diff --git a/libstreamanalyzer/include/strigi/query.h b/libstreamanalyzer/include/strigi/query.h | |
index 9c4a1db..1a7f24a 100644 | |
--- a/libstreamanalyzer/include/strigi/query.h | |
+++ b/libstreamanalyzer/include/strigi/query.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_QUERY_H | |
#define STRIGI_QUERY_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <ostream> | |
#include <vector> | |
diff --git a/libstreamanalyzer/include/strigi/streamanalyzer.h b/libstreamanalyzer/include/strigi/streamanalyzer.h | |
index 4074463..ddf46a0 100644 | |
--- a/libstreamanalyzer/include/strigi/streamanalyzer.h | |
+++ b/libstreamanalyzer/include/strigi/streamanalyzer.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_STREAMANALYZER_H | |
#define STRIGI_STREAMANALYZER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <string> | |
diff --git a/libstreamanalyzer/include/strigi/streamanalyzerfactory.h b/libstreamanalyzer/include/strigi/streamanalyzerfactory.h | |
index 6ead186..82d1038 100644 | |
--- a/libstreamanalyzer/include/strigi/streamanalyzerfactory.h | |
+++ b/libstreamanalyzer/include/strigi/streamanalyzerfactory.h | |
@@ -21,6 +21,8 @@ | |
#ifndef STRIGI_STREAMANALYZERFACTORY | |
#define STRIGI_STREAMANALYZERFACTORY | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <vector> | |
diff --git a/libstreamanalyzer/include/strigi/streamendanalyzer.h b/libstreamanalyzer/include/strigi/streamendanalyzer.h | |
index b1721c9..4160a41 100644 | |
--- a/libstreamanalyzer/include/strigi/streamendanalyzer.h | |
+++ b/libstreamanalyzer/include/strigi/streamendanalyzer.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_STREAMENDANALYZER_H | |
#define STRIGI_STREAMENDANALYZER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <string> | |
#include "streamanalyzerfactory.h" | |
diff --git a/libstreamanalyzer/include/strigi/variant.h b/libstreamanalyzer/include/strigi/variant.h | |
index f81b604..0afde35 100644 | |
--- a/libstreamanalyzer/include/strigi/variant.h | |
+++ b/libstreamanalyzer/include/strigi/variant.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_VARIANT_H | |
#define STRIGI_VARIANT_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <string> | |
#include <vector> | |
diff --git a/libstreamanalyzer/lib/analyzerloader.h b/libstreamanalyzer/lib/analyzerloader.h | |
index 79be236..2a78535 100644 | |
--- a/libstreamanalyzer/lib/analyzerloader.h | |
+++ b/libstreamanalyzer/lib/analyzerloader.h | |
@@ -21,6 +21,8 @@ | |
#ifndef ANALYZERLOADER_H | |
#define ANALYZERLOADER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <strigi/strigiconfig.h> | |
#include <list> | |
#include <map> | |
diff --git a/libstreamanalyzer/lib/xesamparser.h b/libstreamanalyzer/lib/xesamparser.h | |
index 52e5d6d..12fb14e 100644 | |
--- a/libstreamanalyzer/lib/xesamparser.h | |
+++ b/libstreamanalyzer/lib/xesamparser.h | |
@@ -23,6 +23,8 @@ | |
#ifndef STRIGI_XESAMPARSER_H | |
#define STRIGI_XESAMPARSER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <string> | |
#include "strigi/query.h" | |
diff --git a/libstreamanalyzer/lib/xmlparser/xmlstream.h b/libstreamanalyzer/lib/xmlparser/xmlstream.h | |
index 083e55e..15ec111 100644 | |
--- a/libstreamanalyzer/lib/xmlparser/xmlstream.h | |
+++ b/libstreamanalyzer/lib/xmlparser/xmlstream.h | |
@@ -20,6 +20,8 @@ | |
#ifndef XMLSTREAM_H | |
#define XMLSTREAM_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <string> | |
#include <map> | |
#include <list> | |
diff --git a/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp b/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp | |
index d79687c..10b3a8d 100644 | |
--- a/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp | |
+++ b/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp | |
@@ -301,6 +301,7 @@ int64_t const no_bitrate = 0x8000000000000000ULL; | |
signed char | |
FFMPEGEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) { | |
+/* | |
uint8_t pDataBuffer[32768];//65536]; | |
long lSize = 32768; | |
@@ -381,27 +382,25 @@ FFMPEGEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) { | |
} else if (size_t len = strlen(codec.codec_name)) { | |
ar.addTriplet(streamuri, codecPropertyName, string(codec.codec_name, len)); | |
} | |
-/* | |
-00792 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { | |
-// fake mpeg2 transport stream codec (currently not | |
-00794 registered) | |
-00795 codec_name = "mpeg2ts"; | |
-00798 } else { | |
-00799 // output avi tags | |
-00800 if( isprint(enc->codec_tag&0xFF) && isprint((enc->codec_tag>>8)&0xFF) | |
-00801 && isprint((enc->codec_tag>>16)&0xFF) && isprint((enc->codec_tag>>24)&0xFF)){ | |
-00802 snprintf(buf1, sizeof(buf1), "%c%c%c%c / 0x%04X", | |
-00803 enc->codec_tag & 0xff, | |
-00804 (enc->codec_tag >> 8) & 0xff, | |
-00805 (enc->codec_tag >> 16) & 0xff, | |
-00806 (enc->codec_tag >> 24) & 0xff, | |
-00807 enc->codec_tag); | |
-00808 } else { | |
-00809 snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag); | |
-00810 } | |
-00811 codec_name = buf1; | |
-00812 } | |
-*/ | |
+// 00792 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { | |
+// // fake mpeg2 transport stream codec (currently not | |
+// 00794 registered) | |
+// 00795 codec_name = "mpeg2ts"; | |
+// 00798 } else { | |
+// 00799 // output avi tags | |
+// 00800 if( isprint(enc->codec_tag&0xFF) && isprint((enc->codec_tag>>8)&0xFF) | |
+// 00801 && isprint((enc->codec_tag>>16)&0xFF) && isprint((enc->codec_tag>>24)&0xFF)){ | |
+// 00802 snprintf(buf1, sizeof(buf1), "%c%c%c%c / 0x%04X", | |
+// 00803 enc->codec_tag & 0xff, | |
+// 00804 (enc->codec_tag >> 8) & 0xff, | |
+// 00805 (enc->codec_tag >> 16) & 0xff, | |
+// 00806 (enc->codec_tag >> 24) & 0xff, | |
+// 00807 enc->codec_tag); | |
+// 00808 } else { | |
+// 00809 snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag); | |
+// 00810 } | |
+// 00811 codec_name = buf1; | |
+// 00812 } | |
if (codec.bit_rate) { | |
ostringstream outs; | |
outs << codec.bit_rate; | |
@@ -493,6 +492,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) { | |
av_close_input_stream(fc); | |
//url_fclose(&ByteIOCtx); | |
+ */ | |
return 0; | |
} | |
diff --git a/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.h b/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.h | |
index d2dab75..72dfa75 100644 | |
--- a/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.h | |
+++ b/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.h | |
@@ -20,6 +20,8 @@ | |
#ifndef CLUCENEINDEXWRITER_H | |
#define CLUCENEINDEXWRITER_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <CLucene.h> | |
#include <strigi/strigiconfig.h> | |
#include <strigi/indexwriter.h> | |
diff --git a/libstreamanalyzer/plugins/indexers/cluceneindexer/indexdump/indexdump.cpp b/libstreamanalyzer/plugins/indexers/cluceneindexer/indexdump/indexdump.cpp | |
index 09c3e81..75e1c53 100644 | |
--- a/libstreamanalyzer/plugins/indexers/cluceneindexer/indexdump/indexdump.cpp | |
+++ b/libstreamanalyzer/plugins/indexers/cluceneindexer/indexdump/indexdump.cpp | |
@@ -17,6 +17,8 @@ | |
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
* Boston, MA 02110-1301, USA. | |
*/ | |
+#include "/usr/include/time.h" | |
+ | |
#include <CLucene.h> | |
#include <CLucene/search/QueryFilter.h> | |
#include "../cluceneindexmanager.h" | |
diff --git a/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp b/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp | |
index 2e428a2..18d3dfa 100644 | |
--- a/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp | |
+++ b/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp | |
@@ -17,6 +17,8 @@ | |
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
* Boston, MA 02110-1301, USA. | |
*/ | |
+#include "/usr/include/time.h" | |
+ | |
#include <CLucene/StdHeader.h> | |
#include "jsgzipcompressstream.h" | |
#include <CLucene/util/jstreamsconfig.h> | |
diff --git a/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.h b/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.h | |
index f0abdae..b781ee6 100644 | |
--- a/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.h | |
+++ b/libstreamanalyzer/plugins/indexers/cluceneindexer/jsgzipcompressstream.h | |
@@ -20,6 +20,8 @@ | |
#ifndef GZIPCOMPRESSSTREAM_H | |
#define GZIPCOMPRESSSTREAM_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <cstdio> | |
#include <strigi/strigiconfig.h> // (u)int64_t | |
#include <CLucene/util/streambase.h> | |
diff --git a/libstreamanalyzer/plugins/indexers/cluceneindexer/tcharutils.h b/libstreamanalyzer/plugins/indexers/cluceneindexer/tcharutils.h | |
index 233bb99..20c7390 100644 | |
--- a/libstreamanalyzer/plugins/indexers/cluceneindexer/tcharutils.h | |
+++ b/libstreamanalyzer/plugins/indexers/cluceneindexer/tcharutils.h | |
@@ -21,6 +21,8 @@ | |
#ifndef _TCHAR_UTILS_H_ | |
#define _TCHAR_UTILS_H_ | |
+#include "/usr/include/time.h" | |
+ | |
#include <wchar.h> | |
#include <string> | |
#include <strigi/strigiconfig.h> | |
diff --git a/libstreams/include/strigi/bufferedstream.h b/libstreams/include/strigi/bufferedstream.h | |
index 563da8a..c584c2b 100644 | |
--- a/libstreams/include/strigi/bufferedstream.h | |
+++ b/libstreams/include/strigi/bufferedstream.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_BUFFEREDSTREAM_H | |
#define STRIGI_BUFFEREDSTREAM_H | |
+#include "/usr/include/time.h" | |
+ | |
#include "streambase.h" | |
#include "streambuffer.h" | |
#include <cassert> | |
diff --git a/libstreams/include/strigi/streambase.h b/libstreams/include/strigi/streambase.h | |
index 1e3a219..36bcad5 100644 | |
--- a/libstreams/include/strigi/streambase.h | |
+++ b/libstreams/include/strigi/streambase.h | |
@@ -20,6 +20,8 @@ | |
#ifndef STRIGI_STREAMBASE_H | |
#define STRIGI_STREAMBASE_H | |
+#include "/usr/include/time.h" | |
+ | |
#include <stdio.h> | |
#include <string> | |
#include <strigi/strigiconfig.h> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment