[Lunar-commits] <moonbase> strigi: Adding a patch. My logs were filling up with these type errors;

[Dennis `stumbles` Veatch]

commit 8a682bdff0179fad853df039ce12954271ceba0e
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Sep 4 06:14:57 2011 -0400

    strigi: Adding a patch. My logs were filling up with these type errors;
    
    Sep  4 05:03:18 sidney kernel: nepomukindexer[8888]: segfault at 20 ip 00007f9fbd128f0b
    sp 00007ffffd65dd50 error 4 in libavformat.so.52.110.0[7f9fbd074000+e6000]
    
    The patch and sedit were adapted from;
    https://projects.kde.org/projects/kdesupport/strigi/libstreamanalyzer/repository/revisions/bb733a4fa0494ac4ca0303a2819746e87da7c875
    
    You might notice fewer crashes with nepomuk.
---
 kde4/utils/strigi/BUILD   |    7 ++++++-
 kde4/utils/strigi/DETAILS |    5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kde4/utils/strigi/BUILD b/kde4/utils/strigi/BUILD
index 89938aa..104a533 100644
--- a/kde4/utils/strigi/BUILD
+++ b/kde4/utils/strigi/BUILD
@@ -1,6 +1,11 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+  patch_it $SOURCE2 0 &&
+  patch_it $SOURCE3 0 &&
+
+# So nepomukindexer stops segfaulting on ffmpeg libavformat.so. Taken from kde support strigi
+# commit bb733a4f.
+  sedit 's:indexing FFMPEG\"):indexing FFMPEG\" COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE ):' libstreamanalyzer/CMakeLists.txt &&
 
 # Sqlite and inotify are unreliabe, so making them a hard off.
   OPTS+=" -DENABLE_SQLITE=OFF -DENABLE_INOTIFY=OFF" &&
diff --git a/kde4/utils/strigi/DETAILS b/kde4/utils/strigi/DETAILS
index 4fee861..31b20a3 100644
--- a/kde4/utils/strigi/DETAILS
+++ b/kde4/utils/strigi/DETAILS
@@ -2,13 +2,16 @@
          VERSION=0.7.5
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=strigi-clucene-01.patch
+         SOURCE3=strigi-ffmpeg-cmake.patch
       SOURCE_URL=http://www.vandenoever.info/software/strigi
      SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:0aa3632e07c58f2ab5c515004b790bda6cfefbf5
      SOURCE2_VFY=sha1:4c6cdfd63a5adc3d44a3fd87c522171c1e5980af
+     SOURCE3_VFY=sha1:93ebb9be17996ddbfa1f749b5b7a7d48ce987270
         WEB_SITE=http://strigi.sourceforge.net
          ENTERED=20070802
-         UPDATED=20110813
+         UPDATED=20110904
            SHORT="A small daemon that can index information"
 
 cat << EOF