rpms/ftgl/FC-6 ftgl-2.1.2-destdir.patch, NONE, 1.1 ftgl-2.1.2-Glyph-g++_41.patch, NONE, 1.1 ftgl-2.1.2-pc_req.patch, NONE, 1.1 ftgl-2.1.2-rpath_FTGLDemo.patch, NONE, 1.1 ftgl-2.1.2-ttf_font.patch, NONE, 1.1 ftgl.spec, NONE, 1.1 sources, 1.1, 1.2

Chauvet (kwizart) fedora-extras-commits at redhat.com
Mon Jul 16 07:01:26 UTC 2007


Author: kwizart

Update of /cvs/extras/rpms/ftgl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3964

Modified Files:
	sources 
Added Files:
	ftgl-2.1.2-destdir.patch ftgl-2.1.2-Glyph-g++_41.patch 
	ftgl-2.1.2-pc_req.patch ftgl-2.1.2-rpath_FTGLDemo.patch 
	ftgl-2.1.2-ttf_font.patch ftgl.spec 
Log Message:
Initial import


ftgl-2.1.2-destdir.patch:

--- NEW FILE ftgl-2.1.2-destdir.patch ---
--- FTGL/unix/src/Makefile.destdir	2004-08-16 08:09:43.000000000 +0200
+++ FTGL/unix/src/Makefile	2007-05-11 00:14:57.000000000 +0200
@@ -73,10 +73,10 @@
 libftgl.la: $(LOBJS)
 
 install-local: libftgl.la
-	$(INSTALL) -d -m 0755 $(libdir)
-	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(TARGET) $(libdir)
-	$(INSTALL) -d -m 0755 $(includedir)/FTGL
-	$(INSTALL) -m 0644 $(HEADER_FILES) $(includedir)/FTGL
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(TARGET) $(DESTDIR)$(libdir)
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/FTGL
+	$(INSTALL) -m 0644 $(HEADER_FILES) $(DESTDIR)$(includedir)/FTGL
 
 
 clean-local:
--- FTGL/unix/demo/Makefile.destdir	2003-08-25 06:18:22.000000000 +0200
+++ FTGL/unix/demo/Makefile	2007-05-11 00:14:57.000000000 +0200
@@ -31,8 +31,8 @@
 	$(LIBTOOL) --mode=link $(CXX) $^ -o $@ $(top_builddir)/src/libftgl.la $(LIBGLUT) $(LIBS)
 
 install-local: FTGLDemo
-	$(INSTALL) -d -m 0755 $(bindir)
-	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(TARGET) $(bindir)
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(bindir)
+	$(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(TARGET) $(DESTDIR)$(bindir)
 else
 FTGLDemo:
 	@echo GLUT not available, demo won\'t be compiled
--- FTGL/unix/docs/Makefile.destdir	2003-03-06 11:22:54.000000000 +0100
+++ FTGL/unix/docs/Makefile	2007-05-11 00:14:57.000000000 +0200
@@ -13,8 +13,8 @@
 	touch $@
 
 install-local: doc
-	$(INSTALL) -d -m 0755 $(datadir)/doc/$(PACKAGE_NAME)/html
-	$(INSTALL) -m 0644 html/* $(datadir)/doc/$(PACKAGE_NAME)/html/
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/html
+	$(INSTALL) -m 0644 html/* $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/html/
 
 distclean-local:
 	$(RM) -r $(DOCDIRS)
--- FTGL/unix/Makefile.destdir	2007-05-11 00:16:40.000000000 +0200
+++ FTGL/unix/Makefile	2007-05-11 00:17:03.000000000 +0200
@@ -16,8 +16,8 @@
 	./configure
 
 install-local: ftgl.pc
-	$(INSTALL) -d -m 0755 $(libdir)/pkgconfig
-	$(INSTALL) -m 0644 ftgl.pc $(libdir)/pkgconfig/
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -m 0644 ftgl.pc $(DESTDIR)$(libdir)/pkgconfig/
 
 maint-clean-local:
 	$(RM) $(AUTOGEN_MAINT)

ftgl-2.1.2-Glyph-g++_41.patch:

--- NEW FILE ftgl-2.1.2-Glyph-g++_41.patch ---
--- FTGL/include/FTTextureGlyph.h.Glyph	2007-05-14 23:47:49.000000000 +0200
+++ FTGL/include/FTTextureGlyph.h	2007-05-14 23:49:16.000000000 +0200
@@ -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:
         /**

ftgl-2.1.2-pc_req.patch:

--- NEW FILE ftgl-2.1.2-pc_req.patch ---
--- FTGL/unix/ftgl.pc.in.req	2003-08-25 06:18:22.000000000 +0200
+++ FTGL/unix/ftgl.pc.in	2007-07-13 20:45:24.000000000 +0200
@@ -6,6 +6,6 @@
 Name: @PACKAGE_NAME@
 Description: OpenGL frontend to Freetype 2
 Version: @PACKAGE_VERSION@
-Requires: 
-Libs: @GL_LIBS@ @FT2_LIBS@ -L${libdir} -lftgl
-Cflags: -I${includedir} @GL_CFLAGS@ @FT2_CFLAGS@
+Requires: freetype2
+Libs: @GL_LIBS@ -L${libdir} -lftgl
+Cflags: -I${includedir} @GL_CFLAGS@

ftgl-2.1.2-rpath_FTGLDemo.patch:

--- NEW FILE ftgl-2.1.2-rpath_FTGLDemo.patch ---
--- FTGL/unix/demo/Makefile.rpath	2007-07-13 15:48:53.000000000 +0200
+++ FTGL/unix/demo/Makefile	2007-07-13 15:49:59.000000000 +0200
@@ -28,7 +28,7 @@
 
 ifeq ($(HAVE_GLUT),yes)
 FTGLDemo: $(OBJS)
-	$(LIBTOOL) --mode=link $(CXX) $^ -o $@ $(top_builddir)/src/libftgl.la $(LIBGLUT) $(LIBS)
+	$(LIBTOOL) --mode=link $(CXX) $^ -o $@ $(top_builddir)/src/.libs/libftgl.so $(LIBGLUT) $(LIBS)
 
 install-local: FTGLDemo
 	$(INSTALL) -d -m 0755 $(DESTDIR)$(bindir)

ftgl-2.1.2-ttf_font.patch:

--- NEW FILE ftgl-2.1.2-ttf_font.patch ---
--- FTGL/demo/FTGLDemo.cpp.ttf_font	2004-09-18 13:25:09.000000000 +0200
+++ FTGL/demo/FTGLDemo.cpp	2007-05-28 17:19:38.000000000 +0200
@@ -18,7 +18,7 @@
 
 // YOU'LL PROBABLY WANT TO CHANGE THESE
 #ifdef __linux__
-	#define FONT_FILE "/usr/share/fonts/truetype/arial.ttf"
+	#define FONT_FILE "/usr/share/fonts/freefont/FreeSans.ttf"
 #endif
 #ifdef __APPLE_CC__
 	#define FONT_FILE "/Users/henry/Development/PROJECTS/FTGL/test/font_pack/arial.ttf"


--- NEW FILE ftgl.spec ---
Name:           ftgl
Version:        2.1.2
Release:        5%{?dist}
Summary:        OpenGL frontend to Freetype 2

Group:          System Environment/Libraries
License:        LGPL
URL:            http://homepages.paradise.net.nz/henryj/code/index.html#FTGL
Source0:        http://opengl.geek.nz/ftgl/ftgl-%{version}.tar.gz
Patch0:         ftgl-2.1.2-destdir.patch
Patch1:         ftgl-2.1.2-Glyph-g++_41.patch
Patch2:         ftgl-2.1.2-pc_req.patch
Patch3:         ftgl-2.1.2-ttf_font.patch
Patch4:         ftgl-2.1.2-rpath_FTGLDemo.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  doxygen

BuildRequires:  freeglut-devel
BuildRequires:  freetype-devel
BuildRequires:  libXi-devel
BuildRequires:  libXmu-devel


%description
FTGL is a free open source library to enable developers to use arbitrary
fonts in their OpenGL (www.opengl.org)  applications.
Unlike other OpenGL font libraries FTGL uses standard font file formats
so doesn't need 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 most 
efficient for OpenGL rendering.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       freetype-devel
Requires:       mesa-libGLU-devel
Requires:       mesa-libGL-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%package        utils
Summary:        Test binary for %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       freefont

%description    utils
FTGL is a free open source library to enable developers to use arbitrary
fonts in their OpenGL (www.opengl.org)  applications.
Unlike other OpenGL font libraries FTGL uses standard font file formats
so doesn't need 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 most 
efficient for OpenGL rendering.


%prep
%setup -q -n FTGL
%patch0 -p1 -b .destdir
%patch1 -p1 -b .Glyph
%patch2 -p1 -b .req
%patch3 -p1 -b .ttf_font
%patch4 -p1 -b .rpath

chmod 0644 README.txt
chmod 0644 include/*
chmod 0644 src/*

install -pm 0644 demo/README.txt README-demo.txt

# Fix version of the package
sed -i.fixed_version -e 's|2.0.5|%{version}|g' unix/configure.ac unix/configure


%build
cd unix
%configure \
  --enable-shared \
  --disable-static \
  --with-gl-inc=%{_includedir} \
  --with-gl-lib=%{_libdir} \
  --with-glut-inc=%{_includedir} \
  --with-glut-lib=%{_libdir} \
  --with-x

make all %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT unix/__doc
cd unix
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libftgl.so.0.*

# Doc fixes
mkdir -p __doc/html
install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/ftgl/html/* __doc/html
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING.txt HISTORY.txt license.txt README.txt
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc unix/__doc/*
%{_includedir}/FTGL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%files utils
%defattr(-,root,root,-)
%doc README-demo.txt
%{_bindir}/FTGLDemo


%changelog
* Sat Jul 14 2007 kwizart < kwizart at gmail.com > - 2.1.2-5
- Fix version field the whole package

* Fri Jul 13 2007 kwizart < kwizart at gmail.com > - 2.1.2-4
- Modified ftgl-2.1.2-pc_req.patch
- Add Requires freefont to -utils

* Fri Jul 13 2007 kwizart < kwizart at gmail.com > - 2.1.2-3
- Add Requirements for -devel
- Preserve timestramp for install step
- Add ftgl-utils to prevent conflict with multilibs
  Add patch to prevent rpath

* Mon May 28 2007 kwizart < kwizart at gmail.com > - 2.1.2-2
- Add ftgl.pc patch
- Add BR freeglut-devel
- Remove unneeded LDFLAGS
- Cleaned spec file

* Mon May 14 2007 kwizart < kwizart at gmail.com > - 2.1.2-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ftgl/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jul 2007 19:25:59 -0000	1.1
+++ sources	16 Jul 2007 07:00:54 -0000	1.2
@@ -0,0 +1 @@
+3eabec9ad37371c4d139408c7ffd2429  ftgl-2.1.2.tar.gz




More information about the scm-commits mailing list