diff options
Diffstat (limited to 'deps/strigi')
-rw-r--r-- | deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff | 16 | ||||
-rw-r--r-- | deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz | bin | 325 -> 0 bytes | |||
-rw-r--r-- | deps/strigi/strigi-fix-jpeg-isospeedratings.diff | 18 | ||||
-rw-r--r-- | deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz | bin | 464 -> 0 bytes | |||
-rw-r--r-- | deps/strigi/strigi-fix-missing-lucene-lib.diff | 7 | ||||
-rw-r--r-- | deps/strigi/strigi-fix-missing-lucene-lib.diff.gz | bin | 294 -> 0 bytes | |||
-rwxr-xr-x | deps/strigi/strigi.SlackBuild | 21 |
7 files changed, 51 insertions, 11 deletions
diff --git a/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff b/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff new file mode 100644 index 0000000..d4721c3 --- /dev/null +++ b/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff @@ -0,0 +1,16 @@ +Description: Fix FTBFS with gcc 4.7 due to missing <unistd.h> include. +Author: Cyril Brulebois <kibi@debian.org> +Bug-Debian: http://bugs.debian.org/667384 + +--- strigi-0.7.7.orig/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp ++++ strigi-0.7.7/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; + diff --git a/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz b/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz Binary files differdeleted file mode 100644 index e589819..0000000 --- a/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz +++ /dev/null diff --git a/deps/strigi/strigi-fix-jpeg-isospeedratings.diff b/deps/strigi/strigi-fix-jpeg-isospeedratings.diff new file mode 100644 index 0000000..69053d2 --- /dev/null +++ b/deps/strigi/strigi-fix-jpeg-isospeedratings.diff @@ -0,0 +1,18 @@ +diff --git plugins/endplugins/jpegendanalyzer.cpp plugins/endplugins/jpegendanalyzer.cpp +index 78ed36a..0ecab40 100644 +--- a/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp ++++ b/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp +@@ -322,6 +327,11 @@ JpegEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) { + ar.addValue(factory->exifFields.find("Exif.Image.DateTime")->second, uint32_t(mktime(&date))); + } + } ++ else if (i->key() == "Exif.Photo.ISOSpeedRatings") { ++ stringstream st; ++ st << i->toLong(); ++ ar.addValue(factory->exifFields.find("Exif.Photo.ISOSpeedRatings")->second, st.str()); ++ } + else if (i->key() != "Exif.Photo.PixelXDimension" && i->key() != "Exif.Photo.PixelYDimension") { + map<string,const RegisteredField*>::const_iterator f + = factory->exifFields.find(i->key()); + + diff --git a/deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz b/deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz Binary files differdeleted file mode 100644 index 18a5581..0000000 --- a/deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz +++ /dev/null diff --git a/deps/strigi/strigi-fix-missing-lucene-lib.diff b/deps/strigi/strigi-fix-missing-lucene-lib.diff new file mode 100644 index 0000000..cfc9d9e --- /dev/null +++ b/deps/strigi/strigi-fix-missing-lucene-lib.diff @@ -0,0 +1,7 @@ +--- a/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt 2011-07-26 19:12:39.000000000 +0200 ++++ b/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt 2011-12-03 09:52:05.062132856 +0100 +@@ -1,2 +1,2 @@ + add_executable(index2dump indexdump.cpp ../tcharutils.cpp) +-target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS}) ++target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS} clucene-shared) + diff --git a/deps/strigi/strigi-fix-missing-lucene-lib.diff.gz b/deps/strigi/strigi-fix-missing-lucene-lib.diff.gz Binary files differdeleted file mode 100644 index e0be6be..0000000 --- a/deps/strigi/strigi-fix-missing-lucene-lib.diff.gz +++ /dev/null diff --git a/deps/strigi/strigi.SlackBuild b/deps/strigi/strigi.SlackBuild index 69c248a..cfbc3da 100755 --- a/deps/strigi/strigi.SlackBuild +++ b/deps/strigi/strigi.SlackBuild @@ -21,25 +21,24 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2012, 2014 by Eric Hameleers <alien at slackware.com> for ARM port. +# Modified 2012, 2014, 2015 by Eric Hameleers <alien at slackware.com> for ARM port. PKGNAM=strigi VERSION=${VERSION:-0.7.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi if [ "$ARCH" = "i486" ]; then @@ -70,13 +69,13 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -#zcat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff.gz |patch -p1 --verbose || exit 1 +#cat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff |patch -p1 --verbose || exit 1 # Fix a linker DSO error: -zcat $CWD/strigi-fix-missing-lucene-lib.diff.gz |patch -p1 --verbose || exit 1 +cat $CWD/strigi-fix-missing-lucene-lib.diff |patch -p1 --verbose || exit 1 # Fix indexing of jpegs with 'wrong' isoSpeedRatings: -zcat $CWD/strigi-fix-jpeg-isospeedratings.diff.gz |patch -p1 --verbose || exit 1 +cat $CWD/strigi-fix-jpeg-isospeedratings.diff |patch -p1 --verbose || exit 1 # Fix a bug with gcc 4.8: sed -i -e "s/BufferedStream :/STREAMS_EXPORT &/" libstreams/include/strigi/bufferedstream.h |