From f58fab30265cb14bd65fe350e795e6c34303153be38d48084698f9b157608762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 12 Jul 2017 06:26:39 +0000 Subject: [PATCH 1/3] Accepting request 506817 from home:kwk:branches:multimedia:libs - add install-FTVectoriser.h.patch install FTVectoriser.h, required by tulip-5.0 - fix documentation build (add texlive-epstopdf and ghostscript to BuildRequires) OBS-URL: https://build.opensuse.org/request/show/506817 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=17 --- ftgl.changes | 9 +++++++++ ftgl.spec | 9 +++++++-- install-FTVectoriser.h.patch | 11 +++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 install-FTVectoriser.h.patch diff --git a/ftgl.changes b/ftgl.changes index f0bbdaf..7acafa5 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 28 13:15:29 UTC 2017 - kkaempf@suse.com + +- add install-FTVectoriser.h.patch + install FTVectoriser.h, required by tulip-5.0 + +- fix documentation build + (add texlive-epstopdf and ghostscript to BuildRequires) + ------------------------------------------------------------------- Tue Apr 14 11:47:21 CEST 2015 - tiwai@suse.de diff --git a/ftgl.spec b/ftgl.spec index 2f4ba48..2a6a5de 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,13 +28,17 @@ 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 +Patch3: install-FTVectoriser.h.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: gcc-c++ +BuildRequires: ghostscript BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: texlive-epstopdf BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(ice) @@ -136,8 +140,8 @@ robustness, and simplicity. %package demo Summary: Library for Using Arbitrary Fonts in OpenGL Applications -Group: System/Libraries # Up to openSUSE 11.0 and SLED 10, %%{_bindir}/FTGLDemo was part of ftgl-devel: +Group: System/Libraries Conflicts: %{name}-devel <= 2.1.2 %description demo @@ -173,6 +177,7 @@ The supported rendering modes are: %patch0 %patch1 %patch2 +%patch3 -p1 %build ./autogen.sh diff --git a/install-FTVectoriser.h.patch b/install-FTVectoriser.h.patch new file mode 100644 index 0000000..4503cd4 --- /dev/null +++ b/install-FTVectoriser.h.patch @@ -0,0 +1,11 @@ +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,7 @@ + ftgl_HEADERS = $(ftgl_headers) + + ftgl_headers = \ ++ FTVectoriser.h \ + FTGL/ftgl.h \ + FTGL/FTBBox.h \ + FTGL/FTBuffer.h \ From faebd91d62345849012cb850cc2dffa994e36c6325ea47a7002d2793bbf928c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 12 Jul 2017 06:43:08 +0000 Subject: [PATCH 2/3] - Trim a bit description and fix group for demo OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=18 --- ftgl.changes | 5 ++ ftgl.spec | 134 +++++++++------------------------------------------ 2 files changed, 29 insertions(+), 110 deletions(-) diff --git a/ftgl.changes b/ftgl.changes index 7acafa5..6efd8ae 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 12 06:42:35 UTC 2017 - tchvatal@suse.com + +- Trim a bit description and fix group for demo + ------------------------------------------------------------------- Wed Jun 28 13:15:29 UTC 2017 - kkaempf@suse.com diff --git a/ftgl.spec b/ftgl.spec index 2a6a5de..6da967f 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -16,6 +16,7 @@ # +%define libname libftgl2 Name: ftgl Version: 2.1.3~rc5 Release: 0 @@ -37,78 +38,32 @@ BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: ghostscript BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: texlive-epstopdf BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(x11) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -FTGL is a free open source library that enables developers to use -arbitrary fonts in their OpenGL (www.opengl.org) applications. - -Unlike other OpenGL font libraries, FTGL uses standard font file -formats, so there is no need of a preprocessing step to convert the -high quality font data into a lesser quality, proprietary format. - -FTGL uses the Freetype (www.freetype.org) font library to open and -'decode' the fonts. It then takes that output and stores it in a format -that is most efficient for OpenGL rendering. - -The supported rendering modes are: - -- Bit maps - -- Antialiased Pix maps - -- Outlines - -- Polygon meshes - -- Extruded polygon meshes - -- Texture maps - -- Buffer maps +FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to +simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, +pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering +modes. %package -n libftgl2 Summary: Library for Using Arbitrary Fonts in OpenGL Applications Group: System/Libraries -Provides: ftgl:%{_libdir}/libftgl.so.0 %description -n libftgl2 -FTGL is a free open source library that enables developers to use -arbitrary fonts in their OpenGL (www.opengl.org) applications. - -Unlike other OpenGL font libraries, FTGL uses standard font file -formats, so there is no need of a preprocessing step to convert the -high quality font data into a lesser quality, proprietary format. - -FTGL uses the Freetype (www.freetype.org) font library to open and -'decode' the fonts. It then takes that output and stores it in a format -that is most efficient for OpenGL rendering. - -The supported rendering modes are: - -- Bit maps - -- Antialiased Pix maps - -- Outlines - -- Polygon meshes - -- Extruded polygon meshes - -- Texture maps - -- Buffer maps +FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to +simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, +pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering +modes. %package devel -Summary: Library for Using Arbitrary Fonts in OpenGL Applications +Summary: Development files for FTGL OpenGL font managing library Group: Development/Libraries/C and C++ Requires: Mesa-devel Requires: freetype2-devel @@ -116,61 +71,25 @@ Requires: libftgl2 = %{version} Requires: pkgconfig(glu) %description devel -FTGL is a free open source library that enables developers to use - arbitrary fonts in their OpenGL (www.opengl.org) applications. - Unlike other OpenGL font libraries, FTGL uses standard font file - formats, so there is no need of a preprocessing step to convert - the high quality font data into a lesser quality, proprietary - format. FTGL uses the Freetype (www.freetype.org) font library to - open and 'decode' the fonts. It then takes that output and stores - it in a format that is most efficient for OpenGL rendering. The - supported rendering modes are: - Bit maps +FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to +simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, +pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering +modes. -- Antialiased Pix maps - -- Texture maps - -- Outlines - -- Polygon meshes - -- Extruded polygon meshes FTGL is designed to be used in commercial -quality software. It has been written with a focus on performance, -robustness, and simplicity. +This package provides development files. %package demo -Summary: Library for Using Arbitrary Fonts in OpenGL Applications -# Up to openSUSE 11.0 and SLED 10, %%{_bindir}/FTGLDemo was part of ftgl-devel: -Group: System/Libraries +Summary: Demos for FTGL OpenGL font managing library +Group: Development/Tools/Other Conflicts: %{name}-devel <= 2.1.2 %description demo -FTGL is a free open source library that enables developers to use -arbitrary fonts in their OpenGL (www.opengl.org) applications. +FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to +simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, +pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering +modes. -Unlike other OpenGL font libraries, FTGL uses standard font file -formats, so there is no need of a preprocessing step to convert the -high quality font data into a lesser quality, proprietary format. - -FTGL uses the Freetype (www.freetype.org) font library to open and -'decode' the fonts. It then takes that output and stores it in a format -that is most efficient for OpenGL rendering. - -The supported rendering modes are: - -- Bit maps - -- Antialiased Pix maps - -- Outlines - -- Polygon meshes - -- Extruded polygon meshes - -- Texture maps - -- Buffer maps +This package provides demo application showing usage of the library. %prep %setup -q @@ -180,7 +99,7 @@ The supported rendering modes are: %patch3 -p1 %build -./autogen.sh +autoreconf -fvi %configure \ --with-pic \ --disable-static @@ -200,20 +119,16 @@ mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-demo cp -pr *.cpp *.c *.h %{buildroot}%{_defaultdocdir}/%{name}-demo cd .. find %{buildroot} -type f -name "*.la" -delete -print -grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}' %post -n libftgl2 -p /sbin/ldconfig - %postun -n libftgl2 -p /sbin/ldconfig %files -n libftgl2 -%defattr (-, root, root) %doc %dir %{_defaultdocdir}/libftgl2 %doc %{_defaultdocdir}/libftgl2/[ABCNRT]* %{_libdir}/*.so.* %files devel -%defattr (-, root, root) %doc %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/html %doc %{_defaultdocdir}/%{name}/*.txt @@ -222,7 +137,6 @@ grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}' %{_libdir}/pkgconfig/*.pc %files demo -%defattr (-, root, root) %doc %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}-demo %{_bindir}/FTGLDemo From 6cb1a6f3d494698fcce8ffbd30e800f96c58ca41092ec01c39a93eb8996c4285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 12 Jul 2017 18:19:31 +0000 Subject: [PATCH 3/3] Accepting request 509741 from home:jengelh:branches:multimedia:libs - Remove --with-pic which is only for static libs. - RPM group fix. - Trim redundant wording from description. OBS-URL: https://build.opensuse.org/request/show/509741 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ftgl?expand=0&rev=19 --- ftgl.changes | 7 +++++++ ftgl.spec | 33 ++++++++++++++------------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/ftgl.changes b/ftgl.changes index 6efd8ae..55a83ff 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 12 11:11:59 UTC 2017 - jengelh@inai.de + +- Remove --with-pic which is only for static libs. +- RPM group fix. +- Trim redundant wording from description. + ------------------------------------------------------------------- Wed Jul 12 06:42:35 UTC 2017 - tchvatal@suse.com diff --git a/ftgl.spec b/ftgl.spec index 6da967f..f156934 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -22,7 +22,7 @@ Version: 2.1.3~rc5 Release: 0 Summary: Library for Using Arbitrary Fonts in OpenGL Applications License: LGPL-2.1+ -Group: System/Libraries +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 Source1: baselibs.conf @@ -47,23 +47,21 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(x11) %description -FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to -simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, -pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering -modes. +FTGL is a C++ library using Freetype2 to render fonts in OpenGL +applications. FTGL supports bitmaps, pixmaps, texture maps, outlines, +polygon mesh, and extruded polygon rendering modes. %package -n libftgl2 Summary: Library for Using Arbitrary Fonts in OpenGL Applications Group: System/Libraries %description -n libftgl2 -FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to -simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, -pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering -modes. +FTGL is a C++ library using Freetype2 to render fonts in OpenGL +applications. FTGL supports bitmaps, pixmaps, texture maps, outlines, +polygon mesh, and extruded polygon rendering modes. %package devel -Summary: Development files for FTGL OpenGL font managing library +Summary: Development files for the FTGL OpenGL font managing library Group: Development/Libraries/C and C++ Requires: Mesa-devel Requires: freetype2-devel @@ -71,10 +69,9 @@ Requires: libftgl2 = %{version} Requires: pkgconfig(glu) %description devel -FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to -simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, -pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering -modes. +FTGL is a C++ library using Freetype2 to render fonts in OpenGL +applications. FTGL supports bitmaps, pixmaps, texture maps, outlines, +polygon mesh, and extruded polygon rendering modes. This package provides development files. @@ -84,10 +81,9 @@ Group: Development/Tools/Other Conflicts: %{name}-devel <= 2.1.2 %description demo -FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to -simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, -pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering -modes. +FTGL is a C++ library using Freetype2 to render fonts in OpenGL +applications. FTGL supports bitmaps, pixmaps, texture maps, outlines, +polygon mesh, and extruded polygon rendering modes. This package provides demo application showing usage of the library. @@ -101,7 +97,6 @@ This package provides demo application showing usage of the library. %build autoreconf -fvi %configure \ - --with-pic \ --disable-static make %{?_smp_mflags} documentationdir=%{_docdir}/%{name}