diff --git a/ftgl-2.1.2-qualification.patch b/ftgl-2.1.2-qualification.patch deleted file mode 100644 index d87d45f..0000000 --- a/ftgl-2.1.2-qualification.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/FTTextureGlyph.h -+++ include/FTTextureGlyph.h -@@ -52,7 +52,7 @@ - * Reset the currently active texture to zero to get into a known state before - * drawing a string. This is to get round possible threading issues. - */ -- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;} -+ static void ResetActiveTexture(){ activeTextureID = 0;} - - private: - /** diff --git a/ftgl-2.1.2-same-variable-used-twice.patch b/ftgl-2.1.2-same-variable-used-twice.patch deleted file mode 100644 index 3c09a15..0000000 --- a/ftgl-2.1.2-same-variable-used-twice.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur FTGL.org/demo/FTGLDemo.cpp FTGL/demo/FTGLDemo.cpp ---- FTGL.org/demo/FTGLDemo.cpp 2007-01-22 15:22:39.592135000 +0100 -+++ FTGL/demo/FTGLDemo.cpp 2007-01-22 15:23:36.128546000 +0100 -@@ -406,7 +406,7 @@ - { - myString[carat] = key; - myString[carat + 1] = 0; -- carat = carat > 14 ? 14 : ++carat; -+ carat = carat > 14 ? 14 : carat + 1; - } - } - diff --git a/ftgl-2.1.2.tar.bz2 b/ftgl-2.1.2.tar.bz2 deleted file mode 100644 index 9598bce..0000000 --- a/ftgl-2.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7b02b756202ca851c86e6cc15aac65ec6f5fd3c2bc90c616f2785fac4e005c6 -size 483534 diff --git a/ftgl-2.1.3-rc5.tar.bz2 b/ftgl-2.1.3-rc5.tar.bz2 new file mode 100644 index 0000000..1eb4b9c --- /dev/null +++ b/ftgl-2.1.3-rc5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59 +size 707854 diff --git a/ftgl-freetype-include.patch b/ftgl-freetype-include.patch deleted file mode 100644 index 4b161ff..0000000 --- a/ftgl-freetype-include.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- unix/ftgl.pc.in -+++ unix/ftgl.pc.in -@@ -8,4 +8,4 @@ - Version: @PACKAGE_VERSION@ - Requires: - Libs: @GL_LIBS@ @FT2_LIBS@ -L${libdir} -lftgl --Cflags: -I${includedir} @GL_CFLAGS@ @FT2_CFLAGS@ -+Cflags: @GL_CFLAGS@ @FT2_CFLAGS@ -I${includedir} diff --git a/ftgl-shared.patch b/ftgl-shared.patch deleted file mode 100644 index 64e6da4..0000000 --- a/ftgl-shared.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- unix/configure.ac -+++ unix/configure.ac -@@ -4,7 +4,6 @@ - - FTGL_PROG_CXX - --AC_DISABLE_SHARED - AC_PROG_LIBTOOL - - # Checks for typedefs, structures, and compiler characteristics. diff --git a/ftgl.changes b/ftgl.changes index acbdfb2..7979503 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jul 15 18:28:03 CEST 2008 - sbrabec@suse.cz + +- Updated to version 2.1.3-rc5: + * Stable API. Public headers are now frozen. + * Fixed several memory corruption and crash bugs + * Fixed several memory leaks + * Kerning and glyph performance enhancements + * The library now also exports a pure C interface + * Inset/outset contour support for fonts + * Fix the FTLayout rendering + * Added new FTLayout and FTSimpleLayout support for layout + managers + * Fixed the paths in the XCode project + * Changed the behaviour of some objects so that if there is an + error their state isn't changed + * New, fast FTBufferFont texture fonts + * UTF-8 support + ------------------------------------------------------------------- Thu Sep 13 17:58:52 CEST 2007 - sbrabec@suse.cz diff --git a/ftgl.spec b/ftgl.spec index 7b50898..1344dfd 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # -# spec file for package ftgl (Version 2.1.2) +# spec file for package ftgl (Version 2.1.2.99.5) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,55 +10,124 @@ # norootforbuild + Name: ftgl BuildRequires: doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel -Version: 2.1.2 -Release: 89 -URL: http://homepages.paradise.net.nz/henryj/code/index.html#FTGL +Version: 2.1.2.99.5 +Release: 1 +%define _version 2.1.3-rc5 +%define __version 2.1.3~rc5 +Url: http://ftgl.wiki.sourceforge.net/ Group: System/Libraries -License: LGPL v2 or later +License: LGPL v2.1 or later Summary: Library for Using Arbitrary Fonts in OpenGL Applications -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}-qualification.patch -Patch1: %{name}-shared.patch -Patch2: ftgl-2.1.2-same-variable-used-twice.patch -Patch3: ftgl-freetype-include.patch -Autoreqprov: on +Source: %{name}-%{_version}.tar.bz2 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 +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 -- 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. +- Extruded polygon meshes + +- Texture maps + +- Buffer maps Authors: -------- Henry Maddocks + Jed Soane + Gérard Lanois + Matthias Kretz + Andrew Ellerton + Max Rheiner + Sébastien Barré + Marcelo E. Magallon + Robert Bell + Sam Hocevar + Éric Beets + Christopher Sean Morrison + Jeff Myers (JeffM2501) + Daniel Remenak -%package devel +%package -n libftgl2 +License: LGPL v2.1 or later Group: System/Libraries Summary: Library for Using Arbitrary Fonts in OpenGL Applications -Requires: %{name} = %{version} Mesa-devel freetype2-devel + +%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 + + + +Authors: +-------- + Henry Maddocks + Jed Soane + Gérard Lanois + Matthias Kretz + Andrew Ellerton + Max Rheiner + Sébastien Barré + Marcelo E. Magallon + Robert Bell + Sam Hocevar + Éric Beets + Christopher Sean Morrison + Jeff Myers (JeffM2501) + Daniel Remenak + +%package devel +License: LGPL v2.1 or later +Group: Development/Libraries/C and C++ +Summary: Library for Using Arbitrary Fonts in OpenGL Applications +Requires: libftgl2 = %{version} Mesa-devel freetype2-devel %description devel FTGL is a free open source library that enables developers to use @@ -88,77 +157,160 @@ robustness, and simplicity. Authors: -------- Henry Maddocks + Jed Soane + Gérard Lanois + Matthias Kretz + Andrew Ellerton + Max Rheiner + Sébastien Barré + Marcelo E. Magallon + Robert Bell + Sam Hocevar + Éric Beets + Christopher Sean Morrison + Jeff Myers (JeffM2501) + Daniel Remenak + +%package demo +License: LGPL v2.1 or later +Group: System/Libraries +Summary: Library for Using Arbitrary Fonts in OpenGL Applications +Requires: %{name} = %{version} + +%description demo +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 + + + +Authors: +-------- + Henry Maddocks + Jed Soane + Gérard Lanois + Matthias Kretz + Andrew Ellerton + Max Rheiner + Sébastien Barré + Marcelo E. Magallon + Robert Bell + Sam Hocevar + Éric Beets + Christopher Sean Morrison + Jeff Myers (JeffM2501) + Daniel Remenak %prep -%setup -n FTGL -%patch -%patch1 -%patch2 -p1 -%patch3 -chmod -x include/* -# Valid without doxygen: -#tar -z -x -f docs/html.tar.gz -C docs -#mv docs/* unix/docs/ -chmod -x README.txt +%setup -q -n %{name}-%{__version} %build -cd unix -autoconf -%configure -make %{?jobs:-j%jobs} +autoreconf -f -i +%configure\ + --disable-static +make %{?jobs:-j%jobs} documentationdir=%{_docdir}/%{name} %install -cd unix -%makeinstall\ - bindir=$RPM_BUILD_ROOT/usr/bin\ - libdir=$RPM_BUILD_ROOT/usr/%_lib\ - datadir=$RPM_BUILD_ROOT/usr/share\ - includedir=$RPM_BUILD_ROOT/usr/include\ - PACKAGE_NAME=packages/%{name} +%makeinstall documentationdir=%{_docdir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/libftgl2 +cp -pr AUTHORS BUGS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_defaultdocdir}/libftgl2 +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cd demo +/bin/sh ../libtool --mode=install /usr/bin/install -c FTGLDemo $RPM_BUILD_ROOT%{_bindir}/FTGLDemo +/bin/sh ../libtool --mode=install /usr/bin/install -c FTGLMFontDemo $RPM_BUILD_ROOT%{_bindir}/FTGLMFontDemo +/bin/sh ../libtool --mode=install /usr/bin/install -c c-demo $RPM_BUILD_ROOT%{_bindir}/FTGL-c-demo +/bin/sh ../libtool --mode=install /usr/bin/install -c simple $RPM_BUILD_ROOT%{_bindir}/FTGL-simple-demo +mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-demo +cp -pr *.cpp *.c *.h $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-demo cd .. -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -cp -pr COPYING.txt HISTORY.txt README.txt license.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -n libftgl2 -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -n libftgl2 -p /sbin/ldconfig -%files +%files -n libftgl2 %defattr (-, root, root) -%doc %dir %{_defaultdocdir}/%{name} -%doc %{_defaultdocdir}/%{name}/*.txt -/usr/%_lib/*.so.* +%doc %dir %{_defaultdocdir}/libftgl2 +%doc %{_defaultdocdir}/libftgl2/[ABCNRT]* +%{_libdir}/*.so.* %files devel %defattr (-, root, root) +%doc %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/html -/usr/bin/FTGLDemo -/usr/include/FTGL -/usr/%_lib/*.so -/usr/%_lib/*.*a -/usr/%_lib/pkgconfig/*.pc +%doc %{_defaultdocdir}/%{name}/*.txt +%{_includedir}/FTGL +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc + +%files demo +%defattr (-, root, root) +%doc %dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}-demo +%{_bindir}/FTGLDemo +%{_bindir}/FTGLMFontDemo +%{_bindir}/FTGL-c-demo +%{_bindir}/FTGL-simple-demo %changelog -* Thu Sep 13 2007 - sbrabec@suse.cz +* Tue Jul 15 2008 sbrabec@suse.cz +- Updated to version 2.1.3-rc5: + * Stable API. Public headers are now frozen. + * Fixed several memory corruption and crash bugs + * Fixed several memory leaks + * Kerning and glyph performance enhancements + * The library now also exports a pure C interface + * Inset/outset contour support for fonts + * Fix the FTLayout rendering + * Added new FTLayout and FTSimpleLayout support for layout + managers + * Fixed the paths in the XCode project + * Changed the behaviour of some objects so that if there is an + error their state isn't changed + * New, fast FTBufferFont texture fonts + * UTF-8 support +* Thu Sep 13 2007 sbrabec@suse.cz - Fixed pkg-config file to include correct freetype (#283824). -* Mon Jan 22 2007 - ssommer@suse.de +* Mon Jan 22 2007 ssommer@suse.de - fixed same variable used twice build error -* Wed Sep 13 2006 - sbrabec@suse.cz +* Wed Sep 13 2006 sbrabec@suse.cz - Split devel subpackage. -* Fri Sep 08 2006 - sbrabec@suse.cz +* Fri Sep 08 2006 sbrabec@suse.cz - Build shared library (#197446). -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Nov 08 2005 - dmueller@suse.de +* Tue Nov 08 2005 dmueller@suse.de - don't build as root -* Mon Nov 07 2005 - ro@suse.de +* Mon Nov 07 2005 ro@suse.de - remove extra qualification to fix build with gcc-4.1 -* Thu Jan 06 2005 - sbrabec@suse.cz +* Thu Jan 06 2005 sbrabec@suse.cz - Updated to version 2.1.2. -* Thu Sep 02 2004 - sbrabec@suse.cz +* Thu Sep 02 2004 sbrabec@suse.cz - New SuSE package, version 2.0.11.