- New upstream version 2.3.8.

- Use the patches from the Fedora native package.
- Disable patented code.
- Don't build the static library.
- Use _smp_mflags.
- BR mingw32-dlfcn (not required, but uses it if installed).
- Add license file to doc section.

diff --git a/.hgignore b/.hgignore
index 8e69cc0..d9819fc 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -27,7 +27,10 @@ expat/expat-2.0.1.tar.gz
 flexdll/flexdll-0.11.tar.gz
 fontconfig/fontconfig-2.6.0.tar.gz
 freetype/freetype-2.3.7.tar.bz2
+freetype/freetype-2.3.8.tar.bz2
 freetype/freetype-doc-2.3.7.tar.bz2
+freetype/freetype-doc-2.3.8.tar.bz2
+freetype/ft2demos-2.3.8.tar.bz2
 gc/gc-7.1.tar.gz
 gcc/gcc-core-4.3.2.tar.bz2
 gcc/gcc-g++-4.3.2.tar.bz2

diff --git a/freetype/freetype-multilib.patch b/freetype/freetype-multilib.patch
new file mode 100644 (file)
index 0000000..f369adb
--- /dev/null
+++ b/freetype/freetype-multilib.patch
@@ -0,0 +1,18 @@
+--- freetype-2.2.1/builds/unix/freetype-config.in.multilib     2006-07-27 18:50:40.000000000 -0400
++++ freetype-2.2.1/builds/unix/freetype-config.in      2006-07-27 18:58:13.000000000 -0400
+@@ -9,11 +9,11 @@
+ # indicate that you have read the license and understand and accept it
+ # fully.
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++prefix=`pkg-config --variable prefix freetype2`
++exec_prefix=`pkg-config --variable exec_prefix freetype2`
+ exec_prefix_set=no
+-includedir=@includedir@
+-libdir=@libdir@
++includedir=`pkg-config --variable includedir freetype2`
++libdir=`pkg-config --variable libdir freetype2`
+ enable_shared=@build_libtool_libs@
+ wl=@wl@
+ hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'

diff --git a/freetype/mingw32-freetype.spec b/freetype/mingw32-freetype.spec
index 3847187..ac0c2cf 100644 (file)
--- a/freetype/mingw32-freetype.spec
+++ b/freetype/mingw32-freetype.spec
@@ -4,22 +4,37 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
+# Patented bytecode interpreter and patented subpixel rendering
+# disabled by default.  Pass '--with bytecode_interpreter' and '--with
+# subpixel_rendering' on rpmbuild command-line to enable them.
+
+%define _with_subpixel_rendering 1}
+%define _without_subpixel_rendering 0}
+%{!?_with_bytecode_interpreter: %{!?_without_bytecode_interpreter: %define _without_bytecode_interpreter --without-bytecode_interpreter}}
+%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}
+
+%define with_xfree86 0
+
 Name:           mingw32-freetype
-Version:        2.3.7
-Release:        6%{?dist}
-Summary:        MinGW Windows Freetype library
+Version:        2.3.8
+Release:        1%{?dist}
+Summary:        Free and portable font rendering engine
 
 License:        FTL or GPLv2+
 URL:            http://www.freetype.org
 Source:         http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
-Source1:         http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
+Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
+#Source2:        http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:         freetype-2.1.10-enable-ft2-bci.patch
-Patch2:         freetype-2.3.0-enable-spr.patch
-Patch3:         freetype-2.2.1-enable-valid.patch
-Patch4:         freetype-2.2.1-memcpy-fix.patch
+# Patches from native Fedora package.
+#Patch5:         ft2demos-2.1.9-mathlib.patch
+Patch20:        freetype-2.1.10-enable-ft2-bci.patch
+Patch21:        freetype-2.3.0-enable-spr.patch
+Patch46:        freetype-2.2.1-enable-valid.patch
+Patch88:        freetype-multilib.patch
+Patch89:        freetype-2.2.1-memcpy-fix.patch
 
 BuildArch:      noarch
 
@@ -27,6 +42,7 @@ BuildRequires:  mingw32-filesystem >= 25
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib
+BuildRequires:  mingw32-dlfcn
 
 Requires:       pkgconfig
 
@@ -38,9 +54,34 @@ MinGW Windows Freetype library.
 %prep
 %setup -q -n freetype-%{version} -b 1 -a 1
 
+#pushd ft2demos-%{version}
+#%patch5 -p1 -b .mathlib
+#popd
+
+%if %{?_with_bytecode_interpreter:1}%{!?_with_bytecode_interpreter:0}
+%patch20  -p1 -b .enable-ft2-bci
+%endif
+
+%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
+%patch21  -p1 -b .enable-spr
+%endif
+
+%patch46  -p1 -b .enable-valid
+
+%patch88 -p1 -b .multilib
+%patch89 -p1 -b .memcpy
+
+
 %build
-%{_mingw32_configure}
-make
+%{_mingw32_configure} --disable-static
+make %{?_smp_mflags}
+
+# The ft2demos Makefile is hacky and doesn't understand
+# cross-compilation.  This nearly works, but not quite, so
+# disable. it.
+#pushd ft2demos-%{version}
+#make TOP_DIR=".." PLATFORM=win32
+#popd
 
 
 %install
@@ -48,8 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfreetype.a
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc docs/LICENSE.TXT
 %{_mingw32_bindir}/freetype-config
 %{_mingw32_bindir}/libfreetype-6.dll
 %{_mingw32_includedir}/freetype2
@@ -68,6 +108,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 16 2009 Richard W.M. Jones <rjones@redhat.com> - 2.3.8-1
+- New upstream version 2.3.8.
+- Use the patches from the Fedora native package.
+- Disable patented code.
+- Don't build the static library.
+- Use _smp_mflags.
+- BR mingw32-dlfcn (not required, but uses it if installed).
+- Add license file to doc section.
+
 * Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.3.7-6
 - Requires pkgconfig.