[gstreamer1-libav/el7] * Fri Aug 29 2014 Hans de Goede <j.w.r.degoede@gmail.com> - 1.4.1-1 - Update to 1.4.1 (rf#3343) - In
by Leigh Scott
commit 2d388f5508b5f2a1a1f01652bcb7a34a62e14e2e
Author: Hans de Goede <j.w.r.degoede(a)gmail.com>
Date: Sat Aug 30 11:04:46 2014 +0000
* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.1-1
- Update to 1.4.1 (rf#3343)
- Includes libav 10.4
.gitignore | 3 +--
gstreamer1-libav.spec | 37 ++++++++++++++++++++++++++++++-------
sources | 3 +--
3 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0752513..d696f38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-gst-libav-1.2.4.tar.xz
-libav-9.13.tar.xz
+gst-libav-1.4.1.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 4af19ed..c4ea0da 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,5 +1,5 @@
Name: gstreamer1-libav
-Version: 1.2.4
+Version: 1.4.1
Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
@@ -7,10 +7,10 @@ License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-9.13.tar.xz
+# Source1: http://libav.org/releases/libav-9.13.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
-BuildRequires: gstreamer1-devel >= 1.0.0
-BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
+BuildRequires: gstreamer1-devel >= 1.4.0
+BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0
BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel
%ifarch %{ix86} x86_64
BuildRequires: yasm
@@ -27,10 +27,25 @@ plugins.
This package provides libav-based GStreamer plug-ins.
+%package devel-docs
+Summary: Development documentation for the libav GStreamer plug-in
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description devel-docs
+GStreamer is a streaming media framework, based on graphs of elements which
+operate on media data.
+
+This package contains the development documentation for the libav GStreamer
+plug-in.
+
+
%prep
-%setup -q -n gst-libav-%{version} -a 1
-rm -r gst-libs/ext/libav
-mv libav-9.13 gst-libs/ext/libav
+%setup -q -n gst-libav-%{version}
+# -a 1
+#rm -r gst-libs/ext/libav
+#mv libav-9.13 gst-libs/ext/libav
%patch0 -p1
@@ -51,8 +66,16 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO
%{_libdir}/gstreamer-1.0/libgstlibav.so
+%files devel-docs
+# Take the dir and everything below it for proper dir ownership
+%doc %{_datadir}/gtk-doc
+
%changelog
+* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.1-1
+- Update to 1.4.1 (rf#3343)
+- Includes libav 10.4
+
* Sun Jun 15 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-1
- Update to 1.2.4 (rf#3269)
- Update libav to 9.13
diff --git a/sources b/sources
index 1d14849..2e45ed2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz
-23b9e34bffdaee366710fdf20157a570 libav-9.13.tar.xz
+ea2d636c24d7c5ae123967ef22e37c07 gst-libav-1.4.1.tar.xz
5 years, 8 months
[gstreamer1-libav/el7] Revert "* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede@gmail.com> - 1.2.4-2"
by Leigh Scott
commit fb4edab1b1ac69ca636700d4e17e858086ff2577
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 4 15:42:25 2018 +0100
Revert "* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-2"
This reverts commit 6c0a3ba5f975acfb3f589681b3d4992a5bb551cd.
.gitignore | 2 +-
gstreamer1-libav.spec | 9 +++------
sources | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7267f7c..0752513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
gst-libav-1.2.4.tar.xz
-libav-9.16.tar.xz
+libav-9.13.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 72b80e0..4af19ed 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,13 +1,13 @@
Name: gstreamer1-libav
Version: 1.2.4
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-9.16.tar.xz
+Source1: http://libav.org/releases/libav-9.13.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer1-devel >= 1.0.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
@@ -30,7 +30,7 @@ This package provides libav-based GStreamer plug-ins.
%prep
%setup -q -n gst-libav-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-9.16 gst-libs/ext/libav
+mv libav-9.13 gst-libs/ext/libav
%patch0 -p1
@@ -53,9 +53,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
-* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-2
-- Update libav to 9.16
-
* Sun Jun 15 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-1
- Update to 1.2.4 (rf#3269)
- Update libav to 9.13
diff --git a/sources b/sources
index c256b95..1d14849 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz
-7b44b75cec24b8e7545e5029e76917e0 libav-9.16.tar.xz
+23b9e34bffdaee366710fdf20157a570 libav-9.13.tar.xz
5 years, 8 months
[gstreamer1-libav/el7] Revert "* Wed Oct 1 2014 Hans de Goede <j.w.r.degoede@gmail.com> - 1.2.4-3"
by Leigh Scott
commit 4d8887d1355a40da9980a6837c2f5b01163249fa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 4 15:42:03 2018 +0100
Revert "* Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-3"
This reverts commit 8958010d7283cbb86cdd069592e10aae9bff6f39.
.gitignore | 2 +-
gstreamer1-libav.spec | 9 +++------
sources | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0a361c4..7267f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
gst-libav-1.2.4.tar.xz
-libav-9.17.tar.xz
+libav-9.16.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 17e7dbf..72b80e0 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,13 +1,13 @@
Name: gstreamer1-libav
Version: 1.2.4
-Release: 3%{?dist}
+Release: 2%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-9.17.tar.xz
+Source1: http://libav.org/releases/libav-9.16.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer1-devel >= 1.0.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
@@ -30,7 +30,7 @@ This package provides libav-based GStreamer plug-ins.
%prep
%setup -q -n gst-libav-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-9.17 gst-libs/ext/libav
+mv libav-9.16 gst-libs/ext/libav
%patch0 -p1
@@ -53,9 +53,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
-* Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-3
-- Update libav to 9.17
-
* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-2
- Update libav to 9.16
diff --git a/sources b/sources
index 0f3d3bf..c256b95 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz
-697ce3faef1d9813bc1e7384b1089001 libav-9.17.tar.xz
+7b44b75cec24b8e7545e5029e76917e0 libav-9.16.tar.xz
5 years, 8 months
[gstreamer1-libav/el7] Revert "* Sat May 16 2015 Hans de Goede <j.w.r.degoede@gmail.com> - 1.2.4-4"
by Leigh Scott
commit e5b08bb43e99424fa34b9000980abc1e8c5512be
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 4 15:41:28 2018 +0100
Revert "* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-4"
This reverts commit 8aae29bbb7ee1483e7a1e476555238aa7e173648.
.gitignore | 2 +-
gstreamer1-libav.spec | 9 +++------
sources | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55e198f..0a361c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
gst-libav-1.2.4.tar.xz
-libav-9.18.tar.xz
+libav-9.17.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 4cf753e..17e7dbf 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,13 +1,13 @@
Name: gstreamer1-libav
Version: 1.2.4
-Release: 4%{?dist}
+Release: 3%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-9.18.tar.xz
+Source1: http://libav.org/releases/libav-9.17.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer1-devel >= 1.0.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
@@ -30,7 +30,7 @@ This package provides libav-based GStreamer plug-ins.
%prep
%setup -q -n gst-libav-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-9.18 gst-libs/ext/libav
+mv libav-9.17 gst-libs/ext/libav
%patch0 -p1
@@ -53,9 +53,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
-* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-4
-- Update libav to 9.18
-
* Wed Oct 1 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-3
- Update libav to 9.17
diff --git a/sources b/sources
index 73ffe85..0f3d3bf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz
-75e838068a75fb88e1b4ea0546bc16f0 libav-9.18.tar.xz
+697ce3faef1d9813bc1e7384b1089001 libav-9.17.tar.xz
5 years, 8 months
[xine-lib] ImageMagick soname bump, 2nd try
by Xavier Bachelot
commit 3ca7dd5bc1a6265c569ec9085996ca6abb6361ab
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Sep 4 12:02:12 2018 +0200
ImageMagick soname bump, 2nd try
xine-lib.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 6c0a798..29760e3 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -12,7 +12,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.9
-Release: 10%{?dist}
+Release: 10%{?dist}.1
License: GPLv2+
URL: http://www.xine-project.org/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
@@ -300,7 +300,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%changelog
-* Wed Aug 29 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-10
+* Wed Aug 29 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-10.1
- Rebuilt for ImageMagick soname bump.
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.9-9
5 years, 8 months
[freetype-freeworld/f28] Revert "Update to 2.9.1 to sync with Fedora (rhbz #1575687)"
by Leigh Scott
commit 5262807c8201a2f65703ae9e464ebb81b4f0c0a2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 4 07:00:30 2018 +0100
Revert "Update to 2.9.1 to sync with Fedora (rhbz #1575687)"
This reverts commit 550961fe92a37430acca749577b87f613505ea48.
freetype-2.2.1-enable-valid.patch | 12 ++---
freetype-2.3.0-enable-spr.patch | 10 ++--
freetype-2.9-ftsmooth.patch | 101 --------------------------------------
freetype-freeworld.spec | 45 ++++++++++-------
4 files changed, 37 insertions(+), 131 deletions(-)
---
diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch
index 4f595a6..21d80da 100644
--- a/freetype-2.2.1-enable-valid.patch
+++ b/freetype-2.2.1-enable-valid.patch
@@ -1,7 +1,7 @@
---- ./modules.cfg.orig 2018-04-22 10:41:36.000000000 +0100
-+++ ./modules.cfg 2018-09-03 23:20:13.727027428 +0100
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
+--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
+@@ -110,7 +110,7 @@
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
@@ -9,8 +9,8 @@
# Support for streams compressed with gzip (files with suffix .gz).
#
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
- # OpenType table validation. Needs `ftotval.c' below.
+@@ -124,7 +124,7 @@
+ # OpenType table validation. Needs ftotval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch
index 8712fd8..8432e28 100644
--- a/freetype-2.3.0-enable-spr.patch
+++ b/freetype-2.3.0-enable-spr.patch
@@ -1,8 +1,8 @@
---- ./include/freetype/config/ftoption.h.orig 2018-04-22 10:41:36.000000000 +0100
-+++ ./include/freetype/config/ftoption.h 2018-09-03 23:16:41.840579577 +0100
-@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
- /* rendering technology that produces excellent output without LCD */
- /* filtering. */
+--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
++++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
+@@ -92,7 +92,7 @@
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
/* */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 12346a5..2f3673c 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
-Version: 2.9.1
-Release: 1%{?dist}
+Version: 2.8
+Release: 8%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -11,13 +11,25 @@ Patch0: freetype-2.3.0-enable-spr.patch
# Enable otvalid and gxvalid modules
Patch1: freetype-2.2.1-enable-valid.patch
-Patch5: freetype-2.9-ftsmooth.patch
+# Accept ISO646.1991-IRV as a Unicode charmap in PCF and BDF drivers
+# https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+Patch4: freetype-2.8-pcf-encoding.patch
+
+# Adjust loop counter maximum for TrueType fonts
+# https://bugzilla.redhat.com/show_bug.cgi?id=1456585
+Patch5: freetype-2.8-loop-counter.patch
+
+Patch6: 0077-truetype-Fix-loading-of-named-instances.patch
+Patch7: 0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
+
+## Security fixes:
+# CVE-2018-6942 NULL pointer dereference in the Ins_GETVARIATION() function
+Patch9: freetype-2.8-getvariation.patch
Provides: freetype-bytecode
Provides: freetype-subpixel
Requires: /etc/ld.so.conf.d
-BuildRequires: gcc
BuildRequires: libX11-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
@@ -48,7 +60,13 @@ It transparently overrides the system library using ld.so.conf.d.
%patch1 -p1 -b .enable-valid
-%patch5 -p1 -b .ftsmooth
+%patch4 -p1 -b .pcf-encoding
+%patch5 -p1 -b .loop-counter
+%patch6 -p1 -b .named-instances
+%patch7 -p1 -b .named-instances2
+
+# Security fixes:
+%patch9 -p1 -b .getvariation
%build
%configure --disable-static \
@@ -81,7 +99,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/%{name}" \
>%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%files
%{_libdir}/%{name}
@@ -90,19 +110,6 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
-* Mon Sep 03 2018 Sérgio Basto <sergio(a)serjux.com> - 2.9.1-1
-- Update to 2.9.1 to sync with Fedora (rhbz #1575687)
-- patch0 rebased
-- patch1 rebased
-- patch4 upstreamed
-- patch5 upstreamed
-- patch6 upstreamed but with diffrences
-- patch7 upstreamed
-- patch9 upstreamed
-- add BuildRequires: gcc
-- Switch to %%ldconfig_scriptlets
-- Add patch5 from Fedora
-
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 8 months
[freetype-freeworld/f28] Revert "delete old patches"
by Leigh Scott
commit ef9bdf6473e5ed6792707d14150c0b9c2b1f2433
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 4 07:00:03 2018 +0100
Revert "delete old patches"
This reverts commit cba583b308ac29f7961450d152e9fad94e5ab369.
0077-truetype-Fix-loading-of-named-instances.patch | 67 ++++++++++++++++++++++
...uetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch | 45 +++++++++++++++
freetype-2.7.1-protect-flex-handling.patch | 47 +++++++++++++++
freetype-2.7.1-safety-guard.patch | 36 ++++++++++++
freetype-2.8-getvariation.patch | 39 +++++++++++++
freetype-2.8-loop-counter.patch | 36 ++++++++++++
freetype-2.8-pcf-encoding.patch | 58 +++++++++++++++++++
7 files changed, 328 insertions(+)
---
diff --git a/0077-truetype-Fix-loading-of-named-instances.patch b/0077-truetype-Fix-loading-of-named-instances.patch
new file mode 100644
index 0000000..26fd0bc
--- /dev/null
+++ b/0077-truetype-Fix-loading-of-named-instances.patch
@@ -0,0 +1,67 @@
+From 55bbb98f5c5a89230127d6b998a6e23e634b5d0e Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad(a)behdad.org>
+Date: Tue, 1 Aug 2017 09:17:02 +0200
+Subject: [PATCH 077/132] [truetype] Fix loading of named instances.
+
+* src/truetype/ttgxvar.c (TT_Get_MM_Var): Preserve file position
+while loading the `avar' table.
+---
+ ChangeLog | 7 +++++++
+ include/freetype/ftmm.h | 2 +-
+ src/truetype/ttgxvar.c | 11 ++++++++++-
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
+index c41b80ea6..1f48a4945 100644
+--- a/include/freetype/ftmm.h
++++ b/include/freetype/ftmm.h
+@@ -178,7 +178,7 @@ FT_BEGIN_HEADER
+ /* strid :: The entry in `name' table identifying this instance. */
+ /* */
+ /* psid :: The entry in `name' table identifying a PostScript name */
+- /* for this instance. */
++ /* for this instance. Value 0 indicates a missing entry. */
+ /* */
+ typedef struct FT_Var_Named_Style_
+ {
+diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
+index 68458362e..df42b3bfd 100644
+--- a/src/truetype/ttgxvar.c
++++ b/src/truetype/ttgxvar.c
+@@ -2139,8 +2139,16 @@
+ goto Exit;
+
+ if ( fvar_head.instanceCount && !face->blend->avar_loaded )
++ {
++ FT_ULong offset = FT_STREAM_POS();
++
++
+ ft_var_load_avar( face );
+
++ if ( FT_STREAM_SEEK( offset ) )
++ goto Exit;
++ }
++
+ ns = mmvar->namedstyle;
+ nsc = face->blend->normalized_stylecoords;
+ for ( i = 0; i < fvar_head.instanceCount; i++, ns++ )
+@@ -2157,6 +2165,7 @@
+ for ( j = 0; j < fvar_head.axisCount; j++, c++ )
+ *c = FT_GET_LONG();
+
++ /* valid psid values are 6 and [256;32767] */
+ if ( usePsName )
+ ns->psid = FT_GET_USHORT();
+
+@@ -2174,7 +2183,7 @@
+ SFNT_Service sfnt = (SFNT_Service)face->sfnt;
+
+ FT_Int found, dummy1, dummy2;
+- FT_UInt strid = 0xFFFFFFFFUL;
++ FT_UInt strid = ~0U;
+
+
+ /* the default instance is missing in array the */
+--
+2.13.5
+
diff --git a/0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch b/0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
new file mode 100644
index 0000000..e492e58
--- /dev/null
+++ b/0079-src-truetype-ttgxvar.c-TT_Get_MM_Var-Fix-thinko.patch
@@ -0,0 +1,45 @@
+From 7e50824288fac5a36c2938fdb3e1c949ea53f982 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Tue, 1 Aug 2017 12:44:35 +0200
+Subject: [PATCH 079/132] * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix thinko.
+
+---
+ ChangeLog | 4 ++++
+ include/freetype/ftmm.h | 3 ++-
+ src/truetype/ttgxvar.c | 4 +++-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
+index 1f48a4945..b1bc1ed82 100644
+--- a/include/freetype/ftmm.h
++++ b/include/freetype/ftmm.h
+@@ -178,7 +178,8 @@ FT_BEGIN_HEADER
+ /* strid :: The entry in `name' table identifying this instance. */
+ /* */
+ /* psid :: The entry in `name' table identifying a PostScript name */
+- /* for this instance. Value 0 indicates a missing entry. */
++ /* for this instance. Value 0xFFFF indicates a missing */
++ /* entry. */
+ /* */
+ typedef struct FT_Var_Named_Style_
+ {
+diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
+index df42b3bfd..5a87df139 100644
+--- a/src/truetype/ttgxvar.c
++++ b/src/truetype/ttgxvar.c
+@@ -2165,9 +2165,11 @@
+ for ( j = 0; j < fvar_head.axisCount; j++, c++ )
+ *c = FT_GET_LONG();
+
+- /* valid psid values are 6 and [256;32767] */
++ /* valid psid values are 6, [256;32767], and 0xFFFF */
+ if ( usePsName )
+ ns->psid = FT_GET_USHORT();
++ else
++ ns->psid = 0xFFFF;
+
+ ft_var_to_normalized( face,
+ fvar_head.axisCount,
+--
+2.13.5
+
diff --git a/freetype-2.7.1-protect-flex-handling.patch b/freetype-2.7.1-protect-flex-handling.patch
new file mode 100644
index 0000000..01ff261
--- /dev/null
+++ b/freetype-2.7.1-protect-flex-handling.patch
@@ -0,0 +1,47 @@
+From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Fri, 24 Mar 2017 09:15:10 +0100
+Subject: [PATCH] [psaux] Better protect `flex' handling.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935
+
+* src/psaux/t1decode.c (t1_decoder_parse_charstrings)
+<callothersubr>: Since there is not a single flex operator but a
+series of subroutine calls, malformed fonts can call arbitrary other
+operators after the start of a flex, possibly adding points. For
+this reason we have to check the available number of points before
+inserting a point.
+---
+ ChangeLog | 15 +++++++++++++++
+ src/psaux/t1decode.c | 9 +++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465e..7dd45135 100644
+--- a/src/psaux/t1decode.c
++++ b/src/psaux/t1decode.c
+@@ -780,10 +780,19 @@
+ /* point without adding any point to the outline */
+ idx = decoder->num_flex_vectors++;
+ if ( idx > 0 && idx < 7 )
++ {
++ /* in malformed fonts it is possible to have other */
++ /* opcodes in the middle of a flex (which don't */
++ /* increase `num_flex_vectors'); we thus have to */
++ /* check whether we can add a point */
++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
++ goto Syntax_Error;
++
+ t1_builder_add_point( builder,
+ x,
+ y,
+ (FT_Byte)( idx == 3 || idx == 6 ) );
++ }
+ }
+ break;
+
+--
+2.12.2
+
diff --git a/freetype-2.7.1-safety-guard.patch b/freetype-2.7.1-safety-guard.patch
new file mode 100644
index 0000000..65ee149
--- /dev/null
+++ b/freetype-2.7.1-safety-guard.patch
@@ -0,0 +1,36 @@
+From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Sun, 26 Mar 2017 08:32:09 +0200
+Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety
+ guard.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
+---
+ ChangeLog | 8 ++++++++
+ src/psaux/psobjs.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821a..0baf8368 100644
+--- a/src/psaux/psobjs.c
++++ b/src/psaux/psobjs.c
+@@ -1718,6 +1718,14 @@
+ first = outline->n_contours <= 1
+ ? 0 : outline->contours[outline->n_contours - 2] + 1;
+
++ /* in malformed fonts it can happen that a contour was started */
++ /* but no points were added */
++ if ( outline->n_contours && first == outline->n_points )
++ {
++ outline->n_contours--;
++ return;
++ }
++
+ /* We must not include the last point in the path if it */
+ /* is located on the first point. */
+ if ( outline->n_points > 1 )
+--
+2.12.2
+
diff --git a/freetype-2.8-getvariation.patch b/freetype-2.8-getvariation.patch
new file mode 100644
index 0000000..7e0ecf9
--- /dev/null
+++ b/freetype-2.8-getvariation.patch
@@ -0,0 +1,39 @@
+From 29c759284e305ec428703c9a5831d0b1fc3497ef Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Sat, 27 Jan 2018 14:43:43 +0100
+Subject: [PATCH] * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL
+ reference.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736
+---
+ src/truetype/ttinterp.c | 12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
+index d855aaaa9..551f14a2e 100644
+--- a/src/truetype/ttinterp.c
++++ b/src/truetype/ttinterp.c
+@@ -7470,8 +7470,16 @@
+ return;
+ }
+
+- for ( i = 0; i < num_axes; i++ )
+- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
++ if ( coords )
++ {
++ for ( i = 0; i < num_axes; i++ )
++ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
++ }
++ else
++ {
++ for ( i = 0; i < num_axes; i++ )
++ args[i] = 0;
++ }
+ }
+
+
+--
+2.14.3
+
diff --git a/freetype-2.8-loop-counter.patch b/freetype-2.8-loop-counter.patch
new file mode 100644
index 0000000..61e9052
--- /dev/null
+++ b/freetype-2.8-loop-counter.patch
@@ -0,0 +1,36 @@
+From 8d435c463d22f6de35015b244d6f9bb433beb7e6 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Thu, 1 Jun 2017 07:09:44 +0200
+Subject: [PATCH] * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter
+ again.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Marek Kašík <mkasik(a)redhat.com>.
+
+The problematic font that exceeds the old limit is Padauk-Bold,
+version 3.002, containing bytecode generated by a buggy version of
+ttfautohint.
+---
+ ChangeLog | 10 ++++++++++
+ src/truetype/ttinterp.c | 3 +--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
+index 0c48c256..775d1104 100644
+--- a/src/truetype/ttinterp.c
++++ b/src/truetype/ttinterp.c
+@@ -7649,8 +7649,7 @@
+ FT_MAX( 50,
+ exc->cvtSize / 10 );
+ else
+- exc->loopcall_counter_max = FT_MAX( 100,
+- 10 * exc->cvtSize );
++ exc->loopcall_counter_max = 300 + 8 * exc->cvtSize;
+
+ /* as a protection against an unreasonable number of CVT entries */
+ /* we assume at most 100 control values per glyph for the counter */
+--
+2.13.0
+
diff --git a/freetype-2.8-pcf-encoding.patch b/freetype-2.8-pcf-encoding.patch
new file mode 100644
index 0000000..fd1c706
--- /dev/null
+++ b/freetype-2.8-pcf-encoding.patch
@@ -0,0 +1,58 @@
+From 082f2faf5007812bac6a1f783c7dcc6f49d761fe Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Wed, 24 May 2017 07:40:46 +0200
+Subject: [PATCH] [bdf, pcf] Support ISO646.1991-IRV character encoding (aka
+ ASCII).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Marek Kašík <mkasik(a)redhat.com>, cf.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1451795
+
+* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdrivr.c
+(PCF_Face_Init): Implement it.
+---
+ ChangeLog | 11 +++++++++++
+ src/bdf/bdfdrivr.c | 6 +++++-
+ src/pcf/pcfdrivr.c | 6 +++++-
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
+index a2242be0..c0a5a5c5 100644
+--- a/src/bdf/bdfdrivr.c
++++ b/src/bdf/bdfdrivr.c
+@@ -545,7 +545,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+
+ {
+diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
+index 9f4d36d1..50530941 100644
+--- a/src/pcf/pcfdrivr.c
++++ b/src/pcf/pcfdrivr.c
+@@ -387,7 +387,11 @@ THE SOFTWARE.
+ if ( !ft_strcmp( s, "10646" ) ||
+ ( !ft_strcmp( s, "8859" ) &&
+ !ft_strcmp( face->charset_encoding, "1" ) ) )
+- unicode_charmap = 1;
++ unicode_charmap = 1;
++ /* another name for ASCII */
++ else if ( !ft_strcmp( s, "646.1991" ) &&
++ !ft_strcmp( face->charset_encoding, "IRV" ) )
++ unicode_charmap = 1;
+ }
+ }
+
+--
+2.13.0
+
5 years, 8 months
[freetype-freeworld/f28] Revert "Uploaded sources"
by Leigh Scott
commit b4bc753dea93c9e28378c976d94424aa995fafc5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Sep 4 06:59:46 2018 +0100
Revert "Uploaded sources"
This reverts commit 60eaefa127c986bfbec59d51dc5361522419e227.
.gitignore | 1 -
sources | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 685f324..3db64b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ freetype-2.6.tar.bz2
/freetype-2.7.tar.bz2
/freetype-2.7.1.tar.bz2
/freetype-2.8.tar.bz2
-/freetype-2.9.1.tar.bz2
diff --git a/sources b/sources
index 552c003..0a15c28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60ef7d8160cd4bf8cb118ee9d65367ca freetype-2.9.1.tar.bz2
+2413ac3eaf508ada019c63959ea81a92 freetype-2.8.tar.bz2
5 years, 8 months
