Wolfgang Bauer 2018-06-13 22:11:18 +00:00 committed by Git OBS Bridge
parent 2bfc4eb0d6
commit 9d6cdb1589
5 changed files with 25 additions and 49 deletions

View File

@ -1,36 +0,0 @@
Index: kfilemetadata-5.36.0/cmake/FindFFmpeg.cmake
===================================================================
--- kfilemetadata-5.36.0.orig/cmake/FindFFmpeg.cmake
+++ kfilemetadata-5.36.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(POSTPROCESS 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 ()

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83025c3ff3fd0e72d3d1a72799006471ea9e62bc54d3dbd088edd8beb5b7ea96
size 254912

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:758b0b741a1f1b79365cf4bae3bb0054504cae71f3ab538e9f0cd83d5521977b
size 254044

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Jun 12 21:26:04 UTC 2018 - lbeltrame@kde.org
- Update to 5.47.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.47.0.php
- Changes since 5.46.0:
* Use override
* check that ffmpeg is at least version 3.1 that introduce the API we require
* split tests for better readability
* search for album artist and albumartist tags in taglibextractor
* popplerextractor: don't try to guess the title if there isn't one.
- Dropped patches, superseded by upstream changes:
- ffmpeg-buildrequires.patch
-------------------------------------------------------------------
Sun May 13 21:03:02 UTC 2018 - lbeltrame@kde.org

View File

@ -16,15 +16,14 @@
#
%bcond_without ffmpeg
%bcond_without lang
%define _tar_path 5.46
%define _tar_path 5.47
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
Name: kfilemetadata5
Version: 5.46.0
Version: 5.47.0
Release: 0
%define kf5_version %{version}
Summary: Extract Metadata
@ -33,13 +32,7 @@ Group: Development/Libraries/KDE
Url: http://www.kde.org/
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz
Source1: baselibs.conf
Patch0: ffmpeg-buildrequires.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
%endif
BuildRequires: karchive-devel >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel >= %{_kf5_bugfix_version}
@ -50,6 +43,9 @@ BuildRequires: taglib-devel >= 1.9
BuildRequires: cmake(Qt5Multimedia) >= 5.6.0
BuildRequires: cmake(Qt5Test) >= 5.6.0
BuildRequires: cmake(Qt5Xml) >= 5.6.0
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(poppler-qt5)
Recommends: catdoc
Recommends: %{name}-lang
@ -69,9 +65,9 @@ Requires: cmake(Qt5Core) >= 5.6.0
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=%{_kf5_localedir}