X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=blobdiff_plain;f=freetype.spec;h=ad9ec5510722bd3428a7759d043a0da797e227fc;hp=0651e60393388b04b48f3c6dce8960d396676d9b;hb=775f3982a813c7abd929b9b6c8888121883483c0;hpb=387897cc5fd5731585cbd0fdb96061faab73720f

diff --git a/freetype.spec b/freetype.spec
index 0651e60..ad9ec55 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,9 +1,12 @@
+# TODO:
+# - demos seem to use installed headers instead of these coming from new tarball
 #
 # Conditional build:
 %bcond_without	lcd		# without LCD subpixel color filtering (Microsoft patents in USA)
 %bcond_without	x11		# don't build examples (X11-based)
+%bcond_without	harfbuzz	# harfbuzz based autohinting
 %bcond_without	apidocs         # disable api docs
-#
+
 Summary:	TrueType font rasterizer
 Summary(es.UTF-8):	Biblioteca de render 3D de fuentes TrueType
 Summary(ko.UTF-8):	자유롭게 어디든 쓸 수 있는 트루타입 글꼴을 다루는 엔진
@@ -12,22 +15,27 @@ Summary(pt_BR.UTF-8):	Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):	Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):	Растеризатор шрифтів TrueType
 Name:		freetype
-Version:	2.4.3
+Version:	2.6
 Release:	1
 Epoch:		1
-License:	GPL or FTL
+License:	GPL v2 or FTL
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5:	75ac7082bde7b3805dc5d6bc806fa045
-Source1:	http://dl.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5:	79a0fa0444eb7f2f46e75cae74c0772d
-Source2:	http://dl.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5:	ffc0152660b96ba2126926860e6d7bcc
+Source0:	http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5:	5682890cb0267f6671dd3de6eabd3e69
+Source1:	http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5:	f456b7ead3c351c7c218bb3afd45803c
+Source2:	http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5:	c6c209b37f10621d6ff100620b8292b4
+Patch0:		%{name}-2.2.1-enable-valid.patch
 URL:		http://www.freetype.org/
 BuildRequires:	automake
+BuildRequires:	bzip2-devel
+%{?with_harfbuzz:BuildRequires:	harfbuzz-devel >= 0.9.19}
+BuildRequires:	libpng-devel
 BuildRequires:	python
 BuildRequires:	python-modules
 BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	sed >= 4.0
 %if "%{pld_release}" == "ac"
 %{?with_x11:BuildRequires:	XFree86-devel}
 %else
@@ -101,6 +109,9 @@ Summary(ru.UTF-8):	Библиотеки разработчика для freetype
 Summary(uk.UTF-8):	Бібліотеки програміста для freetype
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	bzip2-devel
+%{?with_harfbuzz:Requires:	harfbuzz-devel >= 0.9.19}
+Requires:	libpng-devel
 Requires:	zlib-devel
 Obsoletes:	freetype2-devel
 
@@ -187,17 +198,27 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
+
+# avoid propagating -L%{_libdir} through *.la
+%{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
 
 %build
-CFLAGS="%{rpmcflags} \
-%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} \
+%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
+-DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
+%{?with_harfbuzz:-DFT_CONFIG_OPTION_USE_HARFBUZZ} \
+" \
 %{__make} setup unix \
 	CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
 
+CC="%{__cc}" \
 %{__make} \
 	X11_LIB=%{?_x_libraries}
 
 %if %{with x11}
+CC="%{__cc}" \
 %{__make} -C ft2demos-* \
 	TOP_DIR=$(pwd) \
 	X11_LIB=%{?_x_libraries}
@@ -212,8 +233,10 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+ln -s . $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype
+
 %if %{with x11}
-install ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
+install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 %clean
@@ -235,9 +258,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfreetype.so
 %{_libdir}/libfreetype.la
 %{_includedir}/freetype2
-%{_includedir}/ft2build.h
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc
+%{_mandir}/man1/freetype-config.1*
 
 %if %{with apidocs}
 %files apidocs