From af79fa0d3f10d915d716d3064ed4a9baeb35b9bd749f22b4b153495be387ea61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Dec 2019 12:30:11 +0000 Subject: [PATCH] Accepting request 755214 from home:alois:branches:multimedia:libs update to 2.4.0 (2nd attempt) OBS-URL: https://build.opensuse.org/request/show/755214 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=27 --- ftgl-2.1.3-rc5.tar.bz2 | 3 --- ftgl-2.4.0.tar.gz | 3 +++ ftgl-autoreconf.patch | 21 ------------------ ftgl.changes | 43 ++++++++++++++++++++++++++++++++++++ ftgl.spec | 21 ++++++++++++------ install-FTVectoriser.h.patch | 22 +++++++++--------- 6 files changed, 71 insertions(+), 42 deletions(-) delete mode 100644 ftgl-2.1.3-rc5.tar.bz2 create mode 100644 ftgl-2.4.0.tar.gz delete mode 100644 ftgl-autoreconf.patch diff --git a/ftgl-2.1.3-rc5.tar.bz2 b/ftgl-2.1.3-rc5.tar.bz2 deleted file mode 100644 index 1eb4b9c..0000000 --- a/ftgl-2.1.3-rc5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59 -size 707854 diff --git a/ftgl-2.4.0.tar.gz b/ftgl-2.4.0.tar.gz new file mode 100644 index 0000000..5d9ad69 --- /dev/null +++ b/ftgl-2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa97da1c3442a8fd3941037655df18016d70b5266381c81d81e8b5335f196ea8 +size 630803 diff --git a/ftgl-autoreconf.patch b/ftgl-autoreconf.patch deleted file mode 100644 index 7b12d28..0000000 --- a/ftgl-autoreconf.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.am -+++ Makefile.am -@@ -26,13 +26,13 @@ - - # Print out an informative summary. - all-local: -- @$(ECHO) "Done." -- @$(ECHO) -+ @echo "Done." -+ @echo - @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ -- $(ECHO) "---" ;\ -- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ -+ echo "---" ;\ -+ echo "Run 'make install' to begin installation into $(prefix)" ;\ - fi -- @$(ECHO) -+ @echo - - # Upload documentation - DOC = docs/html docs/latex/ftgl.pdf diff --git a/ftgl.changes b/ftgl.changes index 0a807bb..61983d1 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sat Oct 26 17:51:03 UTC 2019 - Luigi Baldoni + +- Update to version 2.4.0 + * New setting LegacyOpenGLState(), see README-LegacyOpenGLState + * Fix/silence compiler warnings + version 2.3.1: + * Updates to debian/ build files + version 2.3.0: + * Fix a memory leak + * FTContour: avoid NaN for angles close to 180 degrees + (see Debian bug #589601, 5.) + * FTBufferGlyph: fix garbage with bitmap fonts + (text is still clipped, that seems to be another problem) + * FTTextureGlyphImpl: fix garbage with bitmap fonts + (see Debian bug #589601, 4.) + * FTPixmapGlyph: fix garbage with bitmap fonts + (see Debian bug #589601, 2.) + * FTOutlineGlyphImpl, FTPolygonGlyphImpl: avoid uninizitalized + vectoriser in case of error (see Debian bug #589601, 1.) + * Various other bugfixes collected through the years + version 2.2.0: + * Stable API. Public headers are now frozen. + * Fixed several memory corruption and crash bugs - Sam Hocevar + * Fixed several memory leaks - Sam Hocevar + * Kerning and glyph performance enhancements - Sean Morrison + * The library now also exports a pure C interface - Éric Beets + * Inset/outset contour support for fonts - Éric Beets + * Fix the FTLayout rendering - Éric Beets + * Added new FTLayout and FTSimpleLayout support for layout + managers - Sam Hocevar + * Fixed the paths in the XCode project - Henry Maddocks + * Changed the behaviour of some objects so that if there is an + error their state isn't changed - Henry Maddocks + * New, fast FTBufferFont texture fonts - Sam Hocevar + * UTF-8 support - Daniel Remenak + +- Switch to maintained fork + +- Dropped ftgl-autoreconf.patch (merged upstream) + +- Refreshed install-FTVectoriser.h.patch + ------------------------------------------------------------------- Fri Mar 8 16:41:52 UTC 2019 - olaf@aepfle.de diff --git a/ftgl.spec b/ftgl.spec index d76c908..2422f97 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define libname libftgl2 %bcond_without ftgl_html Name: ftgl -Version: 2.1.3~rc5 +Version: 2.4.0 Release: 0 Summary: Library for Using Arbitrary Fonts in OpenGL Applications License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://ftgl.wiki.sourceforge.net/ -Source0: http://sourceforge.net/projects/ftgl/files/FTGL%%20Source/2.1.3%%7Erc5/%{name}-2.1.3-rc5.tar.bz2 +# was http://ftgl.wiki.sourceforge.net +URL: https://github.com/frankheckenbach/ftgl +Source0: https://github.com/frankheckenbach/ftgl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf -Patch0: %{name}-autoreconf.patch Patch1: ftgl-pkgconfig.patch Patch2: ftgl-fix-no-add-needed.patch # PATCH-FIX-OPENSUSE: install FTVectoriser.h, required by tulip-5.0; kkaempf@suse.de @@ -39,7 +39,11 @@ BuildRequires: texlive-epstopdf BuildRequires: autoconf BuildRequires: automake BuildRequires: freeglut-devel +%if 0%{?suse_version} >= 1500 BuildRequires: gcc-c++ +%else +BuildRequires: gcc7-c++ +%endif BuildRequires: ghostscript BuildRequires: libtool BuildRequires: pkgconfig @@ -90,12 +94,15 @@ This package provides demo application showing usage of the library. %prep %setup -q -%patch0 %patch1 %patch2 %patch3 -p1 %build +export CC=gcc +export CXX=g++ +test -x "$(type -p gcc-7)" && export CC=gcc-7 +test -x "$(type -p g++-7)" && export CXX=g++-7 autoreconf -fvi %configure \ --disable-static diff --git a/install-FTVectoriser.h.patch b/install-FTVectoriser.h.patch index cbf4445..4056cbc 100644 --- a/install-FTVectoriser.h.patch +++ b/install-FTVectoriser.h.patch @@ -1,15 +1,15 @@ -diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ftgl-2.1.3~rc5/src/Makefile.am ./src/Makefile.am ---- ../orig-ftgl-2.1.3~rc5/src/Makefile.am 2008-05-23 09:13:42.000000000 +0200 -+++ ./src/Makefile.am 2017-06-28 15:13:01.803157035 +0200 -@@ -39,6 +39,11 @@ - ftgl_HEADERS = $(ftgl_headers) - - ftgl_headers = \ +Index: ftgl-2.4.0/src/Makefile.am +=================================================================== +--- ftgl-2.4.0.orig/src/Makefile.am ++++ ftgl-2.4.0/src/Makefile.am +@@ -72,6 +72,10 @@ ftgl_headers = \ + FTGL/FTSimpleLayout.h \ + FTGL/FTTriangleExtractorGlyph.h \ + FTGL/FTGLTriangleExtractorFont.h \ + FTVectoriser.h \ + FTContour.h \ -+ FTLibrary.h \ + FTList.h \ + FTVector.h \ - FTGL/ftgl.h \ - FTGL/FTBBox.h \ - FTGL/FTBuffer.h \ + ${NULL} + + ftglyph_sources = \