Browse Source

freetype2: update to 2.4.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1372 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
03ff49a3ea
1 changed files with 11 additions and 9 deletions
  1. 11 9
      f/freetype2/freetype2-vl.spec

+ 11 - 9
f/freetype2/freetype2-vl.spec

@@ -1,11 +1,11 @@
-%define enable_bytecode_interpreter 0
-%define enable_subpixel_rendering 0
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
+%bcond_with subpixel_rendering
+
 Summary: FreeType 2 library
 Summary(ja): FreeType 2 ライブラリ
 Name: freetype2
-Version: 2.3.12
+Version: 2.4.0
 Release: 1%{?_dist_release}
 License: GPL/FTL dual license
 URL: http://www.freetype.org/
@@ -15,8 +15,6 @@ Source: freetype-%{version}.tar.bz2
 Source1: freetype-doc-%{version}.tar.bz2
 Source2: ft2demos-%{version}.tar.bz2
 
-# enable bytecode interpreter
-Patch20: freetype-2.1.10-enable-bci.patch
 # enable subpixel rendering
 Patch21: freetype-2.3.0-enable-spr.patch
 # Enable otvalid and gxvalid modules
@@ -197,10 +195,8 @@ This package contains the static library for %{name}
 
 %prep
 %setup -q -n freetype-%{version} -b 1 -a 2
-%if %{enable_bytecode_interpreter}
-%patch20 -p1 -b .enable-bci
-%endif
-%if %{enable_subpixel_rendering}
+
+%if %{with subpixel_rendering}
 %patch21 -p1 -b .enable-spr
 %endif
 
@@ -292,6 +288,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %endif
 
 %changelog
+* Thu Jul 15 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.4.0-1
+- new upstream release
+
+* Sun May 09 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.3.12-2
+- enable bytecode interpreter, the patent is now expired.
+
 * Tue Feb 16 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.3.12-1
 - new upstream release