* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2011-07-13 22:49 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2011-07-13 22:49 UTC (permalink / raw
To: gentoo-commits
commit: aff0f6c6d12b18530da1c063d37758a7a4b722e5
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Wed Jul 13 22:48:39 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Wed Jul 13 22:48:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=aff0f6c6
[app-misc/strigi] patch for compile with -qt4
fixes bug 375055
---
app-misc/strigi/files/strigi-0.7.5-no-qt4.patch | 11 +++
app-misc/strigi/strigi-0.7.5.ebuild | 92 +++++++++++++++++++++++
2 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
new file mode 100644
index 0000000..3f9944a
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
@@ -0,0 +1,11 @@
+--- strigiclient/lib/CMakeLists.txt.orig 2011-07-13 19:57:19.000000000 +0200
++++ strigiclient/lib/CMakeLists.txt 2011-07-13 19:59:15.000000000 +0200
+@@ -1,4 +1,7 @@
+ if(NOT WIN32)
+ add_subdirectory(htmlgui)
+ endif(NOT WIN32)
+-add_subdirectory(searchclient)
++
++if(QT4_FOUND)
++ add_subdirectory(searchclient)
++endif(QT4_FOUND)
diff --git a/app-misc/strigi/strigi-0.7.5.ebuild b/app-misc/strigi/strigi-0.7.5.ebuild
new file mode 100644
index 0000000..10d66d4
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+ EGIT_REPO_URI="git://anongit.kde.org/strigi"
+ GIT_ECLASS="git-2"
+ EGIT_HAS_SUBMODULES="true"
+ KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="http://strigi.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
+
+COMMONDEPEND="
+ app-arch/bzip2:0
+ dev-libs/libxml2:2
+ sys-libs/zlib:0
+ virtual/libiconv
+ clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+ dbus? (
+ sys-apps/dbus
+ qt4? ( x11-libs/qt-dbus:4 )
+ )
+ exif? ( >=media-gfx/exiv2-0.17 )
+ fam? ( virtual/fam )
+ ffmpeg? ( virtual/ffmpeg )
+ hyperestraier? ( app-text/hyperestraier )
+ log? ( >=dev-libs/log4cxx-0.10.0 )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+"
+DEPEND="${COMMONDEPEND}
+ test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
+)
+
+src_configure() {
+ # Enabled: POLLING (only reliable way to check for files changed.)
+ # Disabled: xine - recommended upstream to keep it this way
+ mycmakeargs=(
+ -DENABLE_POLLING=ON
+ -DFORCE_DEPS=ON
+ -DENABLE_CPPUNIT=OFF
+ -DENABLE_REGENERATEXSD=OFF
+ $(cmake-utils_use_enable clucene)
+ $(cmake-utils_use_enable dbus)
+ $(cmake-utils_use_enable exif EXIV2)
+ $(cmake-utils_use_enable fam)
+ $(cmake-utils_use_enable ffmpeg)
+ $(cmake-utils_use_enable hyperestraier)
+ $(cmake-utils_use_enable inotify)
+ $(cmake-utils_use_enable log LOG4CXX)
+ $(cmake-utils_use_enable qt4)
+ $(cmake-utils_use_enable test CPPUNIT)
+ $(cmake-utils_disable xine)
+ )
+
+ if use qt4; then
+ mycmakeargs+=(-DENABLE_DBUS=ON)
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ if ! use clucene && ! use hyperestraier; then
+ echo
+ elog "Because you didn't enable either of the available backends:"
+ elog "clucene or hyperestraier, strigi may not be functional."
+ elog "If you intend to use standalone strigi indexer (not needed for KDE),"
+ elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
+ elog "or hyperestraier (unreliable) USE flag enabled."
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2011-08-19 15:37 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2011-08-19 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 2780f3d1a0f2bb00f07c11f41ea91f76feef9e93
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Fri Aug 19 12:55:22 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Aug 19 12:55:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2780f3d1
[app-misc/strigi] Fix build with clucene-2.3
---
app-misc/strigi/files/strigi-0.7.5-clucene23.patch | 207 ++++++++++++++++++++
app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch | 166 ++++++++++++++++
app-misc/strigi/strigi-0.7.5-r3.ebuild | 94 +++++++++
3 files changed, 467 insertions(+), 0 deletions(-)
diff --git a/app-misc/strigi/files/strigi-0.7.5-clucene23.patch b/app-misc/strigi/files/strigi-0.7.5-clucene23.patch
new file mode 100644
index 0000000..0316671
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.5-clucene23.patch
@@ -0,0 +1,207 @@
+diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
+--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2011-06-02 11:29:26.000000000 +0200
++++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2011-08-18 02:43:46.000000000 +0200
+@@ -56,7 +56,6 @@ using lucene::document::DocumentFieldEnu
+ using Strigi::IndexedDocument;
+ using Strigi::Variant;
+ using Strigi::FieldRegister;
+-typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
+
+ using namespace std;
+
+@@ -101,9 +100,9 @@ public:
+ CLuceneIndexReader& reader;
+ Private(CLuceneIndexReader& r) :reader(r) {}
+
+- static LuceneTerm createTerm(const wchar_t* name, const string& value);
+- static LuceneTerm createKeywordTerm(const wchar_t* name, const string& value);
+- static LuceneTerm createWildCardTerm(const wchar_t* name, const string& value);
++ static Term* createTerm(const wchar_t* name, const string& value);
++ static Term* createKeywordTerm(const wchar_t* name, const string& value);
++ static Term* createWildCardTerm(const wchar_t* name, const string& value);
+ Query* createQuery(const Strigi::Query& query);
+ Query* createSimpleQuery(const Strigi::Query& query);
+ static Query* createSingleFieldQuery(const string& field,
+@@ -187,12 +186,12 @@ CLuceneIndexReader::mapId(const char* id
+ }
+ #endif
+
+-LuceneTerm
++Term*
+ CLuceneIndexReader::Private::createWildCardTerm(const wchar_t* name,
+ const string& value) {
+- return LuceneTerm(_CLNEW Term(name, utf8toucs2(value).c_str()));
++ return _CLNEW Term(name, utf8toucs2(value).c_str());
+ }
+-LuceneTerm
++Term*
+ CLuceneIndexReader::Private::createTerm(const wchar_t* name,
+ const string& value) {
+ wstring v = utf8toucs2(value);
+@@ -206,16 +205,15 @@ CLuceneIndexReader::Private::createTerm(
+ } else {
+ tv = v.c_str();
+ }
+- LuceneTerm t(_CLNEW Term(name, tv));
++ Term* t = _CLNEW Term(name, tv);
+ _CLDELETE(ts);
+ return t;
+ }
+-LuceneTerm
++Term*
+ CLuceneIndexReader::Private::createKeywordTerm(const wchar_t* name,
+ const string& value) {
+ wstring v = utf8toucs2(value);
+- LuceneTerm t(_CLNEW Term(name, v.c_str()));
+- return t;
++ return _CLNEW Term(name, v.c_str());
+ }
+ BooleanQuery*
+ CLuceneIndexReader::Private::createBooleanQuery(const Strigi::Query& query) {
+@@ -249,25 +247,24 @@ CLuceneIndexReader::Private::createSingl
+ const Strigi::Query& query) {
+ wstring fieldname = mapId(field.c_str());
+ Query* q;
+- LuceneTerm t;
+- LuceneTerm nullTerm;
++ Term* t;
+ const string& val = query.term().string();
+ switch (query.type()) {
+ case Strigi::Query::LessThan:
+ t = createTerm(fieldname.c_str(), val.c_str());
+- q = _CLNEW RangeQuery(nullTerm, t, false);
++ q = _CLNEW RangeQuery(0, t, false);
+ break;
+ case Strigi::Query::LessThanEquals:
+ t = createTerm(fieldname.c_str(), query.term().string());
+- q = _CLNEW RangeQuery(nullTerm, t, true);
++ q = _CLNEW RangeQuery(0, t, true);
+ break;
+ case Strigi::Query::GreaterThan:
+ t = createTerm(fieldname.c_str(), query.term().string());
+- q = _CLNEW RangeQuery(t, nullTerm, false);
++ q = _CLNEW RangeQuery(t, 0, false);
+ break;
+ case Strigi::Query::GreaterThanEquals:
+ t = createTerm(fieldname.c_str(), query.term().string());
+- q = _CLNEW RangeQuery(t, nullTerm, true);
++ q = _CLNEW RangeQuery(t, 0, true);
+ break;
+ case Strigi::Query::Keyword:
+ t = createKeywordTerm(fieldname.c_str(), query.term().string());
+@@ -282,6 +279,7 @@ CLuceneIndexReader::Private::createSingl
+ q = _CLNEW TermQuery(t);
+ }
+ }
++ _CLDECDELETE(t);
+ return q;
+ }
+ Query*
+@@ -584,12 +582,13 @@ CLuceneIndexReader::documentId(const str
+ if (reader == NULL) return -1;
+ int64_t id = -1;
+
+- LuceneTerm term(_CLNEW Term(mapId(Private::systemlocation()), utf8toucs2( uri ).c_str()));
++ Term* term = _CLNEW Term(mapId(Private::systemlocation()), utf8toucs2( uri ).c_str());
+ TermDocs* docs = reader->termDocs(term);
+ if (docs->next()) {
+ id = docs->doc();
+ }
+ _CLDELETE(docs);
++ _CLDECDELETE(term);
+
+ if (id != -1 && reader->isDeleted((int32_t)id)) {
+ id = -1;
+@@ -770,12 +769,13 @@ CLuceneIndexReader::keywords(const strin
+ const wchar_t* prefixtext = prefix.c_str();
+ string::size_type prefixLen = prefix.length();
+ vector<string>::const_iterator i;
+- LuceneTerm lastTerm;
++ Term* lastTerm;
+ for (i = fn.begin(); i != fn.end() && s.size() << max; ++i) {
+ wstring fieldname(utf8toucs2(*i));
+- LuceneTerm term(_CLNEW Term(fieldname.c_str(), prefix.c_str()));
++ Term* term = _CLNEW Term(fieldname.c_str(), prefix.c_str());
+ TermEnum* enumerator = reader->terms(term);
+ do {
++ _CLDECDELETE(lastTerm);
+ lastTerm = enumerator->term();
+ if (lastTerm) {
+ if (prefixLen > lastTerm->textLength()
+@@ -786,7 +786,9 @@ CLuceneIndexReader::keywords(const strin
+ s.insert(lastTerm->text());
+ }
+ } while (enumerator->next() && s.size() < max);
++ _CLDECDELETE(term);
+ }
++ _CLDECDELETE(lastTerm);
+
+ k.reserve(s.size());
+ set<wstring>::const_iterator j;
+diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp
+--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2011-06-02 11:29:26.000000000 +0200
++++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2011-08-18 02:43:46.000000000 +0200
+@@ -45,7 +45,6 @@ using lucene::util::BitSet;
+ using lucene::util::Reader;
+ using namespace std;
+ using namespace Strigi;
+-typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
+
+ struct CLuceneDocData {
+ lucene::document::Document doc;
+@@ -219,18 +218,19 @@ void
+ CLuceneIndexWriter::deleteEntry(const string& entry, lucene::index::IndexWriter* writer, lucene::index::IndexReader* reader) {
+ wstring path(utf8toucs2(entry));
+ {
+- LuceneTerm t(_CLNEW Term(systemlocation(), path.c_str()));
++ Term* t = _CLNEW Term(systemlocation(), path.c_str());
+ writer->deleteDocuments(t);
++ _CLDECDELETE(t);
+ }
+ {
+- LuceneTerm t(_CLNEW Term(parentlocation(), path.c_str()));
++ Term* t = _CLNEW Term(parentlocation(), path.c_str());
+ writer->deleteDocuments(t);
+-
++ _CLDECDELETE(t);
+ }
+ {
+ // delete all deeper nested files
+ wstring v = utf8toucs2(entry+"/");
+- LuceneTerm t(_CLNEW Term(parentlocation(), v.c_str()));
++ Term* t(_CLNEW Term(parentlocation(), v.c_str()));
+ PrefixFilter* filter = _CLNEW PrefixFilter(t);
+ BitSet* b = filter->bits(reader);
+ _CLDELETE(filter);
+@@ -241,6 +241,7 @@ CLuceneIndexWriter::deleteEntry(const st
+ }
+ }
+ _CLDELETE(b);
++ _CLDECDELETE(t);
+ }
+ }
+ void
+diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp
+--- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp 2011-06-02 11:29:26.000000000 +0200
++++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp 2011-08-18 02:43:46.000000000 +0200
+@@ -40,7 +40,6 @@ using lucene::search::HitCollector;
+ using lucene::util::BitSet;
+ using lucene::document::DocumentFieldEnumeration;
+ using lucene::index::IndexReader;
+-typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
+
+ std::string
+ t2a(const TCHAR* t) {
+@@ -68,10 +67,11 @@ indexdump(const char* dir) {
+ }
+ }
+ TermEnum* terms = indexreader->terms();
+- LuceneTerm t;
++ Term* t = 0;
+ while (terms->next()) {
+ t = terms->term();
+ printf("%s: %s\n", t2a(t->field()).c_str(), t2a(t->text()).c_str());
++ _CLDECDELETE(t);
+ }
+ }
+ int
diff --git a/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch b/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch
new file mode 100644
index 0000000..ee1bfc0
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch
@@ -0,0 +1,166 @@
+diff -ruN strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+--- strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-06-02 11:29:26.000000000 +0200
++++ strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-08-02 23:25:04.936181179 +0200
+@@ -1,6 +1,7 @@
+ /* This file is part of Strigi Desktop Search
+ *
+ * Copyright (C) 2010 Evgeny Egorochkin <phreedom.stdin@gmail.com>
++ * Copyright (C) 2011 Tirtha Chatterjee <tirtha.p.chatterjee@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+@@ -348,7 +349,7 @@
+ 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 +360,7 @@
+ 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 +371,16 @@
+ 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));
++
++ //FIXME we must stop using the deprecated fuction av_metadata_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);
++ 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 +417,7 @@
+ 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 +467,83 @@
+ }
+
+ // Tags
+-
+- if (int32_t len = strlen(fc->title)) {
+- ar.addValue(factory->titleProperty, string(fc->title, len) );
++
++ AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *titleValue = entry->value;
++ if (int32_t len = strlen(titleValue)) {
++ ar.addValue(factory->titleProperty, string(titleValue, len) );
++ }
++ }
++
++ entry = av_metadata_get(fc->metadata, "author", NULL, 0);
++ 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) );
++ }
++ }
++
++ entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *copyrightValue = entry->value;
++ if (int32_t len = strlen(copyrightValue)) {
++ ar.addValue(factory->copyrightProperty, string(copyrightValue, 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);
++
++ entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *commentValue = entry->value;
++ if (int32_t len = strlen(commentValue)) {
++ ar.addValue(factory->commentProperty, string(commentValue, len) );
++ }
++ }
++
++ entry = av_metadata_get(fc->metadata, "album", NULL, 0);
++ 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) );
++
++ entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
++ 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);
++
++ entry = av_metadata_get(fc->metadata, "track", NULL, 0);
++ 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);
++
++ entry = av_metadata_get(fc->metadata, "year", NULL, 0);
++ 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/app-misc/strigi/strigi-0.7.5-r3.ebuild b/app-misc/strigi/strigi-0.7.5-r3.ebuild
new file mode 100644
index 0000000..b80205a
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.5-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+ EGIT_REPO_URI="git://anongit.kde.org/strigi"
+ GIT_ECLASS="git-2"
+ EGIT_HAS_SUBMODULES="true"
+ KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="http://strigi.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
+
+COMMONDEPEND="
+ app-arch/bzip2:0
+ dev-libs/libxml2:2
+ sys-libs/zlib:0
+ virtual/libiconv
+ clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+ dbus? (
+ sys-apps/dbus
+ qt4? ( x11-libs/qt-dbus:4 )
+ )
+ exif? ( >=media-gfx/exiv2-0.17 )
+ fam? ( virtual/fam )
+ ffmpeg? ( virtual/ffmpeg )
+ hyperestraier? ( app-text/hyperestraier )
+ log? ( >=dev-libs/log4cxx-0.10.0 )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+"
+DEPEND="${COMMONDEPEND}
+ test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
+ "${FILESDIR}/${PN}-0.7.5-ffmpeg.patch"
+ "${FILESDIR}/${PN}-0.7.5-clucene23.patch"
+)
+
+src_configure() {
+ # Enabled: POLLING (only reliable way to check for files changed.)
+ # Disabled: xine - recommended upstream to keep it this way
+ mycmakeargs=(
+ -DENABLE_POLLING=ON
+ -DFORCE_DEPS=ON
+ -DENABLE_CPPUNIT=OFF
+ -DENABLE_REGENERATEXSD=OFF
+ -DENABLE_XINE=OFF
+ $(cmake-utils_use_enable clucene)
+ $(cmake-utils_use_enable dbus)
+ $(cmake-utils_use_enable exif EXIV2)
+ $(cmake-utils_use_enable fam)
+ $(cmake-utils_use_enable ffmpeg)
+ $(cmake-utils_use_enable hyperestraier)
+ $(cmake-utils_use_enable inotify)
+ $(cmake-utils_use_enable log LOG4CXX)
+ $(cmake-utils_use_enable qt4)
+ $(cmake-utils_use_enable test CPPUNIT)
+ )
+
+ if use qt4; then
+ mycmakeargs+=(-DENABLE_DBUS=ON)
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ if ! use clucene && ! use hyperestraier; then
+ echo
+ elog "Because you didn't enable either of the available backends:"
+ elog "clucene or hyperestraier, strigi may not be functional."
+ elog "If you intend to use standalone strigi indexer (not needed for KDE),"
+ elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
+ elog "or hyperestraier (unreliable) USE flag enabled."
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2011-09-25 19:12 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2011-09-25 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 0195fa404fd0e817362440f398da05245ac9c6a4
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Sep 25 19:13:15 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 19:13:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0195fa40
Version bump to main tree. Should be packaged from git tags in the future.
(Portage version: 2.1.10.19/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
app-misc/strigi/ChangeLog | 9 +
app-misc/strigi/files/strigi-0.7.5-clucene23.patch | 207 --------------------
app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch | 166 ----------------
app-misc/strigi/strigi-0.7.5-r3.ebuild | 94 ---------
app-misc/strigi/strigi-9999.ebuild | 10 +-
5 files changed, 16 insertions(+), 470 deletions(-)
diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
new file mode 100644
index 0000000..b90d22c
--- /dev/null
+++ b/app-misc/strigi/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for app-misc/strigi
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ -strigi-0.7.5-r3.ebuild, -files/strigi-0.7.5-clucene23.patch,
+ -files/strigi-0.7.5-ffmpeg.patch, strigi-9999.ebuild:
+ Version bump to main tree. Should be packaged from git tags in the future.
+
diff --git a/app-misc/strigi/files/strigi-0.7.5-clucene23.patch b/app-misc/strigi/files/strigi-0.7.5-clucene23.patch
deleted file mode 100644
index 0316671..0000000
--- a/app-misc/strigi/files/strigi-0.7.5-clucene23.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
---- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2011-06-02 11:29:26.000000000 +0200
-+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2011-08-18 02:43:46.000000000 +0200
-@@ -56,7 +56,6 @@ using lucene::document::DocumentFieldEnu
- using Strigi::IndexedDocument;
- using Strigi::Variant;
- using Strigi::FieldRegister;
--typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
-
- using namespace std;
-
-@@ -101,9 +100,9 @@ public:
- CLuceneIndexReader& reader;
- Private(CLuceneIndexReader& r) :reader(r) {}
-
-- static LuceneTerm createTerm(const wchar_t* name, const string& value);
-- static LuceneTerm createKeywordTerm(const wchar_t* name, const string& value);
-- static LuceneTerm createWildCardTerm(const wchar_t* name, const string& value);
-+ static Term* createTerm(const wchar_t* name, const string& value);
-+ static Term* createKeywordTerm(const wchar_t* name, const string& value);
-+ static Term* createWildCardTerm(const wchar_t* name, const string& value);
- Query* createQuery(const Strigi::Query& query);
- Query* createSimpleQuery(const Strigi::Query& query);
- static Query* createSingleFieldQuery(const string& field,
-@@ -187,12 +186,12 @@ CLuceneIndexReader::mapId(const char* id
- }
- #endif
-
--LuceneTerm
-+Term*
- CLuceneIndexReader::Private::createWildCardTerm(const wchar_t* name,
- const string& value) {
-- return LuceneTerm(_CLNEW Term(name, utf8toucs2(value).c_str()));
-+ return _CLNEW Term(name, utf8toucs2(value).c_str());
- }
--LuceneTerm
-+Term*
- CLuceneIndexReader::Private::createTerm(const wchar_t* name,
- const string& value) {
- wstring v = utf8toucs2(value);
-@@ -206,16 +205,15 @@ CLuceneIndexReader::Private::createTerm(
- } else {
- tv = v.c_str();
- }
-- LuceneTerm t(_CLNEW Term(name, tv));
-+ Term* t = _CLNEW Term(name, tv);
- _CLDELETE(ts);
- return t;
- }
--LuceneTerm
-+Term*
- CLuceneIndexReader::Private::createKeywordTerm(const wchar_t* name,
- const string& value) {
- wstring v = utf8toucs2(value);
-- LuceneTerm t(_CLNEW Term(name, v.c_str()));
-- return t;
-+ return _CLNEW Term(name, v.c_str());
- }
- BooleanQuery*
- CLuceneIndexReader::Private::createBooleanQuery(const Strigi::Query& query) {
-@@ -249,25 +247,24 @@ CLuceneIndexReader::Private::createSingl
- const Strigi::Query& query) {
- wstring fieldname = mapId(field.c_str());
- Query* q;
-- LuceneTerm t;
-- LuceneTerm nullTerm;
-+ Term* t;
- const string& val = query.term().string();
- switch (query.type()) {
- case Strigi::Query::LessThan:
- t = createTerm(fieldname.c_str(), val.c_str());
-- q = _CLNEW RangeQuery(nullTerm, t, false);
-+ q = _CLNEW RangeQuery(0, t, false);
- break;
- case Strigi::Query::LessThanEquals:
- t = createTerm(fieldname.c_str(), query.term().string());
-- q = _CLNEW RangeQuery(nullTerm, t, true);
-+ q = _CLNEW RangeQuery(0, t, true);
- break;
- case Strigi::Query::GreaterThan:
- t = createTerm(fieldname.c_str(), query.term().string());
-- q = _CLNEW RangeQuery(t, nullTerm, false);
-+ q = _CLNEW RangeQuery(t, 0, false);
- break;
- case Strigi::Query::GreaterThanEquals:
- t = createTerm(fieldname.c_str(), query.term().string());
-- q = _CLNEW RangeQuery(t, nullTerm, true);
-+ q = _CLNEW RangeQuery(t, 0, true);
- break;
- case Strigi::Query::Keyword:
- t = createKeywordTerm(fieldname.c_str(), query.term().string());
-@@ -282,6 +279,7 @@ CLuceneIndexReader::Private::createSingl
- q = _CLNEW TermQuery(t);
- }
- }
-+ _CLDECDELETE(t);
- return q;
- }
- Query*
-@@ -584,12 +582,13 @@ CLuceneIndexReader::documentId(const str
- if (reader == NULL) return -1;
- int64_t id = -1;
-
-- LuceneTerm term(_CLNEW Term(mapId(Private::systemlocation()), utf8toucs2( uri ).c_str()));
-+ Term* term = _CLNEW Term(mapId(Private::systemlocation()), utf8toucs2( uri ).c_str());
- TermDocs* docs = reader->termDocs(term);
- if (docs->next()) {
- id = docs->doc();
- }
- _CLDELETE(docs);
-+ _CLDECDELETE(term);
-
- if (id != -1 && reader->isDeleted((int32_t)id)) {
- id = -1;
-@@ -770,12 +769,13 @@ CLuceneIndexReader::keywords(const strin
- const wchar_t* prefixtext = prefix.c_str();
- string::size_type prefixLen = prefix.length();
- vector<string>::const_iterator i;
-- LuceneTerm lastTerm;
-+ Term* lastTerm;
- for (i = fn.begin(); i != fn.end() && s.size() << max; ++i) {
- wstring fieldname(utf8toucs2(*i));
-- LuceneTerm term(_CLNEW Term(fieldname.c_str(), prefix.c_str()));
-+ Term* term = _CLNEW Term(fieldname.c_str(), prefix.c_str());
- TermEnum* enumerator = reader->terms(term);
- do {
-+ _CLDECDELETE(lastTerm);
- lastTerm = enumerator->term();
- if (lastTerm) {
- if (prefixLen > lastTerm->textLength()
-@@ -786,7 +786,9 @@ CLuceneIndexReader::keywords(const strin
- s.insert(lastTerm->text());
- }
- } while (enumerator->next() && s.size() < max);
-+ _CLDECDELETE(term);
- }
-+ _CLDECDELETE(lastTerm);
-
- k.reserve(s.size());
- set<wstring>::const_iterator j;
-diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp
---- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2011-06-02 11:29:26.000000000 +0200
-+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2011-08-18 02:43:46.000000000 +0200
-@@ -45,7 +45,6 @@ using lucene::util::BitSet;
- using lucene::util::Reader;
- using namespace std;
- using namespace Strigi;
--typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
-
- struct CLuceneDocData {
- lucene::document::Document doc;
-@@ -219,18 +218,19 @@ void
- CLuceneIndexWriter::deleteEntry(const string& entry, lucene::index::IndexWriter* writer, lucene::index::IndexReader* reader) {
- wstring path(utf8toucs2(entry));
- {
-- LuceneTerm t(_CLNEW Term(systemlocation(), path.c_str()));
-+ Term* t = _CLNEW Term(systemlocation(), path.c_str());
- writer->deleteDocuments(t);
-+ _CLDECDELETE(t);
- }
- {
-- LuceneTerm t(_CLNEW Term(parentlocation(), path.c_str()));
-+ Term* t = _CLNEW Term(parentlocation(), path.c_str());
- writer->deleteDocuments(t);
--
-+ _CLDECDELETE(t);
- }
- {
- // delete all deeper nested files
- wstring v = utf8toucs2(entry+"/");
-- LuceneTerm t(_CLNEW Term(parentlocation(), v.c_str()));
-+ Term* t(_CLNEW Term(parentlocation(), v.c_str()));
- PrefixFilter* filter = _CLNEW PrefixFilter(t);
- BitSet* b = filter->bits(reader);
- _CLDELETE(filter);
-@@ -241,6 +241,7 @@ CLuceneIndexWriter::deleteEntry(const st
- }
- }
- _CLDELETE(b);
-+ _CLDECDELETE(t);
- }
- }
- void
-diff -upr strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp
---- strigi-0.7.5.orig/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp 2011-06-02 11:29:26.000000000 +0200
-+++ strigi-0.7.5/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp 2011-08-18 02:43:46.000000000 +0200
-@@ -40,7 +40,6 @@ using lucene::search::HitCollector;
- using lucene::util::BitSet;
- using lucene::document::DocumentFieldEnumeration;
- using lucene::index::IndexReader;
--typedef boost::shared_ptr<lucene::index::Term> LuceneTerm;
-
- std::string
- t2a(const TCHAR* t) {
-@@ -68,10 +67,11 @@ indexdump(const char* dir) {
- }
- }
- TermEnum* terms = indexreader->terms();
-- LuceneTerm t;
-+ Term* t = 0;
- while (terms->next()) {
- t = terms->term();
- printf("%s: %s\n", t2a(t->field()).c_str(), t2a(t->text()).c_str());
-+ _CLDECDELETE(t);
- }
- }
- int
diff --git a/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch b/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch
deleted file mode 100644
index ee1bfc0..0000000
--- a/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ruN strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
---- strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-06-02 11:29:26.000000000 +0200
-+++ strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-08-02 23:25:04.936181179 +0200
-@@ -1,6 +1,7 @@
- /* This file is part of Strigi Desktop Search
- *
- * Copyright (C) 2010 Evgeny Egorochkin <phreedom.stdin@gmail.com>
-+ * Copyright (C) 2011 Tirtha Chatterjee <tirtha.p.chatterjee@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
-@@ -348,7 +349,7 @@
- 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 +360,7 @@
- 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 +371,16 @@
- 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));
-+
-+ //FIXME we must stop using the deprecated fuction av_metadata_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);
-+ 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 +417,7 @@
- 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 +467,83 @@
- }
-
- // Tags
--
-- if (int32_t len = strlen(fc->title)) {
-- ar.addValue(factory->titleProperty, string(fc->title, len) );
-+
-+ AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
-+ if (entry != NULL)
-+ {
-+ const char *titleValue = entry->value;
-+ if (int32_t len = strlen(titleValue)) {
-+ ar.addValue(factory->titleProperty, string(titleValue, len) );
-+ }
-+ }
-+
-+ entry = av_metadata_get(fc->metadata, "author", NULL, 0);
-+ 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) );
-+ }
-+ }
-+
-+ entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
-+ if (entry != NULL)
-+ {
-+ const char *copyrightValue = entry->value;
-+ if (int32_t len = strlen(copyrightValue)) {
-+ ar.addValue(factory->copyrightProperty, string(copyrightValue, 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);
-+
-+ entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
-+ if (entry != NULL)
-+ {
-+ const char *commentValue = entry->value;
-+ if (int32_t len = strlen(commentValue)) {
-+ ar.addValue(factory->commentProperty, string(commentValue, len) );
-+ }
-+ }
-+
-+ entry = av_metadata_get(fc->metadata, "album", NULL, 0);
-+ 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) );
-+
-+ entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
-+ 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);
-+
-+ entry = av_metadata_get(fc->metadata, "track", NULL, 0);
-+ 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);
-+
-+ entry = av_metadata_get(fc->metadata, "year", NULL, 0);
-+ 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/app-misc/strigi/strigi-0.7.5-r3.ebuild b/app-misc/strigi/strigi-0.7.5-r3.ebuild
deleted file mode 100644
index b80205a..0000000
--- a/app-misc/strigi/strigi-0.7.5-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ "${PV}" != "9999" ]]; then
- SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- EGIT_REPO_URI="git://anongit.kde.org/strigi"
- GIT_ECLASS="git-2"
- EGIT_HAS_SUBMODULES="true"
- KEYWORDS=""
-fi
-
-inherit cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
-
-COMMONDEPEND="
- app-arch/bzip2:0
- dev-libs/libxml2:2
- sys-libs/zlib:0
- virtual/libiconv
- clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
- dbus? (
- sys-apps/dbus
- qt4? ( x11-libs/qt-dbus:4 )
- )
- exif? ( >=media-gfx/exiv2-0.17 )
- fam? ( virtual/fam )
- ffmpeg? ( virtual/ffmpeg )
- hyperestraier? ( app-text/hyperestraier )
- log? ( >=dev-libs/log4cxx-0.10.0 )
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- )
-"
-DEPEND="${COMMONDEPEND}
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMONDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
- "${FILESDIR}/${PN}-0.7.5-ffmpeg.patch"
- "${FILESDIR}/${PN}-0.7.5-clucene23.patch"
-)
-
-src_configure() {
- # Enabled: POLLING (only reliable way to check for files changed.)
- # Disabled: xine - recommended upstream to keep it this way
- mycmakeargs=(
- -DENABLE_POLLING=ON
- -DFORCE_DEPS=ON
- -DENABLE_CPPUNIT=OFF
- -DENABLE_REGENERATEXSD=OFF
- -DENABLE_XINE=OFF
- $(cmake-utils_use_enable clucene)
- $(cmake-utils_use_enable dbus)
- $(cmake-utils_use_enable exif EXIV2)
- $(cmake-utils_use_enable fam)
- $(cmake-utils_use_enable ffmpeg)
- $(cmake-utils_use_enable hyperestraier)
- $(cmake-utils_use_enable inotify)
- $(cmake-utils_use_enable log LOG4CXX)
- $(cmake-utils_use_enable qt4)
- $(cmake-utils_use_enable test CPPUNIT)
- )
-
- if use qt4; then
- mycmakeargs+=(-DENABLE_DBUS=ON)
- fi
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if ! use clucene && ! use hyperestraier; then
- echo
- elog "Because you didn't enable either of the available backends:"
- elog "clucene or hyperestraier, strigi may not be functional."
- elog "If you intend to use standalone strigi indexer (not needed for KDE),"
- elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
- elog "or hyperestraier (unreliable) USE flag enabled."
- echo
- fi
-}
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index d9dae36..41ed4e1 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.6.ebuild,v 1.1 2011/09/25 19:11:25 dilfridge Exp $
EAPI=4
if [[ "${PV}" != "9999" ]]; then
- SRC_URI="http://www.vandenoever.info/software/${PN}/${P}.tar.bz2"
+ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
else
EGIT_REPO_URI="git://anongit.kde.org/strigi"
@@ -17,7 +17,7 @@ fi
inherit cmake-utils ${GIT_ECLASS}
DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
-HOMEPAGE="http://strigi.sourceforge.net/"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
LICENSE="GPL-2"
SLOT="0"
@@ -47,6 +47,10 @@ DEPEND="${COMMONDEPEND}
test? ( dev-util/cppunit )"
RDEPEND="${COMMONDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
+)
+
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
# Disabled: xine - recommended upstream to keep it this way
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2011-10-02 10:03 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2011-10-02 10:03 UTC (permalink / raw
To: gentoo-commits
commit: 730e2c870ea173dee1ea8a0c5dd5d42b3a5dfa21
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Sun Oct 2 10:02:13 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Sun Oct 2 10:02:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=730e2c87
[app-misc/strigi] Removed patch, applied upstream
(Portage version: 2.2.0_alpha60/git/Linux x86_64, signed Manifest commit with key DF018462)
---
app-misc/strigi/files/strigi-0.7.5-no-qt4.patch | 11 -----------
app-misc/strigi/strigi-9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
deleted file mode 100644
index 3f9944a..0000000
--- a/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- strigiclient/lib/CMakeLists.txt.orig 2011-07-13 19:57:19.000000000 +0200
-+++ strigiclient/lib/CMakeLists.txt 2011-07-13 19:59:15.000000000 +0200
-@@ -1,4 +1,7 @@
- if(NOT WIN32)
- add_subdirectory(htmlgui)
- endif(NOT WIN32)
--add_subdirectory(searchclient)
-+
-+if(QT4_FOUND)
-+ add_subdirectory(searchclient)
-+endif(QT4_FOUND)
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 8e07bad..efb8fb2 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -48,10 +48,6 @@ DEPEND="${COMMONDEPEND}
test? ( dev-util/cppunit )"
RDEPEND="${COMMONDEPEND}"
-PATCHES=(
- "${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
-)
-
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
# Disabled: xine - recommended upstream to keep it this way
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2012-10-30 13:39 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2012-10-30 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 962df890adcbe3e3a91a4d11d7579d32834337da
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 13:34:58 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 13:34:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=962df890
[app-misc/strigi] Try another potential fix for bug #427050.
Package-Manager: portage-2.1.11.31
---
app-misc/strigi/files/strigi-fix-sleep.patch | 11 -----------
app-misc/strigi/strigi-9999.ebuild | 7 +------
2 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/app-misc/strigi/files/strigi-fix-sleep.patch b/app-misc/strigi/files/strigi-fix-sleep.patch
deleted file mode 100644
index ab690c0..0000000
--- a/app-misc/strigi/files/strigi-fix-sleep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eventlistenerqueue2.cpp 2012-10-09 11:53:24.662572336 +0800
-+++ eventlistenerqueue.cpp 2012-10-09 11:53:41.269242216 +0800
-@@ -26,6 +26,7 @@
- #include <algorithm>
- #include <iostream>
- #include <stdio.h>
-+#include <unistd.h>
-
- #if defined(__SUNPRO_CC)
- #include <unistd.h>
-
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 3aa0780..14f1862 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -53,16 +53,11 @@ if [[ ${PV} == 9999 ]] ; then
git config --global url."git://anongit.kde.org/".insteadOf "kde:" || die
git-2_src_unpack
pushd "${S}" > /dev/null || die
- git submodule foreach git checkout master || die
+ git submodule foreach git pull origin master || die
popd > /dev/null || die
}
fi
-src_prepare() {
- cd ${S}/strigidaemon/bin/daemon/eventlistener
- epatch ${FILESDIR}/strigi-fix-sleep.patch || die "Fail"
-}
-
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
# Disabled: xine - recommended upstream to keep it this way
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2012-11-05 3:14 Patrick Lauer
0 siblings, 0 replies; 7+ messages in thread
From: Patrick Lauer @ 2012-11-05 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 0578cf927c2ba51837e121f792aa4d241947154f
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 03:13:58 2012 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 03:13:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0578cf92
Revert "[app-misc/strigi] Try another potential fix for bug #427050."
This reverts commit 962df890adcbe3e3a91a4d11d7579d32834337da.
---
app-misc/strigi/files/strigi-fix-sleep.patch | 11 +++++++++++
app-misc/strigi/strigi-9999.ebuild | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/app-misc/strigi/files/strigi-fix-sleep.patch b/app-misc/strigi/files/strigi-fix-sleep.patch
new file mode 100644
index 0000000..ab690c0
--- /dev/null
+++ b/app-misc/strigi/files/strigi-fix-sleep.patch
@@ -0,0 +1,11 @@
+--- eventlistenerqueue2.cpp 2012-10-09 11:53:24.662572336 +0800
++++ eventlistenerqueue.cpp 2012-10-09 11:53:41.269242216 +0800
+@@ -26,6 +26,7 @@
+ #include <algorithm>
+ #include <iostream>
+ #include <stdio.h>
++#include <unistd.h>
+
+ #if defined(__SUNPRO_CC)
+ #include <unistd.h>
+
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 14f1862..3aa0780 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -53,11 +53,16 @@ if [[ ${PV} == 9999 ]] ; then
git config --global url."git://anongit.kde.org/".insteadOf "kde:" || die
git-2_src_unpack
pushd "${S}" > /dev/null || die
- git submodule foreach git pull origin master || die
+ git submodule foreach git checkout master || die
popd > /dev/null || die
}
fi
+src_prepare() {
+ cd ${S}/strigidaemon/bin/daemon/eventlistener
+ epatch ${FILESDIR}/strigi-fix-sleep.patch || die "Fail"
+}
+
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
# Disabled: xine - recommended upstream to keep it this way
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/
@ 2013-02-25 12:07 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2013-02-25 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 0e01875c54285db89463225dbccd2ad6ab9fc4a2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 12:06:25 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 12:06:25 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0e01875c
[app-misc/strigi] Drop patch wrt bug #427050.
Package-Manager: portage-2.1.11.52
---
app-misc/strigi/files/strigi-fix-sleep.patch | 11 -----------
app-misc/strigi/strigi-9999.ebuild | 5 -----
2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/app-misc/strigi/files/strigi-fix-sleep.patch b/app-misc/strigi/files/strigi-fix-sleep.patch
deleted file mode 100644
index ab690c0..0000000
--- a/app-misc/strigi/files/strigi-fix-sleep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eventlistenerqueue2.cpp 2012-10-09 11:53:24.662572336 +0800
-+++ eventlistenerqueue.cpp 2012-10-09 11:53:41.269242216 +0800
-@@ -26,6 +26,7 @@
- #include <algorithm>
- #include <iostream>
- #include <stdio.h>
-+#include <unistd.h>
-
- #if defined(__SUNPRO_CC)
- #include <unistd.h>
-
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 6fbd65e..bb8519a 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -58,11 +58,6 @@ if [[ ${PV} == 9999 ]] ; then
}
fi
-src_prepare() {
- cd "${S}/strigidaemon/bin/daemon/eventlistener"
- epatch "${FILESDIR}/strigi-fix-sleep.patch" || die "Fail"
-}
-
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
# Disabled: xine - recommended upstream to keep it this way
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-25 12:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-30 13:39 [gentoo-commits] proj/kde:master commit in: app-misc/strigi/, app-misc/strigi/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2013-02-25 12:07 Michael Palimaka
2012-11-05 3:14 Patrick Lauer
2011-10-02 10:03 Johannes Huber
2011-09-25 19:12 Andreas Hüttel
2011-08-19 15:37 Johannes Huber
2011-07-13 22:49 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox