commit 39711f7c14d0d6fde62afafb4ba593b9d7e09778
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Dec 4 09:19:55 2014 +0100
- up to 2.5, run tests (fail currently here)
ffmpeg.spec | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b0a81a7..b117439 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -39,6 +39,7 @@
%bcond_without zmq # 0MQ message passing
%bcond_without zvbi # teletext via libzvbi
%bcond_without doc # don't build docs
+%bcond_without tests
%ifnarch %{ix86} %{x8664} arm
%undefine with_x265
@@ -49,7 +50,7 @@
Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 2.4.4
+Version: 2.5
Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, some filters, x264, x265, xavs, xvid, x11grab)
@@ -57,11 +58,10 @@ Release: 1
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 7e2819c71484ffba1ba1a91dd5285643
+# Source0-md5: 4346fe710cc6bdd981f6534d2420d1ab
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
-Patch0: %{name}-opencv24.patch
URL: http://www.ffmpeg.org/
%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK}
%{?with_openal:BuildRequires: OpenAL-devel >= 1.1}
@@ -350,7 +350,6 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
%prep
%setup -q
-%patch0 -p1
# package the grep result for mplayer, the result formatted as
./mplayer/configure
cat <<EOF > ffmpeg-avconfig
@@ -517,6 +516,8 @@ EOF
# CC_O to add -c to commandline. makefile should be patched
%{__make} tools/qt-faststart V=1 CC_O='-c -o $@'
+%{?with_tests:%{__make} check V=1}
+
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/39711f7c14d0d6fde62afafb4ba593b9d7e09778
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
