[rpmfusion-packager] Rebuild for python-3.9
by Leigh Scott
commit 49d794ae47a4d0a1754b8df63afa9d19125ad81a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 30 19:59:02 2020 +0100
Rebuild for python-3.9
rpmfusion-packager.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index 766454e..fef1d93 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -12,7 +12,7 @@
Name: rpmfusion-packager
Version: 0.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tools for setting up a rpmfusion maintainer environment
License: GPLv2+
@@ -87,6 +87,7 @@ autoreconf -i
%build
%if %{with python3}
%configure --with-python3
+pathfix.py -pni %{python3} src/*.py
%else
%configure --with-python2
%endif
@@ -118,6 +119,9 @@ autoreconf -i
%endif
%changelog
+* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.6.8-2
+- Rebuild for python-3.9
+
* Mon Mar 16 2020 Sérgio Basto <sergio(a)serjux.com> - 0.6.8-1
- If cert expires soon, ask for a new user certificate
3 years, 10 months
[audacious-plugins-freeworld] Update to 4.0.3
by Leigh Scott
commit eb78be82e629bd080f2193085b8c55d2defd445f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 30 08:58:11 2020 +0100
Update to 4.0.3
.gitignore | 1 +
audacious-plugins-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9422e53..1d7bb16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ audacious-plugins-3.7.2.tar.bz2
/audacious-plugins-3.10.tar.bz2
/audacious-plugins-3.10.1.tar.bz2
/audacious-plugins-4.0.1.tar.bz2
+/audacious-plugins-4.0.3.tar.bz2
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 5c54b99..fbaaf9c 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -5,7 +5,7 @@
%{?aud_plugin_dep}
Name: audacious-plugins-freeworld
-Version: 4.0.1
+Version: 4.0.3
Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
License: GPLv3
@@ -118,6 +118,9 @@ find %buildroot -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.0.3-1
+- Update to 4.0.3
+
* Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.0.1-1
- Update to 4.0.1
diff --git a/sources b/sources
index 168f92d..8955b36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (audacious-plugins-4.0.1.tar.bz2) = 6611a9204f3f6e70b126ec4712078ba3e5a317b8a41e6d753a24e37e9b19894444ae091654240c6aa0c4d13d53b72d722549edf6077a565ebdd8caf3000823a0
+SHA512 (audacious-plugins-4.0.3.tar.bz2) = 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
3 years, 10 months
[alsa-plugins-freeworld] Updated to 1.2.2
by Leigh Scott
commit e8d5b4f2c2ba851b1862e6fb06bab2b3b4989c76
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri May 29 10:10:35 2020 +0100
Updated to 1.2.2
alsa-plugins-freeworld.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/alsa-plugins-freeworld.spec b/alsa-plugins-freeworld.spec
index 025d6e8..2315776 100644
--- a/alsa-plugins-freeworld.spec
+++ b/alsa-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
-Version: 1.2.1
-Release: 3%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -86,6 +86,9 @@ find %buildroot -name "*.la" -exec rm {} \;
%changelog
+* Fri May 29 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.2-1
+- Updated to 1.2.2
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.2.1-3
- Rebuild for ffmpeg-4.3 git
diff --git a/sources b/sources
index 0be1a1c..d350ed8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (alsa-plugins-1.2.1.tar.bz2) = a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
+SHA512 (alsa-plugins-1.2.2.tar.bz2) = 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
3 years, 10 months
[mythtv/f32: 5/5] Update to latest fixes/31, fc90482281. Update from fixes/31 and clean up spec file conditionals. Rem
by Richard Shaw
commit b14438c52650642d2c8e4cc1b1be39f51d0258a5
Merge: 8ef8e62 bc124a2
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu May 28 12:38:46 2020 -0500
Update to latest fixes/31, fc90482281.
Update from fixes/31 and clean up spec file conditionals.
Remove duplicate libmythavutil.so from mythtv-libs as it's already in mythffmpeg.
mythtv-ChangeLog | 133 +
mythtv.spec | 77 +-
v31.0..fc90482281.patch | 8019 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 8186 insertions(+), 43 deletions(-)
---
diff --cc mythtv.spec
index ebda212,4b9c098..ad4db60
--- a/mythtv.spec
+++ b/mythtv.spec
@@@ -1395,9 -1378,14 +1378,17 @@@ exit
%changelog
+ * Wed May 27 2020 Richard Shaw <hobbes1069(a)gmail.com> - 31.0-3.20200527gitfc90482281
+ - Update to latest fixes/31, fc90482281.
+ - Update from fixes/31 and clean up spec file conditionals.
+ - Remove duplicate libmythavutil.so from mythtv-libs as it's already in mythffmpeg.
+
+* Wed May 27 2020 Richard Shaw <hobbes1069(a)gmail.com> - 31.0-2
+- Remove duplicate libavutil library in mythtv-libs.
+
+ * Sat Apr 11 2020 Leigh Scott <leigh123linux(a)gmail.com> - 31.0-2
+ - Rebuild for new libcdio version
+
* Mon Mar 23 2020 Richard Shaw <hobbes1069(a)gmail.com> - 31.0-1
- Update to v31.0.
- Remove/Obsolete mythgallery package as it is no longer.
3 years, 10 months
[ffms2] Remove libavresample dependency (rfbz#5349)
by Leigh Scott
commit e2036fcb5edc386113e3c03776b74906dd342544
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu May 28 17:47:59 2020 +0100
Remove libavresample dependency (rfbz#5349)
354940823be5002556dd827f0130faa7f656c139.patch | 286 +++++++++++++++++++++++++
721ec7b98062ebce67959bae8587bd69db15e40a.patch | 71 ++++++
ffms2.spec | 10 +-
3 files changed, 365 insertions(+), 2 deletions(-)
---
diff --git a/354940823be5002556dd827f0130faa7f656c139.patch b/354940823be5002556dd827f0130faa7f656c139.patch
new file mode 100644
index 0000000..2f74085
--- /dev/null
+++ b/354940823be5002556dd827f0130faa7f656c139.patch
@@ -0,0 +1,286 @@
+From 354940823be5002556dd827f0130faa7f656c139 Mon Sep 17 00:00:00 2001
+From: myrsloik <fredrik.mellbin(a)gmail.com>
+Date: Sun, 16 Oct 2016 17:27:03 +0200
+Subject: [PATCH] Remove no longer needed ffmscompat.h abstractions, part1
+
+---
+ include/ffmscompat.h | 23 ---------------
+ src/config/libs.cpp | 44 +---------------------------
+ src/config/msvc-config.h | 49 --------------------------------
+ src/core/audiosource.cpp | 10 ++-----
+ src/core/utils.h | 7 +----
+ src/core/videoutils.cpp | 2 +-
+ src/vapoursynth/vapoursource.cpp | 10 +++----
+ 7 files changed, 11 insertions(+), 134 deletions(-)
+ delete mode 100644 src/config/msvc-config.h
+
+diff --git a/include/ffmscompat.h b/include/ffmscompat.h
+index 70c477e12..af615ac68 100644
+--- a/include/ffmscompat.h
++++ b/include/ffmscompat.h
+@@ -122,29 +122,6 @@ static const AVPixFmtDescriptor *av_pix_fmt_desc_get(AVPixelFormat pix_fmt) {
+ # if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 52, 9, 0, 52, 20, 100)
+ # define av_frame_alloc avcodec_alloc_frame
+ # endif
+-
+-# if VERSION_CHECK(LIBAVUTIL_VERSION_INT, >, 55, 0, 0, 55, 0, 100) || defined(FF_API_PLUS1_MINUS1)
+-# define FFMS_DEPTH(x) ((x).depth)
+-# else
+-# define FFMS_DEPTH(x) ((x).depth_minus1 + 1)
+-# endif
+-#endif
+-
+-
+-#ifndef WITH_SWRESAMPLE
+-#define ffms_convert(AVAudioResampleContext, output, out_plane_size, byte_per_sample_src, out_samples, input, in_plane_size, byte_per_sample_target, in_samples) \
+- avresample_convert(AVAudioResampleContext, output, out_plane_size*byte_per_sample_src, out_samples, input, in_plane_size*byte_per_sample_target, in_samples)
+-#define ffms_open_resampler(context) avresample_open(context)
+-#define FFMS_ResampleContext AVAudioResampleContext
+-#define ffms_resample_alloc_context avresample_alloc_context
+-#define ffms_resample_free avresample_free
+-#else
+-#define ffms_convert(AVAudioResampleContext, output, out_plane_size, byte_per_sample_src, out_samples, input, in_plane_size, bps, in_samples) \
+- swr_convert(AVAudioResampleContext, output, out_samples, (const uint8_t**) input, in_samples)
+-#define ffms_open_resampler(context) swr_init(context)
+-#define FFMS_ResampleContext SwrContext
+-#define ffms_resample_alloc_context swr_alloc
+-#define ffms_resample_free swr_free
+ #endif
+
+ #endif // FFMSCOMPAT_H
+diff --git a/src/config/libs.cpp b/src/config/libs.cpp
+index 0ee8b049b..640ea17ee 100644
+--- a/src/config/libs.cpp
++++ b/src/config/libs.cpp
+@@ -18,60 +18,18 @@
+ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ // THE SOFTWARE.
+
+-#include "msvc-config.h"
+-
+ extern "C" {
+ #include <libavutil/avutil.h>
+ }
+
+-// someone claimed that the borland c++ compiler defines _MSC_VER too,
+-// but nobody cares about borland so let them suffer.
++// fixme, just move to project already
+ #ifdef _MSC_VER
+
+-
+-#ifdef WITH_GCC_LIBAV
+-// Standard mingw libraries.
+-#pragma comment(lib, "libgcc.a")
+-#pragma comment(lib, "libmoldname.a")
+-#pragma comment(lib, "libmingwex.a")
+-#pragma comment(lib, "libz.a")
+-#pragma comment(lib, "libwsock32.a")
+-#else
+ #pragma comment(lib, "zlib.lib")
+-#endif /* WITH_GCC_LIBAV */
+-
+-// libav/ffmpeg libs are the same (name) regardless of their compiler.
+ #pragma comment(lib, "libavutil.a")
+ #pragma comment(lib, "libavcodec.a")
+ #pragma comment(lib, "libavformat.a")
+ #pragma comment(lib, "libswscale.a")
+-#ifdef WITH_SWRESAMPLE
+ #pragma comment(lib, "libswresample.a")
+-#else
+-#pragma comment(lib, "libavresample.a")
+-#endif
+-
+-#ifdef WITH_OPENCORE_AMR_NB
+-#ifdef WITH_GCC_LIBAV
+-#pragma comment(lib, "libopencore-amrnb.a")
+-#else
+-#pragma comment(lib, "opencore-amrnb.lib")
+-#endif /* WITH_GCC_LIBAV */
+-#endif /* WITH_OPENCORE_AMR_NB */
+-
+-#ifdef WITH_OPENCORE_AMR_WB
+-#ifdef WITH_GCC_LIBAV
+-#pragma comment(lib, "libopencore-amrwb.a")
+-#else
+-#pragma comment(lib, "opencore-amrwb.lib")
+-#endif /* WITH_GCC_LIBAV */
+-#endif /* WITH_OPENCORE_AMR_WB */
+-
+-#if defined(WITH_PTHREAD_GC2) && defined(WITH_GCC_LIBAV)
+-#pragma comment(lib, "libpthreadGC2.a")
+-#elif defined(WITH_PTHREAD_GC2) && !defined(WITH_GCC_LIBAV)
+-#error pthreads is only supported if libav/ffmpeg was built with gcc.
+-#endif /* defined(WITH_PTHREAD_GC2) && defined(WITH_GCC_LIBAV) */
+-
+
+ #endif /* _MSC_VER */
+diff --git a/src/config/msvc-config.h b/src/config/msvc-config.h
+deleted file mode 100644
+index dce228bbb..000000000
+--- a/src/config/msvc-config.h
++++ /dev/null
+@@ -1,49 +0,0 @@
+-// Copyright (c) 2009 Karl Blomster
+-//
+-// Permission is hereby granted, free of charge, to any person obtaining a copy
+-// of this software and associated documentation files (the "Software"), to deal
+-// in the Software without restriction, including without limitation the rights
+-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-// copies of the Software, and to permit persons to whom the Software is
+-// furnished to do so, subject to the following conditions:
+-//
+-// The above copyright notice and this permission notice shall be included in
+-// all copies or substantial portions of the Software.
+-//
+-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-// THE SOFTWARE.
+-
+-
+-/*
+-By default we will assume that libav/ffmpeg and any dependencies were compiled
+-with msvc. This avoids any hacks that were required with linking mingw stuff
+-in msvc.
+-
+-Compiling libav/ffmpeg with gcc on windows targets (mingw) is still possible.
+-Certain third-party libraries may require that libav/ffmpeg be built with gcc.
+-
+-Define WITH_GCC_LIBAV if the ffmpeg/libav you're linking to was built with gcc.
+-*/
+-
+-//#define WITH_GCC_LIBAV
+-
+-/*
+-If you want to change what libraries FFmpegSource will be linked to, here is the place to do it.
+-
+-If you want to compile WITH a given library, uncomment the corresponding #define.
+-*/
+-
+-// OpenCore AMR narrowband (libopencore-amrnb.a)
+-//#define WITH_OPENCORE_AMR_NB
+-
+-// OpenCore AMR wideband (libopencore-amrwb.a)
+-//#define WITH_OPENCORE_AMR_WB
+-
+-// pthreads (libpthreadGC2.a)
+-// Only works if libav/ffmpeg was built with gcc.
+-//#define WITH_PTHREAD_GC2
+diff --git a/src/core/audiosource.cpp b/src/core/audiosource.cpp
+index 9391f3070..886b7d66a 100644
+--- a/src/core/audiosource.cpp
++++ b/src/core/audiosource.cpp
+@@ -204,13 +204,10 @@ void FFMS_AudioSource::SetOutputFormat(FFMS_ResampleOptions const& opt) {
+ av_opt_set_int(newContext, "in_channel_layout", AP.ChannelLayout, 0);
+
+ av_opt_set_int(newContext, "out_sample_rate", opt.SampleRate, 0);
+-
+-#ifdef WITH_SWRESAMPLE
+ av_opt_set_channel_layout(newContext, "out_channel_layout", opt.ChannelLayout, 0);
+ av_opt_set_sample_fmt(newContext, "out_sample_fmt", (AVSampleFormat)opt.SampleFormat, 0);
+-#endif
+
+- if (ffms_open_resampler(newContext))
++ if (swr_init(newContext))
+ throw FFMS_Exception(FFMS_ERROR_RESAMPLING, FFMS_ERROR_UNKNOWN,
+ "Could not open avresample context");
+ newContext.swap(ResampleContext);
+@@ -231,9 +228,8 @@ void FFMS_AudioSource::ResampleAndCache(CacheIterator pos) {
+ auto dst = block.Grow(size);
+
+ uint8_t *OutPlanes[1] = { dst };
+- ffms_convert(ResampleContext,
+- OutPlanes, DecodeFrame->nb_samples, BytesPerSample, DecodeFrame->nb_samples,
+- DecodeFrame->extended_data, DecodeFrame->nb_samples, av_get_bytes_per_sample(CodecContext->sample_fmt), DecodeFrame->nb_samples);
++
++ swr_convert(ResampleContext, OutPlanes, DecodeFrame->nb_samples, (const uint8_t **)DecodeFrame->extended_data, DecodeFrame->nb_samples);
+ }
+
+ FFMS_AudioSource::AudioBlock *FFMS_AudioSource::CacheBlock(CacheIterator &pos) {
+diff --git a/src/core/utils.h b/src/core/utils.h
+index c31977178..cc746b1b4 100644
+--- a/src/core/utils.h
++++ b/src/core/utils.h
+@@ -29,12 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
+ #include <libswscale/swscale.h>
+-
+-#ifdef WITH_SWRESAMPLE
+ #include <libswresample/swresample.h>
+-#else
+-#include <libavresample/avresample.h>
+-#endif
+ }
+
+ // must be included after ffmpeg headers
+@@ -127,7 +122,7 @@ class ScopedFrame : public unknown_size<AVFrame, av_frame_alloc, av_frame_free>
+ }
+ };
+
+-typedef unknown_size<FFMS_ResampleContext, ffms_resample_alloc_context, ffms_resample_free> FFResampleContext;
++typedef unknown_size<SwrContext, swr_alloc, swr_free> FFResampleContext;
+
+ void ClearErrorInfo(FFMS_ErrorInfo *ErrorInfo);
+ void InitNullPacket(AVPacket &pkt);
+diff --git a/src/core/videoutils.cpp b/src/core/videoutils.cpp
+index 5d14c5d0c..8918d0b9b 100644
+--- a/src/core/videoutils.cpp
++++ b/src/core/videoutils.cpp
+@@ -139,7 +139,7 @@ static int GetPseudoDepth(const AVPixFmtDescriptor &Desc) {
+ // Comparing the pseudo depth makes sure that rgb565-ish formats get selected over rgb555-ish ones
+ int depth = 0;
+ for (int i = 0; i < Desc.nb_components; i++)
+- depth = FFMAX(depth, FFMS_DEPTH(Desc.comp[i]));
++ depth = FFMAX(depth, Desc.comp[i].depth);
+ return depth;
+ }
+
+diff --git a/src/vapoursynth/vapoursource.cpp b/src/vapoursynth/vapoursource.cpp
+index 9c4fa6060..11c7e5c01 100644
+--- a/src/vapoursynth/vapoursource.cpp
++++ b/src/vapoursynth/vapoursource.cpp
+@@ -40,11 +40,11 @@ static bool IsRealNativeEndianPlanar(const AVPixFmtDescriptor &desc) {
+ int used_planes = 0;
+ for (int i = 0; i < desc.nb_components; i++)
+ used_planes = std::max(used_planes, (int)desc.comp[i].plane + 1);
+- bool temp = (used_planes == desc.nb_components) && (FFMS_DEPTH(desc.comp[0]) >= 8) &&
++ bool temp = (used_planes == desc.nb_components) && (desc.comp[0].depth >= 8) &&
+ (!(desc.flags & FFMS_PIX_FMT_FLAG(PAL)));
+ if (!temp)
+ return false;
+- else if (FFMS_DEPTH(desc.comp[0]) == 8)
++ else if (desc.comp[0].depth == 8)
+ return temp;
+ else
+ return (FFMS_PIX_FMT(YUV420P10) == FFMS_PIX_FMT(YUV420P10BE) ? !!(desc.flags & FFMS_PIX_FMT_FLAG(BE)) : !(desc.flags & FFMS_PIX_FMT_FLAG(BE)));
+@@ -76,7 +76,7 @@ static int FormatConversionToPixelFormat(int id, bool Alpha, VSCore *core, const
+ const AVPixFmtDescriptor &desc = *av_pix_fmt_desc_get((AVPixelFormat)i);
+ if (IsRealNativeEndianPlanar(desc) && !HasAlpha(desc)
+ && GetColorFamily(desc) == f->colorFamily
+- && FFMS_DEPTH(desc.comp[0]) == f->bitsPerSample
++ && desc.comp[0].depth == f->bitsPerSample
+ && desc.log2_chroma_w == f->subSamplingW
+ && desc.log2_chroma_h == f->subSamplingH)
+ return i;
+@@ -87,7 +87,7 @@ static int FormatConversionToPixelFormat(int id, bool Alpha, VSCore *core, const
+ const AVPixFmtDescriptor &desc = *av_pix_fmt_desc_get((AVPixelFormat)i);
+ if (IsRealNativeEndianPlanar(desc) && HasAlpha(desc)
+ && GetColorFamily(desc) == f->colorFamily
+- && FFMS_DEPTH(desc.comp[0]) == f->bitsPerSample
++ && desc.comp[0].depth == f->bitsPerSample
+ && desc.log2_chroma_w == f->subSamplingW
+ && desc.log2_chroma_h == f->subSamplingH)
+ return i;
+@@ -97,7 +97,7 @@ static int FormatConversionToPixelFormat(int id, bool Alpha, VSCore *core, const
+
+ static const VSFormat *FormatConversionToVS(int id, VSCore *core, const VSAPI *vsapi) {
+ return vsapi->registerFormat(GetColorFamily(*av_pix_fmt_desc_get((AVPixelFormat)id)), stInteger,
+- FFMS_DEPTH(av_pix_fmt_desc_get((AVPixelFormat)id)->comp[0]),
++ av_pix_fmt_desc_get((AVPixelFormat)id)->comp[0].depth,
+ av_pix_fmt_desc_get((AVPixelFormat)id)->log2_chroma_w,
+ av_pix_fmt_desc_get((AVPixelFormat)id)->log2_chroma_h, core);
+ }
diff --git a/721ec7b98062ebce67959bae8587bd69db15e40a.patch b/721ec7b98062ebce67959bae8587bd69db15e40a.patch
new file mode 100644
index 0000000..429550e
--- /dev/null
+++ b/721ec7b98062ebce67959bae8587bd69db15e40a.patch
@@ -0,0 +1,71 @@
+From 721ec7b98062ebce67959bae8587bd69db15e40a Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis(a)gmail.com>
+Date: Tue, 18 Oct 2016 14:43:54 +0100
+Subject: [PATCH] configure: Make swr a hard dep
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com>
+---
+ Makefile.am | 2 +-
+ configure.ac | 18 ++++++------------
+ ffms2.pc.in | 2 +-
+ 3 files changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 624a91195..0400ab661 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,7 @@ AM_CXXFLAGS = -std=c++11 -fvisibility=hidden
+
+ lib_LTLIBRARIES = src/core/libffms2.la
+ src_core_libffms2_la_LDFLAGS = @src_core_libffms2_la_LDFLAGS@
+-src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @AVRESAMPLE_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
++src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @SWRESAMPLE_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
+ src_core_libffms2_la_SOURCES = \
+ src/core/audiosource.cpp \
+ src/core/audiosource.h \
+diff --git a/configure.ac b/configure.ac
+index 0bb736bba..fb7e653b8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,22 +132,16 @@ if test "$LIBAV_WORKS" = no; then
+ AC_MSG_FAILURE([cannot link with $_lav_name])
+ fi
+
+-libavresample='libavresample'
+-PKG_CHECK_MODULES(AVRESAMPLE, [libavresample >= 1.0.0], [], [
+- PKG_CHECK_MODULES(AVRESAMPLE, [libswresample >= 1.0.0], [
+- AC_DEFINE([WITH_SWRESAMPLE], [1], [Use libswresample rather than libavresample])
+- libavresample='libswresample'
+- ], [
+- AC_MSG_ERROR([Either avresample or swresample is required.])
+- ])
++PKG_CHECK_MODULES(SWRESAMPLE, [libswresample >= 1.0.0], [], [
++ AC_MSG_ERROR([swresample is required.])
+ ])
+
+ dnl See similar thing for LIBAV_LIBS
+-AVRESAMPLE_LIBS=$(echo $AVRESAMPLE_LIBS | sed 's/\(.*\)-lrt \(.*\)/\1\2 -lrt/')
++SWRESAMPLE_LIBS=$(echo $SWRESAMPLE_LIBS | sed 's/\(.*\)-lrt \(.*\)/\1\2 -lrt/')
+
+-AC_SUBST([AVRESAMPLE_CFLAGS])
+-AC_SUBST([AVRESAMPLE_LIBS])
+-AC_SUBST([libavresample])
++AC_SUBST([SWRESAMPLE_CFLAGS])
++AC_SUBST([SWRESAMPLE_LIBS])
++AC_SUBST([libswresample])
+
+ src_core_libffms2_la_LDFLAGS=""
+ AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed])
+diff --git a/ffms2.pc.in b/ffms2.pc.in
+index 2568b6142..7a2a35ee8 100644
+--- a/ffms2.pc.in
++++ b/ffms2.pc.in
+@@ -7,7 +7,7 @@ includedir=@includedir@
+
+ Name: ffms2
+ Description: The Fabulous FM Library 2
+-Requires.private: libavformat libavcodec libswscale libavutil @libavresample@
++Requires.private: libavformat libavcodec libswscale libavutil libswresample
+ Version: @FFMS_VERSION@
+ Libs.private: @ZLIB_LDFLAGS@ -lz
+ Libs: -L${libdir} -lffms2
diff --git a/ffms2.spec b/ffms2.spec
index b155923..87ae974 100644
--- a/ffms2.spec
+++ b/ffms2.spec
@@ -1,10 +1,13 @@
Name: ffms2
Version: 2.23
-Release: 15%{?dist}
+Release: 16%{?dist}
License: MIT
Summary: Wrapper library around libffmpeg
URL: https://github.com/FFMS/ffms2
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# Patches required to remove libavresample
+Patch0: %{url}/commit/721ec7b98062ebce67959bae8587bd69db15e40a.patch
+Patch1: %{url}/commit/354940823be5002556dd827f0130faa7f656c139.patch
BuildRequires: gcc, gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
@@ -32,7 +35,7 @@ library around libffmpeg, plus some additional components to deal with file
formats libavformat has (or used to have) problems with.
%prep
-%autosetup
+%autosetup -p1
sed -i 's/\r$//' COPYING
%build
@@ -60,6 +63,9 @@ rm -rf %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Thu May 28 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.23-16
+- Remove libavresample dependency (rfbz#5349)
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.23-15
- Rebuild for ffmpeg-4.3 git
3 years, 10 months