[vdr-markad/f36] Update to 3.0.22
by Martin Gansser
Summary of changes:
2fef451... Update to 3.0.22 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years
[vdr-markad] Update to 3.0.22
by Martin Gansser
commit 2fef451b9970af96c345c08370c49fca61e19f05
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri May 6 12:03:06 2022 +0200
Update to 3.0.22
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 16 ++++++++++++++--
3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb46b08..8faf769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.0.19.tar.gz
/vdr-markad-3.0.20.tar.gz
/vdr-markad-3.0.21.tar.gz
+/vdr-markad-3.0.22.tar.gz
diff --git a/sources b/sources
index ada4cc5..59eeaa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.0.21.tar.gz) = 1d094f6b0f869355efddbd667c540b954c402dca7a1cd47f11f4104109646a796bfb4050ab87c1495d0ed48c941ce18ef2b72aee6a14878aeb99197fdcf593f9
+SHA512 (vdr-markad-3.0.22.tar.gz) = bab93c6311a5b70c5c7395ce6f0f10714d6c7c214b591a9c9e1a113956ce330fbc6c114bda1f5f25f4437782680c68127b39417dd342b49e2eac03c3e3bae80b
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 8f51f5e..f4d803e 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -1,5 +1,14 @@
+# version we want build against
+%global vdr_version 2.4.0
+%if 0%{?fedora} >= 36
+%global vdr_version 2.6.1
+%endif
+%if 0%{?fedora} == 35
+%global vdr_version 2.4.7
+%endif
+
Name: vdr-markad
-Version: 3.0.21
+Version: 3.0.22
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -8,7 +17,7 @@ Source0: https://github.com/kfb77/vdr-plugin-markad/archive/v%{version}.t
Source1: %{name}.conf
BuildRequires: make
BuildRequires: gcc-c++
-BuildRequires: vdr-devel >= 1.7.30
+BuildRequires: vdr-devel >= %{vdr_version}
BuildRequires: ffmpeg-devel >= 4.1
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -48,6 +57,9 @@ fi
%{vdr_vardir}/markad/
%changelog
+* Fri May 06 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.22-1
+- Update to 3.0.22
+
* Fri Mar 25 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.21-1
- Update to 3.0.21
2 years
[mixxx/ffmpeg] Use FFmpeg for decoding MP3 and AAC/M4A files
by Uwe Klotz
commit fd38274e4e80212d41f001063da2f4fb929b43e6
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri May 6 10:32:20 2022 +0200
Use FFmpeg for decoding MP3 and AAC/M4A files
ffmpeg_priority.patch | 14 ++++++++++++++
mixxx.spec | 11 ++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/ffmpeg_priority.patch b/ffmpeg_priority.patch
new file mode 100644
index 0000000..4bae405
--- /dev/null
+++ b/ffmpeg_priority.patch
@@ -0,0 +1,14 @@
+diff --git a/src/sources/soundsourceffmpeg.cpp b/src/sources/soundsourceffmpeg.cpp
+index 8a8223b325..41c828adb4 100644
+--- a/src/sources/soundsourceffmpeg.cpp
++++ b/src/sources/soundsourceffmpeg.cpp
+@@ -459,7 +459,7 @@ SoundSourceProviderPriority SoundSourceProviderFFmpeg::getPriorityHint(
+ // supported and tested file extension?
+ // Currently it is only used as a fallback after all other
+ // SoundSources failed to open a file or are otherwise unavailable.
+- return SoundSourceProviderPriority::Lowest;
++ return SoundSourceProviderPriority::Default;
+ }
+
+ SoundSourceFFmpeg::SoundSourceFFmpeg(const QUrl& url)
+--
diff --git a/mixxx.spec b/mixxx.spec
index 688d162..5c540be 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -25,7 +25,7 @@
Name: mixxx
Version: 2.3.2
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -35,6 +35,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{
Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
Patch0: appstream_metainfo.patch
Patch1: disable_werror_in_tests.patch
+Patch2: ffmpeg_priority.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -48,7 +49,6 @@ BuildRequires: ninja-build
# Build Requirements
BuildRequires: chrpath
# The runtime libraries of FAAD2 are needed during the build for testing
-BuildRequires: faad2
BuildRequires: ffmpeg-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
@@ -58,10 +58,7 @@ BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libchromaprint-devel
BuildRequires: fftw-devel
-BuildRequires: libid3tag-devel
-BuildRequires: libmad-devel
BuildRequires: libmodplug-devel
-BuildRequires: libmp4v2-devel
BuildRequires: libsndfile-devel
BuildRequires: libusbx-devel
BuildRequires: lilv-devel
@@ -129,13 +126,13 @@ cp %{SOURCE1} %{__cmake_builddir}/downloads
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
- -DFAAD=ON \
+ -DFAAD=OFF \
-DFFMPEG=ON \
-DHID=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DLILV=ON \
- -DMAD=ON \
+ -DMAD=OFF \
-DMODPLUG=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
2 years
[mixxx] Created branch ffmpeg
by Uwe Klotz
The branch 'ffmpeg' was created.
Summary of new commits:
fd38274... Use FFmpeg for decoding MP3 and AAC/M4A files
2 years
[frogatto] Fix segfault at startup (BZ #6252). Thanks to Ingo van Lil.
by Andrea Musuruane
commit cc4ec3b0ef2e748e9b007a1e495f9356f6aa3de9
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Fri May 6 08:47:36 2022 +0200
Fix segfault at startup (BZ #6252). Thanks to Ingo van Lil.
Use %set_build_flags macro
frogatto-1.3.3-sdl.patch | 38 +++++++++++++++++++++++++++++++++++++
frogatto-1.3.3-stack-overflow.patch | 26 +++++++++++++++++++++++++
frogatto.spec | 22 ++++++++++++++++++---
3 files changed, 83 insertions(+), 3 deletions(-)
---
diff --git a/frogatto-1.3.3-sdl.patch b/frogatto-1.3.3-sdl.patch
new file mode 100644
index 0000000..cf5ac73
--- /dev/null
+++ b/frogatto-1.3.3-sdl.patch
@@ -0,0 +1,38 @@
+From 7de047326ad5f91da0a1faa62e25eaa163cdda36 Mon Sep 17 00:00:00 2001
+From: Ingo van Lil <inguin(a)gmx.de>
+Date: Mon, 25 Apr 2022 07:29:56 +0200
+Subject: [PATCH 1/2] Work around surface double free with sdl12-compat
+
+The SDL 1.2 compatibility library disregards the surface's refcount
+field in SDL_FreeSurface, causing a double free in Frogatto. A bugfix is
+available in commit [1], but not yet released. Work around by handling
+the refcount ourselves.
+
+This patch can be removed when RPMs for sdl12-compat newer than 1.2.52
+are available, but it should be safe even then.
+
+[1] https://github.com/libsdl-org/sdl12-compat/commit/201670ec
+---
+ src/surface.hpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/surface.hpp b/src/surface.hpp
+index 216051f54..ec26d76ee 100644
+--- a/src/surface.hpp
++++ b/src/surface.hpp
+@@ -42,7 +42,11 @@ private:
+ void operator()(SDL_Surface *surf) const
+ {
+ if (surf != NULL) {
+- SDL_FreeSurface(surf);
++ if (surf->refcount > 1) {
++ --surf->refcount;
++ } else {
++ SDL_FreeSurface(surf);
++ }
+ }
+ }
+ };
+--
+2.35.1
+
diff --git a/frogatto-1.3.3-stack-overflow.patch b/frogatto-1.3.3-stack-overflow.patch
new file mode 100644
index 0000000..4984f81
--- /dev/null
+++ b/frogatto-1.3.3-stack-overflow.patch
@@ -0,0 +1,26 @@
+From e9308875d2d8b552722b3b13fbf67cf630c3e8d1 Mon Sep 17 00:00:00 2001
+From: Ingo van Lil <inguin(a)gmx.de>
+Date: Mon, 25 Apr 2022 08:15:52 +0200
+Subject: [PATCH 2/2] Fix stack overflow in base64 test
+
+Reserve space for terminating 0 character in destination string.
+---
+ src/level_object.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/level_object.cpp b/src/level_object.cpp
+index 097b97a3c..13ff75992 100644
+--- a/src/level_object.cpp
++++ b/src/level_object.cpp
+@@ -908,7 +908,7 @@ UNIT_TEST(level_object_base64)
+ const char* s = "4O0";
+ const char* s2 = s + strlen(s);
+ const int num = base64_unencode(s, s2);
+- char buf[3];
++ char buf[4];
+ base64_encode(num, buf, 3);
+ CHECK_EQ(buf[0], s[0]);
+ CHECK_EQ(buf[1], s[1]);
+--
+2.35.1
+
diff --git a/frogatto.spec b/frogatto.spec
index 4ff4284..9dc3c9e 100644
--- a/frogatto.spec
+++ b/frogatto.spec
@@ -3,7 +3,7 @@
Name: frogatto
Version: 1.3.3
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: An old-school 2D platform game
# Artwork and music not released under an open license
@@ -28,6 +28,13 @@ Patch3: %{name}-1.3-narrowing-conversion-fixes.patch
Patch4: %{name}-1.3-comparison.patch
# Fix building with Boost 1.70+
Patch5: %{name}-1.3-boost.patch
+# Fix stack overflow in base64 test
+# Patch by Ingo van Lil
+Patch6: %{name}-1.3.3-stack-overflow.patch
+# Work around surface double free with sdl12-compat
+# This needs to be removed once sdl12-compat > 1.2.52 is released
+# Patch by Ingo van Lil
+Patch7: %{name}-1.3.3-sdl.patch
# We have problems with these architectures
# https://lists.rpmfusion.org/archives/list/rpmfusion-developers@lists.rpmf...
@@ -69,14 +76,19 @@ in game, and work to unravel Big Bad Milgram's plot against the townsfolk!
%patch3 -p1
%patch4 -p1
%patch5 -p0
+%patch6 -p1
+%patch7 -p1
# Fix locale file path
sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
+# Edit BASE_CXXFLAGS
+sed -i 's/BASE_CXXFLAGS += -g -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wignored-qualifiers -Wformat -Wswitch/BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wno-narrowing/' Makefile
+
%build
-%make_build \
- BASE_CXXFLAGS="$RPM_OPT_FLAGS -fno-inline-functions -fthreadsafe-statics -Wno-narrowing"
+%set_build_flags
+%make_build
%install
@@ -144,6 +156,10 @@ appstream-util validate-relax --nonet \
%changelog
+* Tue Apr 26 2022 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-25
+- Fix segfault at startup (BZ #6252). Thanks to Ingo van Lil.
+- Use %%set_build_flags macro
+
* Mon Feb 14 2022 Sérgio Basto <sergio(a)serjux.com> - 1.3.3-24
- Rebuid for glew-2.2.0
2 years
[lpf-mscore-fonts] rename mscore-fonts.spec.in to ms-core-fonts.spec.in to lpf work porperly
by Sérgio M. Basto
commit 311825bcb4203580f3a63bfadb0ceb06a4ecda12
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu May 5 00:54:57 2022 +0100
rename mscore-fonts.spec.in to ms-core-fonts.spec.in to lpf work porperly
and mark packages as installed
lpf-mscore-fonts.spec | 19 +++++++++++++------
mscore-fonts.spec.in => ms-core-fonts.spec.in | 0
2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/lpf-mscore-fonts.spec b/lpf-mscore-fonts.spec
index 30410ed..e3e06ad 100644
--- a/lpf-mscore-fonts.spec
+++ b/lpf-mscore-fonts.spec
@@ -1,16 +1,17 @@
# %%global will not work here, lazy evaluation needed.
-%define target_pkg %(t=%{name}; echo ${t#lpf-})
+#%%define target_pkg %%(t=%%{name}; echo ${t#lpf-})
+%global target_pkg ms-core-fonts
Name: lpf-mscore-fonts
Version: 2.2
-Release: 5%{?dist}
-Summary: Bootstrap package building mscore-fonts using lpf
+Release: 6%{?dist}
+Summary: Bootstrap package building ms-core-fonts using lpf
License: MIT
URL: https://github.com/leamas/lpf
Group: Development/Tools
BuildArch: noarch
-Source0: mscore-fonts.spec.in
+Source0: ms-core-fonts.spec.in
Source1: Licen.TXT
Source2: 61-ms-core-arial.conf
Source3: 61-ms-core-andale.conf
@@ -30,7 +31,9 @@ Requires: lpf
%description
Bootstrap package allowing the lpf system to build the
-mscore-fonts non-redistributable package.
+ms-core-fonts non-redistributable package.
+Packages have been renamed to ms-core, to avoid conflicts with mscore package
+(MuseScore base music font)
%prep
@@ -57,12 +60,16 @@ mscore-fonts non-redistributable package.
%files
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/lpf-ms-core-fonts.desktop
%{_datadir}/lpf/packages/%{target_pkg}
%attr(775,pkg-build,pkg-build) /var/lib/lpf/packages/%{target_pkg}
%changelog
+* Wed May 04 2022 Sérgio Basto <sergio(a)serjux.com> - 2.2-6
+- rename mscore-fonts.spec.in to ms-core-fonts.spec.in to lpf work porperly
+ and mark packages as installed
+
* Sun Nov 07 2021 Sérgio Basto <sergio(a)serjux.com> - 2.2-5
- Add Obsoletes: old font names
diff --git a/mscore-fonts.spec.in b/ms-core-fonts.spec.in
similarity index 100%
rename from mscore-fonts.spec.in
rename to ms-core-fonts.spec.in
2 years