From b46479c9ff0dd5a19697f73e14a4ca6a5d8c0bb11c0c0f20dc2e2dde520e7531 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Sun, 22 Apr 2018 19:27:47 +0000 Subject: [PATCH] Accepting request 599642 from home:jengelh:branches:multimedia:libs - Explicitly request ffmpeg 3.x for building OBS-URL: https://build.opensuse.org/request/show/599642 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=81 --- libquicktime.changes | 5 +++++ libquicktime.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libquicktime.changes b/libquicktime.changes index 2829fcd..7734b24 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 21 12:56:48 UTC 2018 - jengelh@inai.de + +- Explicitly request ffmpeg 3.x for building + ------------------------------------------------------------------- Tue Nov 28 21:14:37 UTC 2017 - zaitor@opensuse.org diff --git a/libquicktime.spec b/libquicktime.spec index 46e6142..5f6c6f2 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ # # spec file for package libquicktime # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Version: 1.2.4cvs%{cvs} Release: 0 #to_be_filled_by_service Summary: Library for Reading and Writing Quicktime Movie Files -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Url: http://libquicktime.sf.net Source0: %{name}-%{version}.tar.gz @@ -51,9 +51,9 @@ BuildRequires: libvorbis-devel BuildRequires: pkg-config BuildRequires: schroedinger-devel BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavcodec) < 58 BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libswscale) +BuildRequires: pkgconfig(libswscale) < 5 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xext)