freetype2-2.10.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12181 ec354946-7b23-47d6-9f5a-488ba84defc7

f/freetype2/freetype2-vl.spec

@@ -1,31 +1,32 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%bcond_with subpixel_rendering
-%define ver_majar 2.8.1
+%bcond_without subpixel_rendering
 
 Summary: FreeType 2 library
 Summary(ja): FreeType 2 ライブラリ
 Name: freetype2
-Version: %{ver_majar}
+Version: 2.10.1
 Release: 1%{?_dist_release}
 License: GPL/FTL dual license
 URL: http://www.freetype.org/
 Group: System Environment/Libraries
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source: freetype-%{version}.tar.bz2
-Source1: freetype-doc-%{ver_majar}.tar.bz2
-Source2: ft2demos-%{ver_majar}.tar.bz2
+Source: https://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz
+Source1: https://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.xz
+Source2: https://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.xz
 
-# enable subpixel rendering
-Patch21: freetype-2.3.0-enable-spr.patch
+# Enable subpixel rendering (ClearType)
+Patch0:  freetype-2.3.0-enable-spr.patch
 # Enable otvalid and gxvalid modules
-Patch46:  freetype-2.8.1-enable-valid.patch
-# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
-Patch89:  freetype-2.2.1-memcpy-fix.patch
-#Patch90:  freetype-2.5.4-pkgconfig.patch
+Patch1:  freetype-2.2.1-enable-valid.patch
+# Enable additional demos
+Patch2:  freetype-2.5.2-more-demos.patch
 
-Patch200: freetype-2.1.10-slight-embolden.patch
-Patch201: freetype-2.4.12-x86_64-invalid_outline.patch
+Patch3:  freetype-2.6.5-libtool.patch
+
+Patch5:  freetype-2.10.0-internal-outline.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -197,41 +198,63 @@ Requires:	%{name}-devel = %{version}-%{release}
 %description static
 This package contains the static library for %{name}
 
+
 %prep
 %setup -q -n freetype-%{version} -b 1 -a 2
 
 %if %{with subpixel_rendering}
-%patch21 -p1 -b .enable-spr
+%patch0  -p1 -b .enable-spr
 %endif
+%patch1  -p1 -b .enable-valid
 
-%patch46 -p1 -b .enable-valid
-%patch89 -p1 -b .memcpy
-#%patch90 -p1 -b .pkgconfig
+pushd ft2demos-%{version}
+%patch2  -p1 -b .more-demos
+popd
 
-%patch200 -p1 -b .slight-embolden
+%patch3 -p1 -b .libtool
+%patch5 -p1 -b .internal-outline
 
-#%ifarch x86_64
-#%patch201 -p1 -b .invalid_outline
-#%endif
 
 %build
 %configure
-%__make %{?_smp_mflags}
+%configure \
+           --with-zlib=yes \
+           --with-bzip2=yes \
+           --with-png=yes \
+           --enable-freetype-config \
+           --with-harfbuzz=no
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
+make %{?_smp_mflags}
 
 # Build demos
-pushd ft2demos-%{ver_majar}
+pushd ft2demos-%{version}
 make TOP_DIR=".."
 popd
 
+# Convert FTL.txt and example3.cpp to UTF-8
+pushd docs
+iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \
+touch -r FTL.TXT FTL.TXT.tmp && \
+mv FTL.TXT.tmp FTL.TXT
+
+iconv -f iso-8859-1 -t utf-8 < "tutorial/example3.cpp" > "tutorial/example3.cpp.utf8"
+touch -r tutorial/example3.cpp tutorial/example3.cpp.utf8 && \
+mv tutorial/example3.cpp.utf8 tutorial/example3.cpp
+popd
+
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+mkdir -p %{buildroot}/bin
+mkdir -p %{buildroot}%{_bindir}
+
 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
 
 for ftdemo in ftbench ftdump ftlint ftvalid ftdiff ftgamma ftgrid ftmulti ftstring ftview
 do
-  builds/unix/libtool --mode=install install -m 755 ft2demos-%{ver_majar}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
+  builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
 done
 
 ## remove unuse files
@@ -292,6 +315,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %endif
 
 %changelog
+* Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.1-1
+- new upstream release.
+- dropped all patches.
+- imported patches from rawhide.
+
 * Fri Jan 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.1-1
 - new upstream release.
 - updated Patch46.