Accepting request 412682 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/412682
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2016-07-28 21:43:33 +00:00 committed by Git OBS Bridge
parent 60f07432b1
commit 9543eeb4cc
4 changed files with 20 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 21 07:55:09 UTC 2016 - olaf@aepfle.de
- Enable ffmpeg support unconditional
-------------------------------------------------------------------
Tue Jun 7 08:53:04 UTC 2016 - dimstar@opensuse.org

View File

@ -16,7 +16,7 @@
#
%bcond_with ffmpeg
%bcond_without ffmpeg
%define libname lib%{name}
%define soname 6_3
@ -58,10 +58,10 @@ BuildRequires: libeigen3-devel
BuildRequires: libeigen2-devel
%endif
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec) >= 57
BuildRequires: pkgconfig(libavformat) >= 57
BuildRequires: pkgconfig(libavutil) >= 55
BuildRequires: pkgconfig(libswscale) >= 4
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswscale)
%endif
BuildRequires: libgphoto2-devel
BuildRequires: libjasper-devel

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 21 07:55:09 UTC 2016 - olaf@aepfle.de
- Enable ffmpeg support unconditional
-------------------------------------------------------------------
Tue Jun 7 08:53:04 UTC 2016 - dimstar@opensuse.org

View File

@ -16,7 +16,7 @@
#
%bcond_with ffmpeg
%bcond_without ffmpeg
%define libname lib%{name}
%define soname 3_1
@ -54,10 +54,10 @@ BuildRequires: libeigen3-devel
BuildRequires: libeigen2-devel
%endif
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec) >= 57
BuildRequires: pkgconfig(libavformat) >= 57
BuildRequires: pkgconfig(libavutil) >= 55
BuildRequires: pkgconfig(libswscale) >= 4
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswscale)
%endif
BuildRequires: libgphoto2-devel
BuildRequires: libjasper-devel