* [gentoo-commits] repo/gentoo:master commit in: app-misc/strigi/files/, app-misc/strigi/
@ 2015-09-16 9:22 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2015-09-16 9:22 UTC (permalink / raw
To: gentoo-commits
commit: 0f4e8fb9c667cb2248fb7e5dc51000cacd375a21
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 09:22:24 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 09:22:52 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4e8fb9
app-misc/strigi: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch | 21 +++++++++++++++++++++
app-misc/strigi/strigi-0.7.8-r1.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch b/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch
new file mode 100644
index 0000000..ec5a6de
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch
@@ -0,0 +1,21 @@
+Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+===================================================================
+--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+@@ -355,7 +355,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ #endif
+
+ if(fc->bit_rate)
+- ar.addValue(factory->bitrateProperty, fc->bit_rate);
++ ar.addValue(factory->bitrateProperty, (int)fc->bit_rate);
+ else if (fc->duration!= no_bitrate && fc->duration > 0) {
+ cout<<"Trying to estimate bitrate\n";
+ int64_t size;
+@@ -486,7 +486,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
+ 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
index 35bc48b..4f7694f 100644
--- a/app-misc/strigi/strigi-0.7.8-r1.ebuild
+++ b/app-misc/strigi/strigi-0.7.8-r1.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${P}-gcc-4.8.patch"
"${FILESDIR}/${P}-libav10.patch"
+ "${FILESDIR}/${P}-ffmpeg29.patch"
)
if [[ ${PV} == 9999 ]] ; then
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/strigi/files/, app-misc/strigi/
@ 2016-07-27 22:01 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-07-27 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 87842c8c20ef680ee900b8776be1ce413969581b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 21:56:25 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 22:01:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87842c8c
app-misc/strigi: Remote last rited pkg
Gentoo-bug: 583716
app-misc/strigi/Manifest | 1 -
app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch | 21 -----
app-misc/strigi/files/strigi-0.7.8-gcc-4.8.patch | 11 ---
app-misc/strigi/files/strigi-0.7.8-gcc6.patch | 24 ------
app-misc/strigi/files/strigi-0.7.8-libav10.patch | 16 ----
app-misc/strigi/metadata.xml | 13 ---
app-misc/strigi/strigi-0.7.8-r1.ebuild | 100 ----------------------
app-misc/strigi/strigi-0.7.8-r2.ebuild | 84 ------------------
8 files changed, 270 deletions(-)
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
deleted file mode 100644
index 5aaea43..0000000
--- a/app-misc/strigi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST strigi-0.7.8.tar.bz2 810574 SHA256 43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989 SHA512 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043 WHIRLPOOL 6853025cee89811dadb6e7f6309a6a8dfec1863cb75ab8af04a9a21b228b74723de06c4f787342ce7a0d6087303ecc0c4f599c2a3978838675678343d0b84ae4
diff --git a/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch b/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch
deleted file mode 100644
index ec5a6de..0000000
--- a/app-misc/strigi/files/strigi-0.7.8-ffmpeg29.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
-===================================================================
---- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
-+++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
-@@ -355,7 +355,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
- #endif
-
- if(fc->bit_rate)
-- ar.addValue(factory->bitrateProperty, fc->bit_rate);
-+ ar.addValue(factory->bitrateProperty, (int)fc->bit_rate);
- else if (fc->duration!= no_bitrate && fc->duration > 0) {
- cout<<"Trying to estimate bitrate\n";
- int64_t size;
-@@ -486,7 +486,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
- 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/files/strigi-0.7.8-gcc-4.8.patch b/app-misc/strigi/files/strigi-0.7.8-gcc-4.8.patch
deleted file mode 100644
index d2b5142..0000000
--- a/app-misc/strigi/files/strigi-0.7.8-gcc-4.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libstreams/include/strigi/bufferedstream.h
-+++ b/libstreams/include/strigi/bufferedstream.h
-@@ -34,7 +34,7 @@
- * BufferedStream will do the rest.
- */
- template <class T>
--class BufferedStream : public StreamBase<T> {
-+class STREAMS_EXPORT BufferedStream : public StreamBase<T> {
- private:
- StreamBuffer<T> buffer;
- bool finishedWritingToBuffer;
diff --git a/app-misc/strigi/files/strigi-0.7.8-gcc6.patch b/app-misc/strigi/files/strigi-0.7.8-gcc6.patch
deleted file mode 100644
index b94f97f..0000000
--- a/app-misc/strigi/files/strigi-0.7.8-gcc6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake
---- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:52.000000000 -0500
-+++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:39:54.586260564 -0400
-@@ -15,7 +15,7 @@
- # get the gcc version
- exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
-
-- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+ string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
- # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
- if (NOT _gcc_version)
- string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
-diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake
---- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:57.000000000 -0500
-+++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:40:11.340134414 -0400
-@@ -15,7 +15,7 @@
- # get the gcc version
- exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
-
-- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+ string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
- # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
- if (NOT _gcc_version)
- string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
diff --git a/app-misc/strigi/files/strigi-0.7.8-libav10.patch b/app-misc/strigi/files/strigi-0.7.8-libav10.patch
deleted file mode 100644
index b38763f..0000000
--- a/app-misc/strigi/files/strigi-0.7.8-libav10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/metadata.xml b/app-misc/strigi/metadata.xml
deleted file mode 100644
index 0a31e3d..0000000
--- a/app-misc/strigi/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <use>
- <flag name="clucene">Enable <pkg>dev-cpp/clucene</pkg> backend support.</flag>
- <flag name="inotify">Enable support for inotify.</flag>
- <flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg>.</flag>
- </use>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-misc/strigi/strigi-0.7.8-r1.ebuild b/app-misc/strigi/strigi-0.7.8-r1.ebuild
deleted file mode 100644
index 4f7694f..0000000
--- a/app-misc/strigi/strigi-0.7.8-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 libav 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? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- 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"
- "${FILESDIR}/${P}-ffmpeg29.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
-}
diff --git a/app-misc/strigi/strigi-0.7.8-r2.ebuild b/app-misc/strigi/strigi-0.7.8-r2.ebuild
deleted file mode 100644
index 6abde40..0000000
--- a/app-misc/strigi/strigi-0.7.8-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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"
-inherit cmake-utils
-
-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 libav 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? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
- 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"
- "${FILESDIR}/${P}-ffmpeg29.patch"
- "${FILESDIR}/${P}-gcc6.patch"
-)
-
-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
- -DENABLE_CLUCENE=$(usex clucene)
- -DENABLE_CLUCENE_NG=$(usex clucene)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_EXIV2=$(usex exif)
- -DENABLE_FAM=$(usex fam)
- -DENABLE_FFMPEG=$(usex ffmpeg)
- -DENABLE_INOTIFY=$(usex inotify)
- -DENABLE_LOG4CXX=$(usex log)
- -DENABLE_QT4=$(usex 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-27 22:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-27 22:01 [gentoo-commits] repo/gentoo:master commit in: app-misc/strigi/files/, app-misc/strigi/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-09-16 9:22 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox