New commits:
commit 523db4e2db056de85ac83488bff02a11a1f5cd75
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>
strigi: optional depend ffmpeg, disabled regardless of selection
because compile is broken with it
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index badbe9a..7f200c9 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -9,4 +9,5 @@ optional_depends dbus '-DENABLE_DBUS=on'
'-DENABLE_DBUS=off' 'message based i
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 exiv2 '-DENABLE_EXIV2=on' '' 'picure indexing' &&
+optional_depends ffmpeg '-DENABLE_FFMPEG=off' '-DENABLE_FFMPEG=off' 'ffmpeg
indexing (broken)'
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 4a0342a..3ee1460 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,7 @@
+2012-02-08 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: ffmpeg optional but currently broken, so option is
+ disabled either way
+
2011-08-31 Bor Kraljič <pyrobor AT ver.si>
* strigi.sh: removed /opt/kde4/share
[SM-Commit] GIT changes to master grimoire by Tommy Boatman (523db4e2db056de85ac83488bff02a11a1f5cd75),
Tommy Boatman, 02/08/2012