[xv] Fix incorrectly applied corrupt GIF patch
by Paul Howarth
commit 3d07e863374f500ca89b4707da64f9abbc383b13
Author: Paul Howarth <paul(a)city-fan.org>
Date: Thu Mar 3 13:38:39 2022 +0000
Fix incorrectly applied corrupt GIF patch
xv-3.10a-corrupt-GIF.patch | 16 ++++++++--------
xv.spec | 5 ++++-
2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/xv-3.10a-corrupt-GIF.patch b/xv-3.10a-corrupt-GIF.patch
index cd70532..a7e8872 100644
--- a/xv-3.10a-corrupt-GIF.patch
+++ b/xv-3.10a-corrupt-GIF.patch
@@ -1,4 +1,4 @@
-From 8cac4efc53400cb82afc8c5048940d930243bd3d Mon Sep 17 00:00:00 2001
+From ed040a65458d709011d497c3eb917320786b9ef8 Mon Sep 17 00:00:00 2001
From: Stuart Henderson <stu(a)spacehopper.org>
Date: Fri, 18 Feb 2022 20:43:10 +0000
Subject: [PATCH] fix segv seen with some corrupt gif file
@@ -11,7 +11,7 @@ unfortunately I don't have more details about the original problem.
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/xvgif.c b/src/xvgif.c
-index 7bdb3d1..c2b9746 100644
+index 7bdb3d1..10b348d 100644
--- a/src/xvgif.c
+++ b/src/xvgif.c
@@ -75,6 +75,7 @@ static boolean Interlace, HasGlobalColormap;
@@ -22,22 +22,22 @@ index 7bdb3d1..c2b9746 100644
/* The hash table used by the decompressor */
static int Prefix[4096];
-@@ -145,7 +146,8 @@ int LoadGIF(fname, pinfo)
+@@ -148,7 +149,8 @@ int LoadGIF(fname, pinfo)
+ if (!(dataptr = RawGIF = (byte *) calloc((size_t) filesize+256, (size_t) 1)))
+ FatalError("LoadGIF: not enough memory to read GIF file");
- /* the +256's are so we can read truncated GIF files without fear of
- segmentation violation */
-- if (!(dataptr = RawGIF = (byte *) calloc((size_t) filesize+256, (size_t) 1)))
+- if (!(Raster = (byte *) calloc((size_t) filesize+256,(size_t) 1)))
+ rasterSize = filesize+256;
+ if (!(Raster = (byte *) calloc(rasterSize, (size_t) 1)))
FatalError("LoadGIF: not enough memory to read GIF file");
- if (!(Raster = (byte *) calloc((size_t) filesize+256,(size_t) 1)))
+ if (fread(dataptr, (size_t) filesize, (size_t) 1, fp) != 1)
@@ -796,6 +798,8 @@ static int readCode()
int RawCode, ByteOffset;
ByteOffset = BitOffset / 8;
+ if (ByteOffset >= rasterSize-2)
-+ return 0;
++ return 0;
RawCode = Raster[ByteOffset] + (Raster[ByteOffset + 1] << 8);
if (CodeSize >= 8)
RawCode += ( ((int) Raster[ByteOffset + 2]) << 16);
diff --git a/xv.spec b/xv.spec
index c3277db..7b16509 100644
--- a/xv.spec
+++ b/xv.spec
@@ -3,7 +3,7 @@
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 40%{?dist}
+Release: 41%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -308,6 +308,9 @@ done
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Thu Mar 3 2022 Paul Howarth <paul(a)city-fan.org> - 3.10a.jumbopatch.20070520-41
+- Fix incorrectly applied corrupt GIF patch
+
* Mon Feb 28 2022 Paul Howarth <paul(a)city-fan.org> - 3.10a.jumbopatch.20070520-40
- Ignore multiple APP1 data structs; libjpeg can't write them
- Fix segfault seen with some corrupt GIF file
2 years, 8 months
[ffmpeg] Rebuild
by Leigh Scott
commit 4e10f514aa33a94c2e4938d45031d592ea02e65f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Mar 3 13:06:54 2022 +0000
Rebuild
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 363aefc..a1d6cd3 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -138,7 +138,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.0
-Release: 4%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 5%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -505,6 +505,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Thu Mar 03 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.0-5
+- Rebuild
+
* Sat Feb 26 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.0-4
- Drop patch for chrome
2 years, 8 months
[olive/f36] (2 commits) ...Update changelog
by Nicolas Chauvet
Summary of changes:
6fb0db2... fixup excludearch (*)
0799e75... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[olive] Update changelog
by Nicolas Chauvet
commit 0799e75248888ee259daf311b1ae003893f15bd1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Mar 3 08:49:52 2022 +0100
Update changelog
olive.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/olive.spec b/olive.spec
index 7b112ad..ff891cb 100644
--- a/olive.spec
+++ b/olive.spec
@@ -14,9 +14,9 @@
Name: olive
Version: 0.1.2
%if 0%{?usesnapshot}
-Release: 0.5.%{gitdate}git%{shortcommit0}%{?dist}
+Release: 0.6.%{gitdate}git%{shortcommit0}%{?dist}
%else
-Release: 9%{?dist}
+Release: 10%{?dist}
%endif
Summary: A free non-linear video editor
License: GPLv3+
@@ -102,6 +102,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{unique_name
#%%{_datadir}/%%{name}-editor
%changelog
+* Thu Mar 03 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.2-0.6.20220228git41a49c4
+- Rebuilt
+
* Wed Mar 02 2022 Sérgio Basto <sergio(a)serjux.com> - 0.1.2-0.5.20220228git41a49c4
- New snapshot, ffmpeg 5 compatible
2 years, 8 months
[olive] fixup excludearch
by Nicolas Chauvet
commit 6fb0db2ce48e1bd7f49554770031d26158542a4a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Mar 3 08:48:55 2022 +0100
fixup excludearch
olive.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/olive.spec b/olive.spec
index 5877e3e..7b112ad 100644
--- a/olive.spec
+++ b/olive.spec
@@ -48,7 +48,7 @@ BuildRequires: portaudio-devel
Requires: hicolor-icon-theme
# ext/sse2neon.h:106:2: error: #error "You must enable NEON instructions (e.g. -mfpu=neon) to use SSE2NEON."
-ExcludeArch: %{arm}
+ExcludeArch: armv7hl
%description
%{name} is a free non-linear video editor aiming to provide a fully-featured
2 years, 8 months
[olive/f36] ExcludeArch: %{arm}
by Sérgio M. Basto
Summary of changes:
93eacba... ExcludeArch: %{arm} (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[olive] ExcludeArch: %{arm}
by Sérgio M. Basto
commit 93eacba5b8d8a79582a5dcf5813664ca7391e935
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Mar 2 20:51:31 2022 +0000
ExcludeArch: %{arm}
ext/sse2neon.h:106:2: error: #error "You must enable NEON instructions (e.g. -mfpu=neon) to use SSE2NEON."
olive.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/olive.spec b/olive.spec
index d3ba16f..5877e3e 100644
--- a/olive.spec
+++ b/olive.spec
@@ -47,6 +47,9 @@ BuildRequires: ilmbase-devel
BuildRequires: portaudio-devel
Requires: hicolor-icon-theme
+# ext/sse2neon.h:106:2: error: #error "You must enable NEON instructions (e.g. -mfpu=neon) to use SSE2NEON."
+ExcludeArch: %{arm}
+
%description
%{name} is a free non-linear video editor aiming to provide a fully-featured
alternative to high-end professional video editing software.
2 years, 8 months
