[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
+
38 minutes
[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(-)
---
1 day, 7 hours
[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(-)
---
1 day, 7 hours
[vdr-markad/f42] Update to 4.2.11
by Martin Gansser
Summary of changes:
fcf9286... Update to 4.2.11 (*)
(*) This commit already existed in another branch; no separate mail sent
1 day, 7 hours
[vdr-markad] Update to 4.2.11
by Martin Gansser
commit fcf92864425e8127e77d9262408b9f8c61b01a95
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Sun Mar 30 11:31:21 2025 +0200
Update to 4.2.11
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a403136..5da26d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-4.2.8.tar.gz
/vdr-markad-4.2.9.tar.gz
/vdr-markad-4.2.10.tar.gz
+/vdr-markad-4.2.11.tar.gz
diff --git a/sources b/sources
index 7dc49d8..bafb4b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-4.2.10.tar.gz) = 1bfe23a921bd999a088ca89dfa35d604bc52f30250d1b5db06488779f807a5123890e2472dad5f4b4063daff32f92ebd18e6e82c5c47b4709e69d26b408343a3
+SHA512 (vdr-markad-4.2.11.tar.gz) = 7c2db23e91622fc1675723a25f4cf387fa66ddd9c619f92edee3986b3818932b918dca30a9ada9d7853174a622ea83fb3f8fe1365d565f833adb58f6c383ff86
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 983f741..67f51a3 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,8 +5,8 @@
%endif
Name: vdr-markad
-Version: 4.2.10
-Release: 2%{?dist}
+Version: 4.2.11
+Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPL-2.0-or-later
URL: https://github.com/kfb77/vdr-plugin-markad
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Sun Mar 30 2025 Martin Gansser <martinkg(a)fedoraproject.org> - 4.2.11-1
+- Update to 4.2.11
+
* Sun Mar 16 2025 Martin Gansser <martinkg(a)fedoraproject.org> - 4.2.10-2
- Rebuilt for new VDR API version 2.7.4
1 day, 7 hours