From 316ca6942bc7774c8575a90a0b0c281aed57ccb1232c7125ed9a58a55e0aabcd Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 17 Apr 2016 20:59:17 +0000 Subject: [PATCH] Accepting request 390467 from home:olh:branches:KDE:Frameworks5 - Use pkgconfig instead of libffmpeg-devel ffmpeg-buildrequires.patch OBS-URL: https://build.opensuse.org/request/show/390467 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=99 --- ffmpeg-buildrequires.patch | 40 ++++++++++++++++++++++++++++++++++++++ kfilemetadata5.changes | 6 ++++++ kfilemetadata5.spec | 6 +++++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 ffmpeg-buildrequires.patch diff --git a/ffmpeg-buildrequires.patch b/ffmpeg-buildrequires.patch new file mode 100644 index 0000000..f8f9e76 --- /dev/null +++ b/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 + # _FOUND - System has + # _INCLUDE_DIRS - Include directory necessary for using the 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 () + diff --git a/kfilemetadata5.changes b/kfilemetadata5.changes index ca98a6f..6042f9c 100644 --- a/kfilemetadata5.changes +++ b/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 diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index f16c0b5..31fecd6 100644 --- a/kfilemetadata5.spec +++ b/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