diff --git a/opencv-qt5.changes b/opencv-qt5.changes index a4925f7..1937797 100644 --- a/opencv-qt5.changes +++ b/opencv-qt5.changes @@ -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 diff --git a/opencv-qt5.spec b/opencv-qt5.spec index a2f1e75..35cce20 100644 --- a/opencv-qt5.spec +++ b/opencv-qt5.spec @@ -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 diff --git a/opencv.changes b/opencv.changes index 635d61f..fc7aa42 100644 --- a/opencv.changes +++ b/opencv.changes @@ -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 diff --git a/opencv.spec b/opencv.spec index 8e33455..0b0acff 100644 --- a/opencv.spec +++ b/opencv.spec @@ -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