Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (32325e0fc868397b1c254058a1a18368d6820d8d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (32325e0fc868397b1c254058a1a18368d6820d8d)
  • Date: Sun, 22 Jul 2012 21:22:57 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

utils/strigi/0001-fix-build-for-disabled-qt4-option.patch | 26 --
utils/strigi/DEPENDS | 6
utils/strigi/DETAILS | 12 -
utils/strigi/HISTORY | 14 +
utils/strigi/PRE_BUILD | 11
utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch | 155
++++++++++++++
utils/strigi/strigi-0.7.7-gcc47.patch | 20 +
7 files changed, 209 insertions(+), 35 deletions(-)

New commits:
commit 32325e0fc868397b1c254058a1a18368d6820d8d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

strigi: => 0.7.7
changed SOURCE_URL to debian since 0.7.7 is no longer available from
official sources

DEPENDS: added depends boost
removed optional depends sqlite since it no longer works
re-enabled optional depends ffmpeg, but changed to LIBAVCODEC
PRE_BUILD: removed patch for disabled qt4 build, no longer needed
added patch to fix building on gcc 4.7
if ffmpeg >= 0.11 is enabled, apply patch to fix build with it

* 0001-fix-build-for-disabled-qt4-option.patch: removed, no longer needed
* strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
* strigi-0.7.7-ffmpeg-0.11.patch: added, fixes build with ffmpeg >= 0.11

diff --git a/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
b/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
deleted file mode 100644
index f94e0bc..0000000
--- a/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e92b260635e4fe542c0c606f2a2484334e8240ca Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu AT gmx.de>
-Date: Wed, 13 Jul 2011 18:32:16 +0200
-Subject: [PATCH] fix build for disabled qt4 option
-
----
- lib/CMakeLists.txt | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index ba07497..5c6ae79 100644
---- a/strigiclient/lib/CMakeLists.txt
-+++ b/strigiclient/lib/CMakeLists.txt
-@@ -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)
---
-1.7.3.4
-
-
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index 7f200c9..4e6d40b 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -5,9 +5,9 @@ depends pkgconfig &&
depends openssl &&
depends clucene &&
depends libxml2 &&
+depends boost &&
optional_depends dbus '-DENABLE_DBUS=on' '-DENABLE_DBUS=off' 'message
based indexing' &&
optional_depends -sub DBUS qt4 '-DENABLE_QT4=on' '-DENABLE_QT4=off' 'for qt4
gui' &&
optional_depends FAM '-DENABLE_FAM=on' '' 'file change monitoring' &&
-optional_depends sqlite '-DENABLE_SQLITE=off' '' 'sqlite3 backend (broken)'
&&
-optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'picure indexing' &&
-optional_depends ffmpeg '-DENABLE_FFMPEG=off' '-DENABLE_FFMPEG=off' 'ffmpeg
indexing (broken)'
+optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'picture indexing' &&
+optional_depends LIBAVCODEC '-DENABLE_FFMPEG=on' '-DENABLE_FFMPEG=off'
'video indexing'
diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index d3f2177..3693696 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -1,9 +1,11 @@
SPELL=strigi
- VERSION=0.7.5
-
SOURCE_HASH=sha512:9c6f46475095996927153b9e8ee07d92c4cba0793772792c3a9b40229bdbd2b503fe07bcd3c8d73f235474326b8a601dea20bc77bc64c090248ea414d393c240
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
+ VERSION=0.7.7
+
SOURCE_HASH=sha512:5bc60a1f3cdcbede20d858e3437647aea5e4e76f2850db6b116983f073294e1f06e595e756889700ac2039e720c53273960a0036791864871e552716685b3dc5
+ SOURCE=$SPELL\_$VERSION.orig.tar.bz2
+# SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+# SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
+ SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/s/strigi/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.vandenoever.info/software/strigi/
LICENSE[0]=LGPL
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 3ee1460..ee7c14b 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,17 @@
+2012-07-22 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.7
+ changed SOURCE_URL to debian since 0.7.7 is no longer available from
+ official sources
+ * DEPENDS: added depends boost
+ removed optional depends sqlite since it no longer works
+ re-enabled optional depends ffmpeg, but changed to LIBAVCODEC
+ * PRE_BUILD: removed patch for disabled qt4 build, no longer needed
+ added patch to fix building on gcc 4.7
+ if ffmpeg >= 0.11 is enabled, apply patch to fix build with it
+ * 0001-fix-build-for-disabled-qt4-option.patch: removed, no longer
needed
+ * strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
+ * strigi-0.7.7-ffmpeg-0.11.patch: added, fixes build with ffmpeg >=
0.11
+
2012-02-08 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: ffmpeg optional but currently broken, so option is
disabled either way
diff --git a/utils/strigi/PRE_BUILD b/utils/strigi/PRE_BUILD
index 4f1c189..ee8c21a 100755
--- a/utils/strigi/PRE_BUILD
+++ b/utils/strigi/PRE_BUILD
@@ -1,3 +1,12 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/0001-fix-build-for-disabled-qt4-option.patch
+
+patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-gcc47.patch &&
+
+FFMPEG_VER=0
+if is_depends_enabled $SPELL ffmpeg; then
+ FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
+fi
+if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+ patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-ffmpeg-0.11.patch
+fi
diff --git a/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
b/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
new file mode 100644
index 0000000..465eda4
--- /dev/null
+++ b/utils/strigi/strigi-0.7.7-ffmpeg-0.11.patch
@@ -0,0 +1,155 @@
+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/utils/strigi/strigi-0.7.7-gcc47.patch
b/utils/strigi/strigi-0.7.7-gcc47.patch
new file mode 100644
index 0000000..3e3d318
--- /dev/null
+++ b/utils/strigi/strigi-0.7.7-gcc47.patch
@@ -0,0 +1,20 @@
+commit a8e97f672325557b3fbc84b987299350ec5ac10b
+Author: Rex Dieter <rdieter AT fedoraproject.org>
+Date: Mon Jan 9 11:13:25 2012 -0600
+
+ gcc47 fix, unistd.h header required unconditionally for 'sleep'
+
+diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+index 9fcdcb1..1e97599 100644
+--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
++++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+@@ -27,9 +27,7 @@
+ #include <iostream>
+ #include <stdio.h>
+
+-#if defined(__SUNPRO_CC)
+ #include <unistd.h>
+-#endif
+
+ using namespace std;
+



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (32325e0fc868397b1c254058a1a18368d6820d8d), Sukneet Basuta, 07/22/2012

Archive powered by MHonArc 2.6.24.

Top of Page