[vdr-markad/f35] (4 commits) ...Update to 3.0.20
by Martin Gansser
Summary of changes:
6832d99... Rebuilt for new VDR API version (*)
9a5b9d2... Rebuilt for new VDR API version (*)
7abde5e... Rebuilt for new VDR API version (*)
934e842... Update to 3.0.20 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vdr-markad/f36] Update to 3.0.20
by Martin Gansser
Summary of changes:
934e842... Update to 3.0.20 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[vdr-markad] Update to 3.0.20
by Martin Gansser
commit 934e842152e3c2fe1ea08319b11c2147d6537c90
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon Mar 7 09:22:21 2022 +0100
Update to 3.0.20
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f689e5..661faae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.0.17.tar.gz
/vdr-markad-3.0.18.tar.gz
/vdr-markad-3.0.19.tar.gz
+/vdr-markad-3.0.20.tar.gz
diff --git a/sources b/sources
index 9fe2e2f..5087a41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.0.19.tar.gz) = dc4fbcfd3b0c4bbfddeacbf7a5889560a408b02ff3af15f57bf5a40d5b718b620d29f7e3c77f72d2238b0120f7cf36939da1c3c4b4c0c231982128677b5c4af2
+SHA512 (vdr-markad-3.0.20.tar.gz) = 0b5365b948ef7fc9e760d942a640a8e6d3d24c85597688b87eefb286e62edb4a9b67bfb894432e94ae338431932402ec67d3853ca37c8277f5b49c94318f91e8
diff --git a/vdr-markad.spec b/vdr-markad.spec
index cbff477..1ea9947 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -1,6 +1,6 @@
Name: vdr-markad
-Version: 3.0.19
-Release: 3%{?dist}
+Version: 3.0.20
+Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
URL: https://github.com/kfb77/vdr-plugin-markad
@@ -48,6 +48,9 @@ fi
%{vdr_vardir}/markad/
%changelog
+* Mon Mar 07 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.20-1
+- Update to 3.0.20
+
* Sat Feb 05 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.19-3
- Rebuilt for new VDR API version
2 years, 8 months
[audacious-plugins-freeworld] fix
by Leigh Scott
commit 9a41448fd76a8f635ec746fd5a68f10695cf474c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Mar 6 23:16:33 2022 +0000
fix
audacious-plugins-freeworld.spec | 3 ++-
f60beb400eeb1e4778bbfd738bc4a4ccef3de539.patch | 31 ++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index e71ded2..0e40f32 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -11,6 +11,7 @@ Summary: Additional plugins for the Audacious media player
License: GPLv3
URL: https://audacious-media-player.org/
Source0: https://distfiles.audacious-media-player.org/audacious-plugins-%{version}...
+Patch0: https://github.com/audacious-media-player/audacious-plugins/commit/f60beb...
BuildRequires: audacious-devel >= %{version}
BuildRequires: gcc-c++
@@ -78,7 +79,7 @@ This is the plugin needed to access MMS streams.
%prep
-%setup -q -n audacious-plugins-%{version}
+%autosetup -p1 -n audacious-plugins-%{version}
sed -i '\,^.SILENT:,d' buildsys.mk.in
sed -i 's!MAKE} -s!MAKE} !' buildsys.mk.in
diff --git a/f60beb400eeb1e4778bbfd738bc4a4ccef3de539.patch b/f60beb400eeb1e4778bbfd738bc4a4ccef3de539.patch
new file mode 100644
index 0000000..617c112
--- /dev/null
+++ b/f60beb400eeb1e4778bbfd738bc4a4ccef3de539.patch
@@ -0,0 +1,31 @@
+From f60beb400eeb1e4778bbfd738bc4a4ccef3de539 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john(a)jlindgren.net>
+Date: Sat, 5 Mar 2022 12:05:34 -0500
+Subject: [PATCH] Fix build with FFmpeg 5.0
+
+---
+ src/ffaudio/ffaudio-core.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc
+index 16dc63e3a..a2b95fd6c 100644
+--- a/src/ffaudio/ffaudio-core.cc
++++ b/src/ffaudio/ffaudio-core.cc
+@@ -274,7 +274,7 @@ static AVInputFormat * get_format_by_content (const char * name, VFSFile & file)
+ AVProbeData d = {name, buf, filled};
+ score = target;
+
+- f = av_probe_input_format2 (& d, true, & score);
++ f = (AVInputFormat *) av_probe_input_format2 (& d, true, & score);
+ if (f)
+ break;
+
+@@ -347,7 +347,7 @@ static bool find_codec (AVFormatContext * c, CodecInfo * cinfo)
+ #endif
+ if (stream && stream->codecpar && stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+ {
+- AVCodec * codec = avcodec_find_decoder (stream->codecpar->codec_id);
++ AVCodec * codec = (AVCodec *) avcodec_find_decoder (stream->codecpar->codec_id);
+
+ if (codec)
+ {
2 years, 8 months
[xmms2-freeworld/f36] fix
by Leigh Scott
Summary of changes:
6dd9d26... fix (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xmms2-freeworld] fix
by Leigh Scott
commit 6dd9d265bf9d14fa82bed51ece8d7ae50c3cfcfc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Mar 6 22:47:37 2022 +0000
fix
xmms2-freeworld.spec | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/xmms2-freeworld.spec b/xmms2-freeworld.spec
index 83dccdf..84c981d 100644
--- a/xmms2-freeworld.spec
+++ b/xmms2-freeworld.spec
@@ -23,7 +23,13 @@ BuildRequires: sqlite-devel
BuildRequires: glib2-devel
BuildRequires: python2-devel
# RPMFusion only BuildRequires
-BuildRequires: faad2-devel, ffmpeg-devel, libmms-devel
+BuildRequires: faad2-devel
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: compat-ffmpeg4-devel
+%else
+BuildRequires: ffmpeg-devel
+%endif
+BuildRequires: libmms-devel
Requires: xmms2-avcodec = %{version}-%{release}
Requires: xmms2-faad = %{version}-%{release}
@@ -94,6 +100,9 @@ done
%build
export CFLAGS="%{optflags}"
+%if 0%{?fedora} && 0%{?fedora} > 35
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
+%endif
./waf configure --prefix=%{_prefix} \
--libdir=%{_libdir} \
--with-pkgconfigdir=%{_libdir}/pkgconfig \
2 years, 8 months
