2007-05-28 Doug Scott <
[email protected]>
* SFEsdl-image.spec: Change to isabuild
* base-specs/sdl-image.spec: Change to isabuild
* SFEsdl-mixer.spec: Change to isabuild
* base-specs/sdl-mixer.spec: Change to isabuild
* patches/sdl-mixer-01-cflags.diff: Add CFLAGS
* SFEsdl-gfx.spec: Change to isabuild
* base-specs/sdl-gfx.spec: Change to isabuild
* SFEsdl-net.spec: Change to isabuild
* base-specs/sdl-net.spec: Change to isabuild
* SFEsdl-ttf.spec: Change to isabuild
* base-specs/sdl-ttf.spec: Change to isabuild
* patches/sdl-ttf-01-internal_h.diff: Patch headers
* SFEfreetype.spec: Change to isabuild
* base-specs/freetype.spec: Change to isabuild
* SFEoptipng.spec: Advanced PNG Format File Optimizer
--- a/ChangeLog Tue Jun 05 00:14:03 2007 +0000
+++ b/ChangeLog Tue Jun 05 01:33:08 2007 +0000
@@ -1,3 +1,21 @@
+2007-05-28 Doug Scott <[email protected]>
+
+ * SFEsdl-image.spec: Change to isabuild
+ * base-specs/sdl-image.spec: Change to isabuild
+ * SFEsdl-mixer.spec: Change to isabuild
+ * base-specs/sdl-mixer.spec: Change to isabuild
+ * patches/sdl-mixer-01-cflags.diff: Add CFLAGS
+ * SFEsdl-gfx.spec: Change to isabuild
+ * base-specs/sdl-gfx.spec: Change to isabuild
+ * SFEsdl-net.spec: Change to isabuild
+ * base-specs/sdl-net.spec: Change to isabuild
+ * SFEsdl-ttf.spec: Change to isabuild
+ * base-specs/sdl-ttf.spec: Change to isabuild
+ * patches/sdl-ttf-01-internal_h.diff: Patch headers
+ * SFEfreetype.spec: Change to isabuild
+ * base-specs/freetype.spec: Change to isabuild
+ * SFEoptipng.spec: Advanced PNG Format File Optimizer
+
2007-05-28 Doug Scott <[email protected]>
* SFElibfribidi.spec: Added libfribidi
--- a/SFEfreetype.spec Tue Jun 05 00:14:03 2007 +0000
+++ b/SFEfreetype.spec Tue Jun 05 01:33:08 2007 +0000
@@ -1,17 +1,27 @@
#
# spec file for package SFEfreetype
#
-# includes module(s): GNU freetype
+# includes module(s): freetype
#
%include Solaris.inc
%include usr-gnu.inc
-%define src_name freetype
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use freetype_64 = freetype.spec
+%endif
+
+%if %arch_sse2
+%include x86_sse2.inc
+%use freetype_sse2 = freetype.spec
+%endif
+
+%include base.inc
+%use freetype = freetype.spec
+
Name: SFEfreetype
Summary: Freetype
Version: 2.3.4
-Source: http://savannah.nongnu.org/download/%{src_name}/%{src_name}-%{version}.tar.bz2
-Patch1: freetype-01-options.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -23,34 +33,45 @@
Requires: %name
%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p1
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%freetype_64.prep -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%freetype_sse2.prep -d %name-%version/%sse2_arch
+%endif
+
+mkdir %name-%version/%base_arch
+%freetype.prep -d %name-%version/%base_arch
%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-
+%ifarch amd64 sparcv9
+%freetype_64.build -d %name-%version/%_arch64
+%endif
-bash ./autogen.sh
-./configure --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --includedir=%{_includedir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir}
+%if %arch_sse2
+%freetype_sse2.build -d %name-%version/%sse2_arch
+%endif
-make -j$CPUS
+%freetype.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%ifarch amd64 sparcv9
+%freetype_64.install -d %name-%version/%_arch64
+%endif
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+%if %arch_sse2
+%freetype_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%freetype.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
@@ -62,6 +83,14 @@
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
%files devel
%defattr (-, root, bin)
@@ -71,7 +100,21 @@
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/aclocal
%{_datadir}/aclocal/*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_bindir}/%{_arch64}
+%{_bindir}/%{_arch64}/*
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*.pc
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_bindir}/%{sse2_arch}
+%{_bindir}/%{sse2_arch}/*
+%dir %attr (0755, root, other) %{_libdir}/%{sse2_arch}/pkgconfig
+%{_libdir}/%{sse2_arch}/pkgconfig/*.pc
+%endif
%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
* Mon Apr 30 2007 - [email protected]
- Initial spec - some apps need modern freetype
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEoptipng.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,65 @@
+#
+# spec file for package SFEoptipng.spec
+#
+# includes module(s): optipng
+#
+%include Solaris.inc
+
+%define src_name optipng
+%define src_url http://switch.dl.sourceforge.net/%{src_name}
+
+Name: SFEoptipng
+Summary: Advanced PNG Format File Optimizer
+Version: 0.5.5
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+cd src
+sed -e '/^prefix=/s+=.*$+=%{_prefix}+' \
+ -e '/^mandir=/s+=.*$+=%{_mandir}+' \
+ -e '/^CC.*=/d' -e '/^CFLAGS.*=/d' -e '/^LDFLAGS.*=/d' \
+ -e '/^ZLIB.*=/s+=.*$+= -lz+' \
+ -e '/^PNGLIB.*=/s+=.*$+= -lpng -lm+' \
+ -e '/^PNGLIB.*=/s+=.*$+= -lpng -lm+' \
+ -e '/^LIBS.*=/s+\$([PGNZ]*DIR)/++g' \
+ -e '/^\$(OPTIPNG):/s+\$(LIBS)+$(PNGXDIR)/$(PNGXLIB)+' \
+ -e 's/-I\$([PGNZ]*DIR)//g' \
+ -e '/^.(PNGXDIR)..(PNGXLIB):/s/:.*$/:/' \
+ scripts/unix-std.mak > scripts/unix-solaris.mak
+ln -s scripts/unix-solaris.mak Makefile
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+cd src
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd src
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr (0755,root,sys) %{_datadir}
+%{_mandir}
+
+%changelog
+* Tue Jun 5 2007 - [email protected]
+- Initial version
--- a/SFEsdl-gfx.spec Tue Jun 05 00:14:03 2007 +0000
+++ b/SFEsdl-gfx.spec Tue Jun 05 01:33:08 2007 +0000
@@ -4,49 +4,85 @@
# includes module(s): SDL
#
%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%define mmx_option --disable-mmx
+%use sdl_64 = sdl-gfx.spec
+%endif
-%define sdl_name SDL_gfx
+%if %arch_sse2
+%include x86_sse2.inc
+# Not working yet!
+%define mmx_option --disable-mmx
+%use sdl_sse2 = sdl-gfx.spec
+%endif
+
+%include base.inc
+%define mmx_option --disable-mmx
+%use sdl = sdl-gfx.spec
+
+%define SUNWlibsdl %(/usr/bin/pkginfo -q SUNWlibsdl && echo 1 || echo 0)
+
Name: SFEsdl-gfx
Summary: Graphics library for SDL
Version: 2.0.16
-Source: http://www.ferzkopp.net/Software/%{sdl_name}-2.0/%{sdl_name}-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
+%if %SUNWlibsdl
BuildRequires: SUNWlibsdl-devel
Requires: SUNWlibsdl
-
-%prep
-%setup -q -n %{sdl_name}-%{version}
+%else
+BuildRequires: SFEsdl-devel
+Requires: SFEsdl
+%endif
%package devel
-Summary: Libraries, includes and more to develop SDL applications.
-Group: Development/Libraries
-SUNW_BaseDir: %{_basedir}
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: %{name}
%prep
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%sdl_64.prep -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%sdl_sse2.prep -d %name-%version/%sse2_arch
+%endif
+
+mkdir %name-%version/%base_arch
+%sdl.prep -d %name-%version/%base_arch
%build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir} \
- --disable-mmx
+%ifarch amd64 sparcv9
+%sdl_64.build -d %name-%version/%_arch64
+%endif
-make
+%if %arch_sse2
+%sdl_sse2.build -d %name-%version/%sse2_arch
+%endif
+
+%sdl.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%ifarch amd64 sparcv9
+%sdl_64.install -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%sdl_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%sdl.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
@@ -56,14 +92,23 @@
%doc README CHANGES COPYING
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
%files devel
%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/SDL/
+
%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
* Tue May 8 2007 - Doug Scott
- Initial version
--- a/SFEsdl-image.spec Tue Jun 05 00:14:03 2007 +0000
+++ b/SFEsdl-image.spec Tue Jun 05 01:33:08 2007 +0000
@@ -4,59 +4,81 @@
# includes module(s): SDL
#
%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use sdl_64 = sdl-image.spec
+%endif
-Summary: Simple DirectMedia Layer - Sample Image Loading Library
-Name: SFEsdl-image
-Version: 1.2.5
-Source: http://www.libsdl.org/projects/SDL_image/release/SDL_image-%{version}.tar.gz
-License: LGPL
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %arch_sse2
+%include x86_sse2.inc
+%use sdl_sse2 = sdl-image.spec
+%endif
+
+%include base.inc
+%use sdl = sdl-image.spec
+
+%define SUNWlibsdl %(/usr/bin/pkginfo -q SUNWlibsdl && echo 1 || echo 0)
+
+Name: SFEsdl-image
+Summary: %{sdl.summary}
+Version: %{sdl.version}
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+%if %SUNWlibsdl
+BuildRequires: SUNWlibsdl-devel
+Requires: SUNWlibsdl
+%else
+BuildRequires: SFEsdl-devel
+Requires: SFEsdl
+%endif
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: %{name}
%prep
-%setup -q -n SDL_image-%version
+rm -rf %name-%version
+mkdir %name-%version
-#BuildRequires: SDL-devel
-#BuildRequires: libjpeg-devel
-#BuildRequires: libpng-devel
-#BuildRequires: libtiff-devel
-
-%description
-This is a simple library to load images of various formats as SDL surfaces.
-This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats.
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%sdl_64.prep -d %name-%version/%_arch64
+%endif
-%package devel
-Summary: Libraries, includes and more to develop SDL applications.
-Group: Development/Libraries
-SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-Requires: %{name}
-Requires: SFEsdl-devel
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%sdl_sse2.prep -d %name-%version/%sse2_arch
+%endif
-%description devel
-This is a simple library to load images of various formats as SDL surfaces.
-This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats.
-
-%prep
-rm -rf ${RPM_BUILD_ROOT}
+mkdir %name-%version/%base_arch
+%sdl.prep -d %name-%version/%base_arch
%build
-CFLAGS="$RPM_OPT_FLAGS"
-./configure --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir}
+%ifarch amd64 sparcv9
+%sdl_64.build -d %name-%version/%_arch64
+%endif
-make
+%if %arch_sse2
+%sdl_sse2.build -d %name-%version/%sse2_arch
+%endif
+
+%sdl.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%ifarch amd64 sparcv9
+%sdl_64.install -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%sdl_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%sdl.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
@@ -65,16 +87,23 @@
%defattr(-,root,bin)
%doc README CHANGES COPYING
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
%files devel
%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/SDL/
%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
* Sun Apr 01 2007 Jeff Cai
- Initial version
-
--- a/SFEsdl-mixer.spec Tue Jun 05 00:14:03 2007 +0000
+++ b/SFEsdl-mixer.spec Tue Jun 05 01:33:08 2007 +0000
@@ -1,51 +1,84 @@
#
-# spec file for package SFEsdl-ttf
+# spec file for package SFEsdl-mixer
#
# includes module(s): SDL
#
%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use sdl_64 = sdl-mixer.spec
+%endif
-%define sdl_name SDL_mixer
+%if %arch_sse2
+%include x86_sse2.inc
+%use sdl_sse2 = sdl-mixer.spec
+%endif
+
+%include base.inc
+%use sdl = sdl-mixer.spec
+
+%define SUNWlibsdl %(/usr/bin/pkginfo -q SUNWlibsdl && echo 1 || echo 0)
+
Name: SFEsdl-mixer
-Summary: Sound Mixer library for SDL
-Version: 1.2.7
-Source: http://www.libsdl.org/projects/%{sdl_name}/release/%{sdl_name}-%{version}.tar.gz
+Summary: %{sdl.summary}
+Version: %{sdl.version}
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
+%if %SUNWlibsdl
+BuildRequires: SUNWlibsdl-devel
+Requires: SUNWlibsdl
+%else
+BuildRequires: SFEsdl-devel
Requires: SFEsdl
-
-%prep
-%setup -q -n %{sdl_name}-%version
+%endif
%package devel
-Summary: Libraries, includes and more to develop SDL applications.
-Group: Development/Libraries
-SUNW_BaseDir: %{_basedir}
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: %{name}
-Requires: SFEsdl-devel
%prep
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%sdl_64.prep -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%sdl_sse2.prep -d %name-%version/%sse2_arch
+%endif
+
+mkdir %name-%version/%base_arch
+%sdl.prep -d %name-%version/%base_arch
%build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir}
+%ifarch amd64 sparcv9
+%sdl_64.build -d %name-%version/%_arch64
+%endif
-make
+%if %arch_sse2
+%sdl_sse2.build -d %name-%version/%sse2_arch
+%endif
+
+%sdl.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%ifarch amd64 sparcv9
+%sdl_64.install -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%sdl_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%sdl.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
@@ -55,14 +88,22 @@
%doc README CHANGES COPYING
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
%files devel
%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/SDL/
%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
* Sun Apr 22 2007 - Doug Scott
- Initial version
--- a/SFEsdl-net.spec Tue Jun 05 00:14:03 2007 +0000
+++ b/SFEsdl-net.spec Tue Jun 05 01:33:08 2007 +0000
@@ -4,48 +4,81 @@
# includes module(s): SDL
#
%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use sdl_64 = sdl-net.spec
+%endif
-%define sdl_name SDL_net
+%if %arch_sse2
+%include x86_sse2.inc
+%use sdl_sse2 = sdl-net.spec
+%endif
+
+%include base.inc
+%use sdl = sdl-net.spec
+
+%define SUNWlibsdl %(/usr/bin/pkginfo -q SUNWlibsdl && echo 1 || echo 0)
+
Name: SFEsdl-net
-Summary: Network library for SDL
-Version: 1.2.6
-Source: http://www.libsdl.org/projects/%{sdl_name}/release/%{sdl_name}-%{version}.tar.gz
+Summary: %{sdl.summary}
+Version: %{sdl.version}
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
+%if %SUNWlibsdl
+BuildRequires: SUNWlibsdl-devel
+Requires: SUNWlibsdl
+%else
+BuildRequires: SFEsdl-devel
Requires: SFEsdl
-
-%prep
-%setup -q -n %{sdl_name}-%version
+%endif
%package devel
-Summary: Libraries, includes and more to develop SDL applications.
-Group: Development/Libraries
-SUNW_BaseDir: %{_basedir}
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: %{name}
-Requires: SFEsdl-devel
%prep
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%sdl_64.prep -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%sdl_sse2.prep -d %name-%version/%sse2_arch
+%endif
+
+mkdir %name-%version/%base_arch
+%sdl.prep -d %name-%version/%base_arch
%build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir}
+%ifarch amd64 sparcv9
+%sdl_64.build -d %name-%version/%_arch64
+%endif
-make
+%if %arch_sse2
+%sdl_sse2.build -d %name-%version/%sse2_arch
+%endif
+
+%sdl.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%ifarch amd64 sparcv9
+%sdl_64.install -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%sdl_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%sdl.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
@@ -55,14 +88,23 @@
%doc README CHANGES COPYING
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
%files devel
%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/SDL/
+
%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
* Sun Apr 22 2007 - Doug Scott
- Initial version
--- a/SFEsdl-ttf.spec Tue Jun 05 00:14:03 2007 +0000
+++ b/SFEsdl-ttf.spec Tue Jun 05 01:33:08 2007 +0000
@@ -4,48 +4,83 @@
# includes module(s): SDL
#
%include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use sdl_64 = sdl-ttf.spec
+%endif
-%define sdl_name SDL_ttf
+%if %arch_sse2
+%include x86_sse2.inc
+%use sdl_sse2 = sdl-ttf.spec
+%endif
+
+%include base.inc
+%use sdl = sdl-ttf.spec
+
+%define SUNWlibsdl %(/usr/bin/pkginfo -q SUNWlibsdl && echo 1 || echo 0)
+
Name: SFEsdl-ttf
-Summary: True Type Font library for SDL
-Version: 2.0.8
-Source: http://www.libsdl.org/projects/%{sdl_name}/release/%{sdl_name}-%{version}.tar.gz
+Summary: %{sdl.summary}
+Version: %{sdl.version}
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
+BuildRequires: SFEfreetype-devel
+Requires: SFEfreetype
+%if %SUNWlibsdl
+BuildRequires: SUNWlibsdl-devel
+Requires: SUNWlibsdl
+%else
+BuildRequires: SFEsdl-devel
Requires: SFEsdl
-
-%prep
-%setup -q -n %{sdl_name}-%version
+%endif
%package devel
-Summary: Libraries, includes and more to develop SDL applications.
-Group: Development/Libraries
-SUNW_BaseDir: %{_basedir}
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: %{name}
-Requires: SFEsdl-devel
%prep
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%sdl_64.prep -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%sdl_sse2.prep -d %name-%version/%sse2_arch
+%endif
+
+mkdir %name-%version/%base_arch
+%sdl.prep -d %name-%version/%base_arch
%build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir}
+%ifarch amd64 sparcv9
+%sdl_64.build -d %name-%version/%_arch64
+%endif
-make
+%if %arch_sse2
+%sdl_sse2.build -d %name-%version/%sse2_arch
+%endif
+
+%sdl.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%ifarch amd64 sparcv9
+%sdl_64.install -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%sdl_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%sdl.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
@@ -55,14 +90,22 @@
%doc README CHANGES COPYING
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
%files devel
%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/SDL/
%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
* Sun Apr 22 2007 - Doug Scott
- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/freetype.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,55 @@
+#
+# spec file for package freetype
+#
+# includes module(s): freetype
+#
+%define src_name freetype
+%define src_url http://savannah.nongnu.org/download/%{src_name}
+
+Name: freetype
+Summary: Freetype
+Version: 2.3.4
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Patch1: freetype-01-options.diff
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+
+bash ./autogen.sh
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir}
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+# Yuk. Some apps still need the internal headers :(
+( cd include
+ find freetype/internal | cpio -pdm $RPM_BUILD_ROOT%{_includedir}/freetype2
+)
+
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
+* Mon Apr 30 2007 - [email protected]
+- Initial spec - some apps need modern freetype
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/sdl-gfx.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,45 @@
+#
+# spec file for package SFEsdl-gfx
+#
+# includes module(s): SDL
+#
+
+%define src_name SDL_gfx
+%define src_url http://www.ferzkopp.net/Software/%{src_name}-2.0
+
+Name: SFEsdl-gfx
+Summary: Graphics library for SDL
+Version: 2.0.16
+Source: %{src_name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+export PATH=%{_bindir}:$PATH
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ %mmx_option
+
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
+* Tue May 8 2007 - Doug Scott
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/sdl-image.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,44 @@
+#
+# spec file for package SFEsdl-image
+#
+# includes module(s): SDL
+#
+
+%define src_name SDL_image
+%define src_url http://www.libsdl.org/projects/%{src_name}/release
+
+Name: sdl-image
+Summary: Simple DirectMedia Layer - Sample Image Loading Library
+Version: 1.2.5
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+export PATH=%{_bindir}:$PATH
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
+* Sun Apr 01 2007 Jeff Cai
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/sdl-mixer.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,46 @@
+#
+# spec file for package SFEsdl-mixer
+#
+# includes module(s): SDL
+#
+
+%define src_name SDL_mixer
+%define src_url http://www.libsdl.org/projects/%{src_name}/release
+
+Name: sdl-image
+Summary: Sound Mixer library for SDL
+Version: 1.2.7
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1: sdl-mixer-01-cflags.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+
+%build
+export PATH=%{_bindir}:$PATH
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
+* Sun Apr 22 2007 - Doug Scott
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/sdl-net.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,44 @@
+#
+# spec file for package SFEsdl-net
+#
+# includes module(s): SDL
+#
+
+%define src_name SDL_net
+%define src_url http://www.libsdl.org/projects/%{src_name}/release
+
+Name: sdl-image
+Summary: Network library for SDL
+Version: 1.2.6
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+export PATH=%{_bindir}:$PATH
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
+* Sun Apr 22 2007 - Doug Scott
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/sdl-ttf.spec Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,46 @@
+#
+# spec file for package SFEsdl-ttf
+#
+# includes module(s): SDL
+#
+
+%define src_name SDL_ttf
+%define src_url http://www.libsdl.org/projects/%{src_name}/release
+
+Name: sdl-rrf
+Summary: True Type Font library for SDL
+Version: 2.0.8
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1: sdl-ttf-01-internal_h.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+
+%build
+export PATH=/usr/gnu/bin/%{bld_arch}:%{_bindir}:$PATH
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Jun 5 2007 - Doug Scott
+- Change to isabuild
+* Sun Apr 22 2007 - Doug Scott
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/sdl-mixer-01-cflags.diff Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,16 @@
+diff -ur SDL_mixer-1.2.7-orig/Makefile.in SDL_mixer-1.2.7/Makefile.in
+--- SDL_mixer-1.2.7-orig/Makefile.in 2006-05-17 13:08:04.000000000 +0700
++++ SDL_mixer-1.2.7/Makefile.in 2007-05-27 13:20:23.008533882 +0700
+@@ -57,10 +57,10 @@
+ $(SHELL) $(auxdir)/mkinstalldirs $@
+
+ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
+- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+
+ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
+- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+
+ .PHONY: all depend install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
+ depend:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/sdl-ttf-01-internal_h.diff Tue Jun 05 01:33:08 2007 +0000
@@ -0,0 +1,181 @@
+diff -ur SDL_ttf-2.0.8-orig/SDL_ttf.c SDL_ttf-2.0.8/SDL_ttf.c
+--- SDL_ttf-2.0.8-orig/SDL_ttf.c 2006-05-01 16:26:17.000000000 +0700
++++ SDL_ttf-2.0.8/SDL_ttf.c 2007-05-27 18:50:44.871281342 +0700
+@@ -20,7 +20,7 @@
+ [email protected]
+ */
+
+-/* $Id: SDL_ttf.c 2304 2006-05-01 09:26:07Z slouken $ */
++/* $Id$ */
+
+ #include <math.h>
+ #include <stdio.h>
+@@ -43,16 +43,6 @@
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+ #include FT_TRUETYPE_IDS_H
+-/*
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
+-*/
+-#include <freetype/internal/ftobjs.h>
+-
+-#ifndef FT_OPEN_STREAM
+-#define FT_OPEN_STREAM ft_open_stream
+-#endif
+
+ #include "SDL.h"
+ #include "SDL_endian.h"
+@@ -278,7 +268,6 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
+@@ -661,17 +650,19 @@
+
+ void TTF_CloseFont( TTF_Font* font )
+ {
+- Flush_Cache( font );
+- if ( font->face ) {
+- FT_Done_Face( font->face );
+- }
+- if ( font->args.stream ) {
+- free( font->args.stream );
+- }
+- if ( font->freesrc ) {
+- SDL_RWclose( font->src );
++ if ( font ) {
++ Flush_Cache( font );
++ if ( font->face ) {
++ FT_Done_Face( font->face );
++ }
++ if ( font->args.stream ) {
++ free( font->args.stream );
++ }
++ if ( font->freesrc ) {
++ SDL_RWclose( font->src );
++ }
++ free( font );
+ }
+- free( font );
+ }
+
+ static Uint16 *LATIN1_to_UNICODE(Uint16 *unicode, const char *text, int len)
+@@ -715,42 +706,42 @@
+ return unicode;
+ }
+
+-int TTF_FontHeight(TTF_Font *font)
++int TTF_FontHeight(const TTF_Font *font)
+ {
+ return(font->height);
+ }
+
+-int TTF_FontAscent(TTF_Font *font)
++int TTF_FontAscent(const TTF_Font *font)
+ {
+ return(font->ascent);
+ }
+
+-int TTF_FontDescent(TTF_Font *font)
++int TTF_FontDescent(const TTF_Font *font)
+ {
+ return(font->descent);
+ }
+
+-int TTF_FontLineSkip(TTF_Font *font)
++int TTF_FontLineSkip(const TTF_Font *font)
+ {
+ return(font->lineskip);
+ }
+
+-long TTF_FontFaces(TTF_Font *font)
++long TTF_FontFaces(const TTF_Font *font)
+ {
+ return(font->face->num_faces);
+ }
+
+-int TTF_FontFaceIsFixedWidth(TTF_Font *font)
++int TTF_FontFaceIsFixedWidth(const TTF_Font *font)
+ {
+ return(FT_IS_FIXED_WIDTH(font->face));
+ }
+
+-char *TTF_FontFaceFamilyName(TTF_Font *font)
++char *TTF_FontFaceFamilyName(const TTF_Font *font)
+ {
+ return(font->face->family_name);
+ }
+
+-char *TTF_FontFaceStyleName(TTF_Font *font)
++char *TTF_FontFaceStyleName(const TTF_Font *font)
+ {
+ return(font->face->style_name);
+ }
+@@ -1734,7 +1725,7 @@
+ Flush_Cache( font );
+ }
+
+-int TTF_GetFontStyle( TTF_Font* font )
++int TTF_GetFontStyle( const TTF_Font* font )
+ {
+ return font->style;
+ }
+diff -ur SDL_ttf-2.0.8-orig/SDL_ttf.h SDL_ttf-2.0.8/SDL_ttf.h
+--- SDL_ttf-2.0.8-orig/SDL_ttf.h 2006-05-12 10:02:42.000000000 +0700
++++ SDL_ttf-2.0.8/SDL_ttf.h 2007-05-27 18:50:48.639182378 +0700
+@@ -20,7 +20,7 @@
+ [email protected]
+ */
+
+-/* $Id: SDL_ttf.h 2387 2006-05-11 09:03:37Z slouken $ */
++/* $Id$ */
+
+ /* This library is a wrapper around the excellent FreeType 2.0 library,
+ available at:
+@@ -99,32 +99,32 @@
+ #define TTF_STYLE_BOLD 0x01
+ #define TTF_STYLE_ITALIC 0x02
+ #define TTF_STYLE_UNDERLINE 0x04
+-extern DECLSPEC int SDLCALL TTF_GetFontStyle(TTF_Font *font);
++extern DECLSPEC int SDLCALL TTF_GetFontStyle(const TTF_Font *font);
+ extern DECLSPEC void SDLCALL TTF_SetFontStyle(TTF_Font *font, int style);
+
+ /* Get the total height of the font - usually equal to point size */
+-extern DECLSPEC int SDLCALL TTF_FontHeight(TTF_Font *font);
++extern DECLSPEC int SDLCALL TTF_FontHeight(const TTF_Font *font);
+
+ /* Get the offset from the baseline to the top of the font
+ This is a positive value, relative to the baseline.
+ */
+-extern DECLSPEC int SDLCALL TTF_FontAscent(TTF_Font *font);
++extern DECLSPEC int SDLCALL TTF_FontAscent(const TTF_Font *font);
+
+ /* Get the offset from the baseline to the bottom of the font
+ This is a negative value, relative to the baseline.
+ */
+-extern DECLSPEC int SDLCALL TTF_FontDescent(TTF_Font *font);
++extern DECLSPEC int SDLCALL TTF_FontDescent(const TTF_Font *font);
+
+ /* Get the recommended spacing between lines of text for this font */
+-extern DECLSPEC int SDLCALL TTF_FontLineSkip(TTF_Font *font);
++extern DECLSPEC int SDLCALL TTF_FontLineSkip(const TTF_Font *font);
+
+ /* Get the number of faces of the font */
+-extern DECLSPEC long SDLCALL TTF_FontFaces(TTF_Font *font);
++extern DECLSPEC long SDLCALL TTF_FontFaces(const TTF_Font *font);
+
+ /* Get the font face attributes, if any */
+-extern DECLSPEC int SDLCALL TTF_FontFaceIsFixedWidth(TTF_Font *font);
+-extern DECLSPEC char * SDLCALL TTF_FontFaceFamilyName(TTF_Font *font);
+-extern DECLSPEC char * SDLCALL TTF_FontFaceStyleName(TTF_Font *font);
++extern DECLSPEC int SDLCALL TTF_FontFaceIsFixedWidth(const TTF_Font *font);
++extern DECLSPEC char * SDLCALL TTF_FontFaceFamilyName(const TTF_Font *font);
++extern DECLSPEC char * SDLCALL TTF_FontFaceStyleName(const TTF_Font *font);
+
+ /* Get the metrics (dimensions) of a glyph
+ To understand what these metrics mean, here is a useful link: