Sat Feb 9 22:32:46 2013 UTC ()
Update to 0.7.8

0.7.8 (2013-02-05)
 - Fix xpm and xbm index.
 - Extract tracknumber and track count from a value like "03/16".
 - Fixed indexing of m3u files.
 - Fix FLAC Files: Remove addtional 'db' in replaygain
 - Fix: flac analizer was importing only one artist tag.
 - Fix: non numeric genres in id3 v2 mp3 are ignored.
 - Fix parsing of genre field in id3v2 tags
 - Change: TPE2 tag it's used as nmm:albumArtist instead as nmm:performer
   in ID3 analyzer.
 - Change: added support to TRACKTOTAL tag as an equivalent to TRACKCOUNT
   in FLAC analyzer.
 - C++11 fixes
 - Let the strigi ffmpeg plugin compile on modern ffmpeg versions.
 - Simeon Bird (Let the ffmpeg analyser deal with files with have track
   numbers with a / in them)
 - Remove dependency on boost.
 - Use GNUInstallDirs in order to install into lib64 automatically
 - Install a version file for the CMake config module
 - Allow the Strigi submodules to be installed in custom prefixes.


(markd)
diff -r1.29 -r1.30 pkgsrc/sysutils/strigi/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/strigi/PLIST
diff -r1.7 -r1.8 pkgsrc/sysutils/strigi/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/strigi/patches/patch-libstreams_CMakeLists.txt
cvs diff -r1.29 -r1.30 pkgsrc/sysutils/strigi/Makefile (switch to unified diff)

--- pkgsrc/sysutils/strigi/Makefile 2013/02/06 23:23:53 1.29
+++ pkgsrc/sysutils/strigi/Makefile 2013/02/09 22:32:45 1.30
@@ -1,53 +1,52 @@ @@ -1,53 +1,52 @@
1# $NetBSD: Makefile,v 1.29 2013/02/06 23:23:53 jperkin Exp $ 1# $NetBSD: Makefile,v 1.30 2013/02/09 22:32:45 markd Exp $
2 2
3DISTNAME= strigi-0.7.7 3DISTNAME= strigi-0.7.8
4PKGREVISION= 1 
5CATEGORIES= sysutils 4CATEGORIES= sysutils
6MASTER_SITES= http://rdieter.fedorapeople.org/strigi/ 5MASTER_SITES= http://www.vandenoever.info/software/strigi/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://strigi.sourceforge.net/ 9HOMEPAGE= http://strigi.sourceforge.net/
11COMMENT= Small fast desktop searching program 10COMMENT= Small fast desktop searching program
12LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
13 12
14USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
15USE_TOOLS+= gmake pkg-config perl 14USE_TOOLS+= gmake pkg-config perl
16USE_CMAKE= yes 15USE_CMAKE= yes
17 16
18PKGCONFIG_OVERRIDE+= src/streamanalyzer/libstreamanalyzer.pc.cmake 17PKGCONFIG_OVERRIDE+= src/streamanalyzer/libstreamanalyzer.pc.cmake
19PKGCONFIG_OVERRIDE+= src/streams/libstreams.pc.cmake 18PKGCONFIG_OVERRIDE+= src/streams/libstreams.pc.cmake
20 19
21.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
22.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h) 21.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
23RT_LIB_SCHED= -lrt 22RT_LIB_SCHED= -lrt
24.else 23.else
25RT_LIB_SCHED= # empty 24RT_LIB_SCHED= # empty
26.endif 25.endif
27 26
28CFLAGS.SunOS+= -DCMAKE_HAVE_PTHREAD_CREATE 27CFLAGS.SunOS+= -DCMAKE_HAVE_PTHREAD_CREATE
29LDFLAGS.SunOS+= -mimpure-text -lrt 28LDFLAGS.SunOS+= -mimpure-text -lrt
30 29
31CMAKE_ARGS+= -DENABLE_FFMPEG=OFF 30CMAKE_ARGS+= -DENABLE_FFMPEG=OFF
32.if !empty(RT_LIB_SCHED) 31.if !empty(RT_LIB_SCHED)
33# these use sched_setscheduler 32# these use sched_setscheduler
34CMAKE_ARGS+= -Dstrigidaemon_LIBS=${RT_LIB_SCHED} 33CMAKE_ARGS+= -Dstrigidaemon_LIBS=${RT_LIB_SCHED}
35CMAKE_ARGS+= -Dtest_LIBS=${RT_LIB_SCHED} 34CMAKE_ARGS+= -Dtest_LIBS=${RT_LIB_SCHED}
36.endif 35.endif
37 36
38pre-configure: 37pre-configure:
39 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 38 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
40 39
41.include "../../archivers/bzip2/buildlink3.mk" 40.include "../../archivers/bzip2/buildlink3.mk"
42.include "../../converters/libiconv/buildlink3.mk" 41.include "../../converters/libiconv/buildlink3.mk"
43.include "../../devel/cppunit/buildlink3.mk" 42.include "../../devel/cppunit/buildlink3.mk"
44.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
45.include "../../graphics/exiv2/buildlink3.mk" 44.include "../../graphics/exiv2/buildlink3.mk"
46.include "../../textproc/libclucene/buildlink3.mk" 45.include "../../textproc/libclucene/buildlink3.mk"
47.include "../../textproc/libxml2/buildlink3.mk" 46.include "../../textproc/libxml2/buildlink3.mk"
48.include "../../sysutils/dbus/buildlink3.mk" 47.include "../../sysutils/dbus/buildlink3.mk"
49.include "../../x11/qt4-libs/buildlink3.mk" 48.include "../../x11/qt4-libs/buildlink3.mk"
50.include "../../x11/qt4-tools/buildlink3.mk" 49.include "../../x11/qt4-tools/buildlink3.mk"
51.include "../../x11/qt4-qdbus/buildlink3.mk" 50.include "../../x11/qt4-qdbus/buildlink3.mk"
52.include "../../mk/fam.buildlink3.mk" 51.include "../../mk/fam.buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/strigi/PLIST (switch to unified diff)

--- pkgsrc/sysutils/strigi/PLIST 2013/02/04 20:21:08 1.5
+++ pkgsrc/sysutils/strigi/PLIST 2013/02/09 22:32:45 1.6
@@ -1,127 +1,130 @@ @@ -1,127 +1,130 @@
1@comment $NetBSD: PLIST,v 1.5 2013/02/04 20:21:08 markd Exp $ 1@comment $NetBSD: PLIST,v 1.6 2013/02/09 22:32:45 markd Exp $
2bin/deepfind 2bin/deepfind
3bin/deepgrep 3bin/deepgrep
4bin/luceneindexer 4bin/luceneindexer
5bin/rdfindexer 5bin/rdfindexer
6bin/strigiclient 6bin/strigiclient
7bin/strigicmd 7bin/strigicmd
8bin/strigidaemon 8bin/strigidaemon
9bin/xmlindexer 9bin/xmlindexer
10include/strigi/analysisresult.h 10include/strigi/analysisresult.h
11include/strigi/analyzerconfiguration.h 11include/strigi/analyzerconfiguration.h
12include/strigi/analyzerplugin.h 12include/strigi/analyzerplugin.h
13include/strigi/archivereader.h 13include/strigi/archivereader.h
14include/strigi/arinputstream.h 14include/strigi/arinputstream.h
15include/strigi/asyncsocket.h 15include/strigi/asyncsocket.h
16include/strigi/asyncsocketclient.h 16include/strigi/asyncsocketclient.h
17include/strigi/bufferedstream.h 17include/strigi/bufferedstream.h
18include/strigi/bz2inputstream.h 18include/strigi/bz2inputstream.h
19include/strigi/classproperties.h 19include/strigi/classproperties.h
20include/strigi/clientinterface.h 20include/strigi/clientinterface.h
21include/strigi/cpioinputstream.h 21include/strigi/cpioinputstream.h
22include/strigi/dataeventinputstream.h 22include/strigi/dataeventinputstream.h
23include/strigi/diranalyzer.h 23include/strigi/diranalyzer.h
24include/strigi/encodinginputstream.h 24include/strigi/encodinginputstream.h
25include/strigi/fieldproperties.h 25include/strigi/fieldproperties.h
26include/strigi/fieldpropertiesdb.h 26include/strigi/fieldpropertiesdb.h
27include/strigi/fieldtypes.h 27include/strigi/fieldtypes.h
28include/strigi/fileinputstream.h 28include/strigi/fileinputstream.h
29include/strigi/filelister.h 29include/strigi/filelister.h
30include/strigi/gzipinputstream.h 30include/strigi/gzipinputstream.h
31include/strigi/indexeddocument.h 31include/strigi/indexeddocument.h
32include/strigi/indexmanager.h 32include/strigi/indexmanager.h
33include/strigi/indexplugin.h 33include/strigi/indexplugin.h
34include/strigi/indexpluginloader.h 34include/strigi/indexpluginloader.h
35include/strigi/indexreader.h 35include/strigi/indexreader.h
36include/strigi/indexwriter.h 36include/strigi/indexwriter.h
37include/strigi/inputstream.h 37include/strigi/inputstream.h
38include/strigi/inputstreamreader.h 38include/strigi/inputstreamreader.h
39include/strigi/kmpsearcher.h 39include/strigi/kmpsearcher.h
40include/strigi/lzmainputstream.h 40include/strigi/lzmainputstream.h
41include/strigi/mailinputstream.h 41include/strigi/mailinputstream.h
42include/strigi/oleinputstream.h 42include/strigi/oleinputstream.h
43include/strigi/processinputstream.h 43include/strigi/processinputstream.h
44include/strigi/qtdbus/strigiasyncclient.h 44include/strigi/qtdbus/strigiasyncclient.h
45include/strigi/qtdbus/strigiclient.h 45include/strigi/qtdbus/strigiclient.h
46include/strigi/qtdbus/strigidbus.h 46include/strigi/qtdbus/strigidbus.h
47include/strigi/qtdbus/strigitypes.h 47include/strigi/qtdbus/strigitypes.h
48include/strigi/query.h 48include/strigi/query.h
49include/strigi/queryparser.h 49include/strigi/queryparser.h
50include/strigi/rpminputstream.h 50include/strigi/rpminputstream.h
51include/strigi/sdfinputstream.h 51include/strigi/sdfinputstream.h
52include/strigi/socketclient.h 52include/strigi/socketclient.h
53include/strigi/streamanalyzer.h 53include/strigi/streamanalyzer.h
54include/strigi/streamanalyzerfactory.h 54include/strigi/streamanalyzerfactory.h
55include/strigi/streambase.h 55include/strigi/streambase.h
56include/strigi/streambuffer.h 56include/strigi/streambuffer.h
57include/strigi/streamendanalyzer.h 57include/strigi/streamendanalyzer.h
58include/strigi/streameventanalyzer.h 58include/strigi/streameventanalyzer.h
59include/strigi/streamlineanalyzer.h 59include/strigi/streamlineanalyzer.h
60include/strigi/streamsaxanalyzer.h 60include/strigi/streamsaxanalyzer.h
61include/strigi/streamthroughanalyzer.h 61include/strigi/streamthroughanalyzer.h
62include/strigi/strigi_thread.h 62include/strigi/strigi_thread.h
63include/strigi/strigiconfig.h 63include/strigi/strigiconfig.h
64include/strigi/strigihtmlgui.h 64include/strigi/strigihtmlgui.h
65include/strigi/stringstream.h 65include/strigi/stringstream.h
66include/strigi/stringterminatedsubstream.h 66include/strigi/stringterminatedsubstream.h
67include/strigi/subinputstream.h 67include/strigi/subinputstream.h
68include/strigi/substreamprovider.h 68include/strigi/substreamprovider.h
69include/strigi/substreamproviderprovider.h 69include/strigi/substreamproviderprovider.h
70include/strigi/tarinputstream.h 70include/strigi/tarinputstream.h
71include/strigi/textutils.h 71include/strigi/textutils.h
72include/strigi/variant.h 72include/strigi/variant.h
73include/strigi/zipinputstream.h 73include/strigi/zipinputstream.h
 74lib/cmake/LibSearchClient/LibSearchClientConfig.cmake
 75lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
 76lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
 77lib/cmake/LibStreams/LibStreamsConfig.cmake
 78lib/cmake/LibStreams/LibStreamsConfigVersion.cmake
 79lib/cmake/LibStreams/LibStreamsTargets-noconfig.cmake
 80lib/cmake/LibStreams/LibStreamsTargets.cmake
 81lib/cmake/Strigi/StrigiConfig.cmake
 82lib/cmake/Strigi/StrigiConfigVersion.cmake
74lib/libsearchclient.so 83lib/libsearchclient.so
75lib/libsearchclient.so.0 84lib/libsearchclient.so.0
76lib/libsearchclient.so.${PKGVERSION} 85lib/libsearchclient.so.${PKGVERSION}
77lib/libsearchclient/LibSearchClientConfig.cmake 
78lib/libstreamanalyzer.so 86lib/libstreamanalyzer.so
79lib/libstreamanalyzer.so.0 87lib/libstreamanalyzer.so.0
80lib/libstreamanalyzer.so.${PKGVERSION} 88lib/libstreamanalyzer.so.${PKGVERSION}
81lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake 
82lib/libstreams.so 89lib/libstreams.so
83lib/libstreams.so.0 90lib/libstreams.so.0
84lib/libstreams.so.${PKGVERSION} 91lib/libstreams.so.${PKGVERSION}
85lib/libstreams/LibStreamsConfig.cmake 
86lib/libstreams/LibStreamsTargets-noconfig.cmake 
87lib/libstreams/LibStreamsTargets.cmake 
88lib/libstrigihtmlgui.so 92lib/libstrigihtmlgui.so
89lib/libstrigihtmlgui.so.0 93lib/libstrigihtmlgui.so.0
90lib/libstrigihtmlgui.so.${PKGVERSION} 94lib/libstrigihtmlgui.so.${PKGVERSION}
91lib/libstrigiqtdbusclient.so 95lib/libstrigiqtdbusclient.so
92lib/libstrigiqtdbusclient.so.0 96lib/libstrigiqtdbusclient.so.0
93lib/libstrigiqtdbusclient.so.${PKGVERSION} 97lib/libstrigiqtdbusclient.so.${PKGVERSION}
94lib/pkgconfig/libstreamanalyzer.pc 98lib/pkgconfig/libstreamanalyzer.pc
95lib/pkgconfig/libstreams.pc 99lib/pkgconfig/libstreams.pc
96lib/strigi/StrigiConfig.cmake 
97lib/strigi/strigiea_digest.so 100lib/strigi/strigiea_digest.so
98lib/strigi/strigiea_jpeg.so 101lib/strigi/strigiea_jpeg.so
99lib/strigi/strigiea_riff.so 102lib/strigi/strigiea_riff.so
100lib/strigi/strigiindex_clucene.so 103lib/strigi/strigiindex_clucene.so
101lib/strigi/strigila_cpp.so 104lib/strigi/strigila_cpp.so
102lib/strigi/strigila_deb.so 105lib/strigi/strigila_deb.so
103lib/strigi/strigila_namespaceharvester.so 106lib/strigi/strigila_namespaceharvester.so
104lib/strigi/strigila_txt.so 107lib/strigi/strigila_txt.so
105lib/strigi/strigila_xpm.so 108lib/strigi/strigila_xpm.so
106lib/strigi/strigita_au.so 109lib/strigi/strigita_au.so
107lib/strigi/strigita_avi.so 110lib/strigi/strigita_avi.so
108lib/strigi/strigita_dds.so 111lib/strigi/strigita_dds.so
109lib/strigi/strigita_gif.so 112lib/strigi/strigita_gif.so
110lib/strigi/strigita_ico.so 113lib/strigi/strigita_ico.so
111lib/strigi/strigita_pcx.so 114lib/strigi/strigita_pcx.so
112lib/strigi/strigita_rgb.so 115lib/strigi/strigita_rgb.so
113lib/strigi/strigita_sid.so 116lib/strigi/strigita_sid.so
114lib/strigi/strigita_wav.so 117lib/strigi/strigita_wav.so
115lib/strigi/strigita_xbm.so 118lib/strigi/strigita_xbm.so
116share/dbus-1/services/org.freedesktop.xesam.searcher.service 119share/dbus-1/services/org.freedesktop.xesam.searcher.service
117share/dbus-1/services/vandenoever.strigi.service 120share/dbus-1/services/vandenoever.strigi.service
118share/strigi/fieldproperties/homeless.rdfs 121share/strigi/fieldproperties/homeless.rdfs
119share/strigi/fieldproperties/nao_data.rdfs 122share/strigi/fieldproperties/nao_data.rdfs
120share/strigi/fieldproperties/ncal_data.rdfs 123share/strigi/fieldproperties/ncal_data.rdfs
121share/strigi/fieldproperties/nco_data.rdfs 124share/strigi/fieldproperties/nco_data.rdfs
122share/strigi/fieldproperties/nexif_data.rdfs 125share/strigi/fieldproperties/nexif_data.rdfs
123share/strigi/fieldproperties/nfo_data.rdfs 126share/strigi/fieldproperties/nfo_data.rdfs
124share/strigi/fieldproperties/nid3_data.rdfs 127share/strigi/fieldproperties/nid3_data.rdfs
125share/strigi/fieldproperties/nie_data.rdfs 128share/strigi/fieldproperties/nie_data.rdfs
126share/strigi/fieldproperties/nmo_data.rdfs 129share/strigi/fieldproperties/nmo_data.rdfs
127share/strigi/fieldproperties/strigi.rdfs 130share/strigi/fieldproperties/strigi.rdfs
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/strigi/distinfo (switch to unified diff)

--- pkgsrc/sysutils/strigi/distinfo 2013/02/04 20:21:08 1.7
+++ pkgsrc/sysutils/strigi/distinfo 2013/02/09 22:32:45 1.8
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.7 2013/02/04 20:21:08 markd Exp $ 1$NetBSD: distinfo,v 1.8 2013/02/09 22:32:45 markd Exp $
2 2
3SHA1 (strigi-0.7.7.tar.bz2) = a3100f851bb1a15231a863a5e66018946e3e8eb3 3SHA1 (strigi-0.7.8.tar.bz2) = 7250fb15109d33b0c49995a2cc3513ba7d937882
4RMD160 (strigi-0.7.7.tar.bz2) = 91610503ab3e9090bfd87213825112d3ab64deb8 4RMD160 (strigi-0.7.8.tar.bz2) = 34cbbe98e7a371467b115b18586baf299340d1b8
5Size (strigi-0.7.7.tar.bz2) = 807093 bytes 5Size (strigi-0.7.8.tar.bz2) = 810574 bytes
 6SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a
File Added: pkgsrc/sysutils/strigi/patches/patch-libstreams_CMakeLists.txt
$NetBSD: patch-libstreams_CMakeLists.txt,v 1.1 2013/02/09 22:32:45 markd Exp $

config.h must be generated after package tests.  Specifically
find_package(Iconv) sets ICONV_SECOND_ARGUMENT_IS_CONST

--- libstreams/CMakeLists.txt.orig	2013-02-05 21:34:57.000000000 +0000
+++ libstreams/CMakeLists.txt
@@ -46,9 +46,6 @@ endif()
 # check for visibility support
 macro_check_gcc_visibility(__STRIGI_HAVE_GCC_VISIBILITY)
 
-# Generate include/strigi/strigiconfig.h and lib/config.h
-include(ConfigureChecks.cmake)
-
 # check for required packages
 find_package(ZLIB)
 set_package_properties(ZLIB PROPERTIES
@@ -75,6 +72,9 @@ set_package_properties(Threads PROPERTIE
                        TYPE REQUIRED
                       )
 
+# Generate include/strigi/strigiconfig.h and lib/config.h
+include(ConfigureChecks.cmake)
+
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 ##### building and testing #####