Accepting request 390476 from KDE:Frameworks5

1

OBS-URL: https://build.opensuse.org/request/show/390476
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kfilemetadata5?expand=0&rev=32

ffmpeg-buildrequires.patch

@@ -0,0 +1,40 @@
+---
+ cmake/FindFFmpeg.cmake |    8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+Index: kfilemetadata-5.21.0/cmake/FindFFmpeg.cmake
+===================================================================
+--- kfilemetadata-5.21.0.orig/cmake/FindFFmpeg.cmake
++++ kfilemetadata-5.21.0/cmake/FindFFmpeg.cmake
+@@ -9,11 +9,8 @@
+ #
+ # For each of the components it will additionally set.
+ #   - AVCODEC
+-#   - AVDEVICE
+ #   - AVFORMAT
+ #   - AVUTIL
+-#   - POSTPROCESS
+-#   - SWSCALE
+ # the following variables will be defined
+ #  <component>_FOUND        - System has <component>
+ #  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
+@@ -121,10 +118,7 @@ if (NOT FFMPEG_LIBRARIES)
+   # Check for all possible component.
+   find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+   find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
+-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+   find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
+-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
+-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
+ 
+   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
+   foreach (_component ${FFmpeg_FIND_COMPONENTS})
+@@ -155,7 +149,7 @@ if (NOT FFMPEG_LIBRARIES)
+ endif ()
+ 
+ # Now set the noncached _FOUND vars for the components.
+-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE)
++foreach (_component AVCODEC AVFORMAT AVUTIL)
+   set_component_found(${_component})
+ endforeach ()
+ 

kfilemetadata5.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Apr 17 18:39:27 UTC 2016 - olaf@aepfle.de
+
+- Use pkgconfig instead of libffmpeg-devel
+  ffmpeg-buildrequires.patch
+
 -------------------------------------------------------------------
 Mon Apr  4 14:20:15 UTC 2016 - hrvoje.senjan@gmail.com
 

kfilemetadata5.spec

@@ -29,9 +29,12 @@ Url:            http://www.kde.org/
 Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz
 Source1:        baselibs.conf
 Source99:       kfilemetadata5-rpmlintrc
+Patch0:         ffmpeg-buildrequires.patch
 BuildRequires:  extra-cmake-modules >= %{_tar_path}
 %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320"
-BuildRequires:  ffmpeg-devel
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
 %endif
 BuildRequires:  karchive-devel >= %{_tar_path}
 BuildRequires:  kf5-filesystem
@@ -65,6 +68,7 @@ A library for extracting file metadata. Development files
 %lang_package
 %prep
 %setup -q -n kfilemetadata-%{version}
+%patch0 -p1
 
 %build
   %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5