[assaultcube] fix typo
by Sérgio M. Basto
commit c3ddded8382605e0be839aecc776c18fd5574586
Author: cheese1 <cheese(a)nosuchhost.net>
Date: Fri Jan 10 21:06:44 2025 +0100
fix typo
assaultcube.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/assaultcube.spec b/assaultcube.spec
index 3fc9770..179d914 100644
--- a/assaultcube.spec
+++ b/assaultcube.spec
@@ -103,7 +103,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/packages/locale/AC.lang
# Make .desktop files
cat > %{name}.desktop << EOF
[Desktop Entry]
-Name=AssualtCube
+Name=AssaultCube
Comment=AssaultCube is a total conversion of Wouter van Oortmerssen s FPS called Cube
Exec=%{_bindir}/%{name}
Icon=%{name}
3 weeks, 6 days
[d1x/f42] Fix FTBFS with gcc15
by jwrdegoede
Summary of changes:
1678ec2... Fix FTBFS with gcc15 (*)
(*) This commit already existed in another branch; no separate mail sent
4 weeks
[d1x] Fix FTBFS with gcc15
by jwrdegoede
commit 1678ec2c8b5e9f890858fa3997ab1fb20e368138
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Mar 31 20:00:51 2025 +0200
Fix FTBFS with gcc15
d1x-gcc15.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
d1x.spec | 9 +++++++--
2 files changed, 65 insertions(+), 2 deletions(-)
---
diff --git a/d1x-gcc15.patch b/d1x-gcc15.patch
new file mode 100644
index 0000000..167f934
--- /dev/null
+++ b/d1x-gcc15.patch
@@ -0,0 +1,58 @@
+diff -up dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/common/include/physfsx.h~ dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/common/include/physfsx.h
+--- dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/common/include/physfsx.h~ 2025-03-31 17:51:01.000000000 +0200
++++ dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/common/include/physfsx.h 2025-03-31 18:13:02.522821207 +0200
+@@ -78,9 +78,9 @@ __attribute_always_inline()
+ static inline PHYSFS_sint64 PHYSFSX_check_read(PHYSFS_File *file, V *v, const PHYSFS_uint32 S, const PHYSFS_uint32 C)
+ {
+ if constexpr (std::is_integral<V>::value)
+- static_assert(std::is_pod<V>::value, "non-POD integral value read");
++ static_assert(std::is_standard_layout<V>::value, "non-POD integral value read");
+ else
+- static_assert(std::is_pod<V>::value, "non-POD non-integral value read");
++ static_assert(std::is_standard_layout<V>::value, "non-POD non-integral value read");
+ DXX_PHYSFS_CHECK_READ_SIZE_OBJECT_SIZE(S, C, v);
+ return PHYSFS_read(file, v, S, C);
+ }
+@@ -89,7 +89,7 @@ template <typename V, std::size_t N>
+ __attribute_always_inline()
+ static inline PHYSFS_sint64 PHYSFSX_check_read(PHYSFS_File *file, std::array<V, N> &v, PHYSFS_uint32 S, PHYSFS_uint32 C)
+ {
+- static_assert(std::is_pod<V>::value, "C++ array of non-POD elements read");
++ static_assert(std::is_standard_layout<V>::value, "C++ array of non-POD elements read");
+ DXX_PHYSFS_CHECK_READ_SIZE_ARRAY_SIZE(S, C);
+ return PHYSFSX_check_read(file, &v[0], S, C);
+ }
+@@ -107,11 +107,11 @@ static inline PHYSFS_sint64 PHYSFSX_chec
+ {
+ if constexpr (std::is_integral<V>::value)
+ {
+- static_assert(std::is_pod<V>::value, "non-POD integral value written");
++ static_assert(std::is_standard_layout<V>::value, "non-POD integral value written");
+ DXX_PHYSFS_CHECK_WRITE_ELEMENT_SIZE_CONSTANT(S,C);
+ }
+ else
+- static_assert(std::is_pod<V>::value, "non-POD non-integral value written");
++ static_assert(std::is_standard_layout<V>::value, "non-POD non-integral value written");
+ DXX_PHYSFS_CHECK_WRITE_SIZE_OBJECT_SIZE(S, C, v);
+ return PHYSFS_write(file, v, S, C);
+ }
+@@ -120,7 +120,7 @@ template <typename V, std::size_t N>
+ __attribute_always_inline()
+ static inline PHYSFS_sint64 PHYSFSX_check_write(PHYSFS_File *file, const std::array<V, N> &v, PHYSFS_uint32 S, PHYSFS_uint32 C)
+ {
+- static_assert(std::is_pod<V>::value, "C++ array of non-POD elements written");
++ static_assert(std::is_standard_layout<V>::value, "C++ array of non-POD elements written");
+ DXX_PHYSFS_CHECK_WRITE_CONSTANTS(S,C);
+ return PHYSFSX_check_write(file, &v[0], S, C);
+ }
+diff -up dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/d2x-rebirth/main/libmve.h~ dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/d2x-rebirth/main/libmve.h
+--- dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/d2x-rebirth/main/libmve.h~ 2022-01-30 05:40:54.000000000 +0100
++++ dxx-rebirth-7258b7fd5966fc38e53f4d8192b0c810829ada02/d2x-rebirth/main/libmve.h 2025-03-31 19:09:29.816801945 +0200
+@@ -11,6 +11,7 @@
+
+ #ifdef __cplusplus
+ #include <memory>
++#include <cstdint>
+
+ enum class MVE_StepStatus
+ {
diff --git a/d1x.spec b/d1x.spec
index 25a7e06..23e21a2 100644
--- a/d1x.spec
+++ b/d1x.spec
@@ -6,7 +6,7 @@
Summary: Descent 1 game and shareware data files (d1x-rebirth version)
Name: d1x
Version: 1.43
-Release: 36.rebirth.%{snapshotdate}git%{shortcommit}%{?dist}
+Release: 37.rebirth.%{snapshotdate}git%{shortcommit}%{?dist}
License: non-commercial
Source0: https://github.com/dxx-rebirth/dxx-rebirth/archive/%{commit}/dxx-rebirth-...
Source1: d1x-rebirth.sh
@@ -20,7 +20,8 @@ Patch1: d1x-gcc12.patch
Patch2: d1x-window_icon_bitmap.patch
# Fix compilation on armv7hl, can be dropped when we drop armv7hl support
Patch3: d1x-disable-Werror-useless-cast.patch
-Patch4: fix_scons_issue.patch
+Patch4: fix_scons_issue.patch
+Patch5: d1x-gcc15.patch
URL: https://www.dxx-rebirth.com/
BuildRequires: gcc gcc-c++ libpng-devel
BuildRequires: SDL2-devel SDL2_mixer-devel SDL2_image-devel
@@ -74,6 +75,7 @@ robots-h.mvl files to the dir.
%patch 2 -p1
%patch 3 -p1
%patch 4 -p1
+%patch 5 -p1
# Fixup encoding and CTRL+Z at the end of the orderfrm.txt files
iconv -f CP850 -t UTF-8 d1shar/ORDERFRM.TXT | head -n-3 > ORDERFRM.TXT
touch -r d1shar/ORDERFRM.TXT ORDERFRM.TXT
@@ -160,6 +162,9 @@ appstream-util validate-relax --nonet \
%changelog
+* Mon Mar 31 2025 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.43-37.rebirth.20220222git7258b7f
+- Fix FTBFS with gcc15
+
* Wed Jan 29 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.43-36.rebirth.20220222git7258b7f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
4 weeks
[devedeng] filo was removed in ffmpeg-7.0 (rfbz#7205)
by Leigh Scott
commit dd775562e6fc4673a5526b87eb86afbafd7d7907
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Mar 31 17:01:58 2025 +0100
filo was removed in ffmpeg-7.0 (rfbz#7205)
devedeng.spec | 9 +++-
remove_filo.patch | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 149 insertions(+), 2 deletions(-)
---
diff --git a/devedeng.spec b/devedeng.spec
index 9ffe7ff..d1a1057 100644
--- a/devedeng.spec
+++ b/devedeng.spec
@@ -1,12 +1,14 @@
Name: devedeng
Version: 4.18.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
License: GPLv3
URL: http://www.rastersoft.com/programas/devede.html
Source0: https://gitlab.com/rastersoft/devedeng/-/archive/%{version}/%{name}-%{ver...
-
+# filo was removed in ffmpeg-7.0
+# https://gitlab.com/rastersoft/devedeng/-/commit/a959d120ccb4da22db3a41d86...
+Patch0: remove_filo.patch
BuildArch: noarch
Provides: devede = %{version}-%{release}
@@ -99,6 +101,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%changelog
+* Mon Mar 31 2025 Leigh Scott <leigh123linux(a)gmail.com> - 4.18.0-5
+- filo was removed in ffmpeg-7.0 (rfbz#7205)
+
* Tue Jan 28 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.18.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
diff --git a/remove_filo.patch b/remove_filo.patch
new file mode 100644
index 0000000..91b4121
--- /dev/null
+++ b/remove_filo.patch
@@ -0,0 +1,142 @@
+From a959d120ccb4da22db3a41d86014a3d8bbb2e43f Mon Sep 17 00:00:00 2001
+From: Sergio Costas <rastersoft(a)gmail.com>
+Date: Tue, 13 Aug 2024 22:17:52 +0200
+Subject: [PATCH] Remove FIFO filter
+
+It has been removed from ffmpeg
+---
+ src/devedeng/avconv.py | 18 +++++++++---------
+ src/devedeng/ffmpeg.py | 18 +++++++++---------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/devedeng/avconv.py b/src/devedeng/avconv.py
+index 14183c2..9b34c56 100644
+--- a/src/devedeng/avconv.py
++++ b/src/devedeng/avconv.py
+@@ -180,25 +180,25 @@ class avconv(devedeng.avbase.avbase):
+
+ if (file_project.prerotation == 90):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=1"
+ elif (file_project.prerotation == -90) or (file_project.prerotation == 270):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=2"
+ elif (file_project.prerotation == 180):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ vflip = not vflip
+ hflip = not hflip
+
+ if (file_project.rotation == "rotation_90"):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=1"
+ elif (file_project.rotation == "rotation_270"):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=2"
+ elif (file_project.rotation == "rotation_180"):
+ vflip = not vflip
+@@ -211,16 +211,16 @@ class avconv(devedeng.avbase.avbase):
+
+ if (vflip):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "vflip"
+ if (hflip):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "hflip"
+
+ if (file_project.width_midle != file_project.original_width) or (file_project.height_midle != file_project.original_height):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ x = int((file_project.width_midle -
+ file_project.original_width) / 2)
+ y = int((file_project.height_midle -
+@@ -234,7 +234,7 @@ class avconv(devedeng.avbase.avbase):
+
+ if (file_project.width_final != file_project.width_midle) or (file_project.height_final != file_project.height_midle):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ if self.major_version < 11:
+ cmd_line += "scale=" + \
+ str(file_project.width_final) + ":" + \
+diff --git a/src/devedeng/ffmpeg.py b/src/devedeng/ffmpeg.py
+index 8694ac2..283c1b7 100644
+--- a/src/devedeng/ffmpeg.py
++++ b/src/devedeng/ffmpeg.py
+@@ -180,25 +180,25 @@ class ffmpeg(devedeng.executor.executor):
+
+ if (file_project.prerotation == 90):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=1"
+ elif (file_project.prerotation == -90) or (file_project.prerotation == 270):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=2"
+ elif (file_project.prerotation == 180):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ vflip = not vflip
+ hflip = not hflip
+
+ if (file_project.rotation == "rotation_90"):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=1"
+ elif (file_project.rotation == "rotation_270"):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "transpose=2"
+ elif (file_project.rotation == "rotation_180"):
+ vflip = not vflip
+@@ -211,16 +211,16 @@ class ffmpeg(devedeng.executor.executor):
+
+ if (vflip):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "vflip"
+ if (hflip):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "hflip"
+
+ if (file_project.width_midle != file_project.original_width) or (file_project.height_midle != file_project.original_height):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ x = int((file_project.width_midle - file_project.original_width) / 2)
+ y = int((file_project.height_midle - file_project.original_height) / 2)
+ if (x > 0) or (y > 0):
+@@ -230,7 +230,7 @@ class ffmpeg(devedeng.executor.executor):
+
+ if (file_project.width_final != file_project.width_midle) or (file_project.height_final != file_project.height_midle):
+ if (cmd_line != ""):
+- cmd_line += ",fifo,"
++ cmd_line += ","
+ cmd_line += "scale=" + \
+ str(file_project.width_final) + ":" + \
+ str(file_project.height_final)
+--
+GitLab
+
4 weeks
[vdr-markad/f40: 3/3] Merge branch 'master' into f40
by Martin Gansser
commit 1d0f8ebb8fbeedc2d6307da4446284505269ab4a
Merge: e52919b fcf9286
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Sun Mar 30 11:32:11 2025 +0200
Merge branch 'master' into f40
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
4 weeks, 1 day
[vdr-markad/f41: 3/3] Merge branch 'master' into f41
by Martin Gansser
commit 0820321497393b437da8e6d2db36ee8e5ad35f4d
Merge: 19e75b8 fcf9286
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Sun Mar 30 11:31:56 2025 +0200
Merge branch 'master' into f41
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
4 weeks, 1 day
