Revision bump adds patch from debian to fix build with >=media-video/libav-10, spotted by Nikoli <nikoli@gmx.us>, bug #509304.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

3 files changed, 121 insertions, 2 deletions

diff --git a/app-misc/strigi/ChangeLog b/app-misc/strigi/ChangeLog
index 6dcf60567647..58cbbf30d202 100644
--- a/app-misc/strigi/ChangeLog
+++ b/app-misc/strigi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/strigi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.108 2013/12/22 12:09:17 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/ChangeLog,v 1.109 2014/07/13 11:50:06 johu Exp $
+
+*strigi-0.7.8-r1 (13 Jul 2014)
+
+  13 Jul 2014; Johannes Huber <johu@gentoo.org>
+  +files/strigi-0.7.8-libav10.patch, +strigi-0.7.8-r1.ebuild:
+  Revision bump adds patch from debian to fix build with >=media-video/libav-10,
+  spotted by Nikoli <nikoli@gmx.us>, bug #509304.
 
   22 Dec 2013; Johannes Huber <johu@gentoo.org>
   -files/strigi-0.7.7-ffmpeg-0.11.patch, -files/strigi-0.7.7-gcc47.patch,
diff --git a/app-misc/strigi/files/strigi-0.7.8-libav10.patch b/app-misc/strigi/files/strigi-0.7.8-libav10.patch
new file mode 100644
index 000000000000..b38763ff29c0
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.8-libav10.patch
@@ -0,0 +1,16 @@
+Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+===================================================================
+--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2013-02-05 21:34:52.000000000 +0000
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2014-02-28 21:45:10.570587443 +0000
+@@ -481,9 +481,9 @@
+           outs << codec.height;
+           ar.addTriplet(streamuri, heightPropertyName, outs.str());
+         }
+-        if (stream.r_frame_rate.num && stream.r_frame_rate.den) {
++        if (stream.avg_frame_rate.num && stream.avg_frame_rate.den) {
+           ostringstream outs;
+-          outs << stream.r_frame_rate.num / stream.r_frame_rate.den;
++          outs << stream.avg_frame_rate.num / stream.avg_frame_rate.den;
+           ar.addTriplet(streamuri, frameRatePropertyName, outs.str());
+         }
+         if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format
diff --git a/app-misc/strigi/strigi-0.7.8-r1.ebuild b/app-misc/strigi/strigi-0.7.8-r1.ebuild
new file mode 100644
index 000000000000..761c0cce6234
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.8-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.8-r1.ebuild,v 1.1 2014/07/13 11:50:06 johu Exp $
+
+EAPI=5
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="http://www.vandenoever.info/software/strigi/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/strigi" )
+	GIT_ECLASS="git-r3"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug exif fam ffmpeg inotify log +qt4 test"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2:2
+	sys-libs/zlib
+	virtual/libiconv
+	clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+	dbus? (
+		sys-apps/dbus
+		qt4? ( dev-qt/qtdbus:4 )
+	)
+	exif? ( media-gfx/exiv2:= )
+	fam? ( virtual/fam )
+	ffmpeg? ( virtual/ffmpeg )
+	log? ( >=dev-libs/log4cxx-0.10.0 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-4.8.patch"
+	"${FILESDIR}/${P}-libav10.patch"
+)
+
+if [[ ${PV} == 9999 ]] ; then
+	src_unpack() {
+		git config --global url."git://anongit.kde.org/".insteadOf "kde:" || die
+		git-r3_src_unpack
+		pushd "${S}" > /dev/null || die
+		git submodule foreach git checkout master || die
+		popd > /dev/null || die
+	}
+fi
+
+src_configure() {
+	# Enabled: POLLING (only reliable way to check for files changed.)
+	# Disabled: xine - recommended upstream to keep it this way
+	local mycmakeargs=(
+		-DENABLE_POLLING=ON
+		-DFORCE_DEPS=ON
+		-DENABLE_REGENERATEXSD=OFF
+		-DENABLE_XINE=OFF
+		$(cmake-utils_use_enable clucene CLUCENE)
+		$(cmake-utils_use_enable clucene CLUCENE_NG)
+		$(cmake-utils_use_enable dbus)
+		$(cmake-utils_use_enable exif EXIV2)
+		$(cmake-utils_use_enable fam)
+		$(cmake-utils_use_enable ffmpeg)
+		$(cmake-utils_use_enable inotify)
+		$(cmake-utils_use_enable log LOG4CXX)
+		$(cmake-utils_use_enable qt4)
+		$(cmake-utils_use_find_package test CPPUNIT)
+	)
+
+	if use qt4; then
+		mycmakeargs+=( -DENABLE_DBUS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use clucene ; then
+		elog "Because you didn't enable the clucene backend, strigi may not be functional."
+		elog "If you intend to use standalone strigi indexer (not needed for KDE),"
+		elog "be sure to reinstall app-misc/strigi with the clucene USE flag enabled."
+	fi
+}