diff --git a/_service b/_service index 693c259..c1991e0 100644 --- a/_service +++ b/_service @@ -1,14 +1,16 @@ + - - git - https://github.com/FFMS/ffms2.git - @PARENT_TAG@+@TAG_OFFSET@.g%h - enable - - - - *.tar - xz - - + + https://github.com/FFMS/ffms2.git + git + @PARENT_TAG@+@TAG_OFFSET@ + ff61bca + + + + *.tar + xz + + + diff --git a/baselibs.conf b/baselibs.conf index ca50708..d82bf5a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libffms2-4 +libffms2-5 diff --git a/ffms2-2.40+44.obscpio b/ffms2-2.40+44.obscpio new file mode 100644 index 0000000..101331e --- /dev/null +++ b/ffms2-2.40+44.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:414eeb9764b5d924b54e09588b856056f602e3d4c59a4b44623cde4e261f2dc9 +size 5806605 diff --git a/ffms2-2.40.tar.gz b/ffms2-2.40.tar.gz deleted file mode 100644 index 3944671..0000000 --- a/ffms2-2.40.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82e95662946f3d6e1b529eadbd72bed196adfbc41368b2d50493efce6e716320 -size 140356 diff --git a/ffms2.changes b/ffms2.changes index 828786f..4929381 100644 --- a/ffms2.changes +++ b/ffms2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 12 09:59:54 UTC 2022 - Bjørn Lie + +- Update to version 2.40+44: + * Update to current git master commit ff61bca. + * Fix build with ffmpeg-5. +- Bump soname to 5 following upstream changes. +- Replace pkgconfig(libavresample) with pkgconfig(libswresample) + BuildRequires: Current versions of ffmpeg do not provide + libavresample. + ------------------------------------------------------------------- Wed Oct 7 08:13:27 UTC 2020 - Luigi Baldoni diff --git a/ffms2.obsinfo b/ffms2.obsinfo index 16526f0..5fa1e77 100644 --- a/ffms2.obsinfo +++ b/ffms2.obsinfo @@ -1,5 +1,4 @@ name: ffms2 -version: 2.23+202.ga9e8f73 -mtime: 1558714281 -commit: a9e8f7397aeb341537743dea601cd7f7fe6b93ff - +version: 2.40+44 +mtime: 1655589848 +commit: ff61bca13e2c5fb99c0450620c9244f415ec29c4 diff --git a/ffms2.spec b/ffms2.spec index 75a406b..3690555 100644 --- a/ffms2.spec +++ b/ffms2.spec @@ -1,7 +1,7 @@ # # spec file for package ffms2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2016 Packman Team # # All modifications and additions to the file contributed by third parties @@ -18,15 +18,15 @@ %define libname lib%{name} -%define soname 4 +%define soname 5 Name: ffms2 -Version: 2.40 +Version: 2.40+44 Release: 0 Summary: Wrapper library around FFmpeg libraries License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/FFMS/ffms2 -Source: https://github.com/FFMS/ffms2/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.xz Source1: baselibs.conf Patch0: ffms2-pkgconfig.patch BuildRequires: automake @@ -35,8 +35,8 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libswresample) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(zlib)