diff options
author | Johannes Huber <johu@gentoo.org> | 2014-07-13 11:50:13 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2014-07-13 11:50:13 +0000 |
commit | 01318fb66f298f062d5f9aa9cc0bda3582a70445 (patch) | |
tree | 67a5abe596b8cee2b153cc438a6a1e68fbd9dcc7 /app-misc/strigi | |
parent | Version bumps, removed older (diff) | |
download | historical-01318fb66f298f062d5f9aa9cc0bda3582a70445.tar.gz historical-01318fb66f298f062d5f9aa9cc0bda3582a70445.tar.bz2 historical-01318fb66f298f062d5f9aa9cc0bda3582a70445.zip |
Revision bump adds patch from debian to fix build with >=media-video/libav-10, spotted by Nikoli <nikoli@gmx.us>, bug #509304.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'app-misc/strigi')
-rw-r--r-- | app-misc/strigi/ChangeLog | 11 | ||||
-rw-r--r-- | app-misc/strigi/Manifest | 32 | ||||
-rw-r--r-- | app-misc/strigi/files/strigi-0.7.8-libav10.patch | 16 | ||||
-rw-r--r-- | app-misc/strigi/strigi-0.7.8-r1.ebuild | 96 |
4 files changed, 138 insertions, 17 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/Manifest b/app-misc/strigi/Manifest index a510872a6dfa..f2317b27dc0b 100644 --- a/app-misc/strigi/Manifest +++ b/app-misc/strigi/Manifest @@ -2,24 +2,26 @@ Hash: SHA256 AUX strigi-0.7.8-gcc-4.8.patch 357 SHA256 e140389f6e61f7822fb609acd04d300704b76d5c9949fff75371a0677663f0b3 SHA512 d9c3616a553dabe2e3c60030cba658365258b0c279e80e4a2afce34a25ead3fc5afc4dbb7559e3114b61beee9c3b09e07540b1c994a45f99d09fc3127f0b5862 WHIRLPOOL a5434a729626aea2deed0267782c443638ff27d220269aa3b809d9848e087cb8ecedbcab5d23af8b3c2a08accc5c8117d18dc2584478d922ccdf5b7dcf8ad0b3 +AUX strigi-0.7.8-libav10.patch 972 SHA256 d158c29ffa37c4b151bd62eadb8be1ccc179bd99cee96cc44f41fab340b6f8ca SHA512 54d590afb1c1c1dbe655a22f8bb78ba860e41378da62d827fc57f28268cad6ddbc48b771933ebb5db8abfa25667c8af3869a53b9b9cf39a259b070933f434e37 WHIRLPOOL 3182cc208e451496ffb80ad5a4958b5a75ddf2d586c521f2da3e6e7f1176a8533f8d86f3e4465ab0b105af3b1fc4d0c5e0e981178bcd0e83676ccf923eb54ee8 DIST strigi-0.7.8.tar.bz2 810574 SHA256 43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989 SHA512 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043 WHIRLPOOL 6853025cee89811dadb6e7f6309a6a8dfec1863cb75ab8af04a9a21b228b74723de06c4f787342ce7a0d6087303ecc0c4f599c2a3978838675678343d0b84ae4 +EBUILD strigi-0.7.8-r1.ebuild 2530 SHA256 bd458405d75eb28548f59b00aa76882ba39e236460d8e49ee7ecc8c65636a8ed SHA512 f6e0fb7b2d9170ab3396dcf87737541a803980c1fbc8f08244733dcb5b221ceb1c24999ea9e5d15500af760a84980ddb4d0ae170f6434d0e3fd959edd9476ecf WHIRLPOOL 6684ee24fdbd118a13141c3cdc426bb2ba186afcd5ad4114178a6f9a7fb2db3015fdbba3fe269d7b62ccd2ac24ec73b08d4b5b56f64463f3be582923d21943df EBUILD strigi-0.7.8.ebuild 2257 SHA256 c3088ad4f68178c1daec25a9882a991225136605df7bc81fb33788c1f295458c SHA512 322018af61c1d02767bc88093554a812549b8828a9067208fbc4b15b746a2d4581c60465ab792ed0a0c8c7c64a7eef12ab833cd834646dbb296616b89d32e86b WHIRLPOOL 1912f4204e35785e0ee49c7b8ad124bb9ac877bb7b9cff6796cadd7203229193baecdaa762f5e43f0c9e44b88efbf851a5b0d573b49b0526d58d95dcfbe0c0b2 -MISC ChangeLog 19715 SHA256 e5f3e72d62b3b7c477fc4f01820e6b8cd0341b69ed9de59f3c32bb5791499aaa SHA512 0d7144032b3b2c0b5068e6f7ea17168c5ecee54afe92e7e3eb5d34dcec01cbd58c3b83adff81f00aac6c7163061845b2a870b030cfe0d196ec1f41046c94d878 WHIRLPOOL 64035fb9e045755d42b7057c8c4a47b1e553fe8839595bf5a65fda64e8f47ceefc19c958451ee5bafc8f717bd13fd75d14fff947984cc677b10bc1e85468f46a +MISC ChangeLog 19989 SHA256 c3d7552dcdc958ab665c7e153d0991fad07e80ef9bea31e3fbd55a032af25382 SHA512 dbf02901fb1e60eb6f37fed0e644c9ccdebde46ace5fd46bec688bbcc62b99bab0fb807c2807807a9b6fb578bfee08a9ee531da3c2496e5b659fd696e31904d0 WHIRLPOOL 3f27911be9277b91b3ee9e2eea77174b7660fdeb68888b6b41c88d9167812a9e649883f13c8c3d427599ef9431790ee9e4ace057feeaa25206431e089025bbea MISC metadata.xml 393 SHA256 d50b05596401808e1ea72873207bb79774ebb976d6caee2b5c2a89ab8452df33 SHA512 6fa643c4d9f906ca9f3bb32a6cff9ec36a4d73c79931dfa929bb60b6d6770f053511acd40b8402eb15b3d54de74ef6f24a12a237f23da11868d4aa8643fe348e WHIRLPOOL 343aea9f0f3a0a346ff519caaf6207cf398a0abd9ebd8820905b9aced84852218b0c80a1569397c4b43cd104f9829699cc54a52ea2bc8ce5b3d598792aa92c04 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCAAGBQJSttZxAAoJEGVpnaTzz9K9U7YQAJxGbO7MeeA+nyTiL1MpvcR8 -wZ+97UbqgF/RnjgvBy6zQ3Uicnzvl+mSxGZF1Y03CDebXOml57ZL780rQgiudDOt -kSwQRZoZ3nPhDcbwHbu4jM7syJYuiE2hkdw3e81SnAroGGF71N5gN4uPvCVHCqoi -IBo2dxFx/bJJppcegZYkK6rv/qGKoCVDhRotKizmA3Fh2w9yESoLaebjWBPSLqjI -fBY14SBnwTSdqP8ezOVkSbVWjjeez+B5M7t8Qp+FT5UpxKTyJ0n43QKIAPipRa4Y -Pnjlmv8rCO7nneVYDqkBcqsQ75uPsfJNYBjnuQsFiuSNQXTSRDaKREpbY5gMa5sH -uHS5uZAF5iTnirNsSCuFn1ZCnC6vYD5gJPWcyVvjF1tD1WLherjNnqxtc/H40EcN -aSUMQRko43MAAo8taDa3tbLG6a5onbAp2+9qFMa7AWUrTbW7662lPgZlgPkT48RB -yqDnHZ5WOdvgz2uKLib7oLWpkeVVtZ/du7dwl19F6DsIGTH0YTG0NgmfSPxlqUVi -QPWrSfaPmgr+ikx+LySjs4u1EViYoTeLlNYUb+3px6AjTgOuKtrrjpWvVsol/OR5 -aATlVi0+iID500C3IImZ4FvP1L7DY6iOKt77iFtCX2KVlfP3izTmizNlC0V/VyOq -sVH2MYN9V36WBYSlyVvR -=cgbD +iQIcBAEBCAAGBQJTwnJyAAoJEGVpnaTzz9K9w0cQAK2wo2D2Ekh5LA1sh7CMSFXy +o9T9AZh9IiowM6N6sI8mwqXND4El/grxzvz57uoiBO5/W3MTacNkRa1DaQ1oYDlo +zv0EmN8X76FAc+ZlhrnwiA4YYIoWfIaqitBY/VEyUmVcWesOvUOLxGUdiMjWxPmy +U0a+A/gH31lUyckwazgClTkxZaiuDhzcwA9xgwhmbmflXB6cnc9qWqhTeFs1c/Ka +zumwUdGVkkgIHGQxfq+fYdEaq4SZCHjZ5pQx9mcIQenOYLqakvOEouijpegkJ8De +w9ixPuGqRE2tNtgL0SXQrf5TdVvXziKZvZXbS9xzPP9rKWEH/OoWDM0zS2YIbTLz +bo19ubIz0r/06ZQ4F5E0zJxIz/QrPLQLhIovcZ4T5HAds068+Mbwu9LHTAPwBKT+ +oPveB55sylS/kKmZ/Lxz8zifI7jl5+ES4JenwEI10KKpM1Sq4RBckdGXvB2GsI8y +yis8txIyaCFGzhMdCR0m0IlbiE4GKvKD+z6nPpDgfCz8pa0q5rwhxaYKJI+6zxra +wZWcT5Ma0gOIgIHSf8O6KCSvo2PqQbxTpwPzaK8ZrT9LycL8fseE0rL6cB/nNgXv +44RvEPLkbAI2NjSvqYamjBmn6lK+Q69vLCrn7FNQmNPVSiMoD6pZleo9z8Y46vVf +WxfisEsYrxilM+7qSRvp +=EXEW -----END PGP SIGNATURE----- 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 +} |