From 89fa8c27fe7ecd0f30955ecf8d5f8d41b889fa95 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 5 Sep 2014 16:03:51 +0400 Subject: [PATCH] freetype: add patch to enable subpixel rendering and subpixel hinting... * currently commented out * remove old recepies and patch --- media-libs/freetype/freetype-2.4.9.recipe | 68 ---------------- media-libs/freetype/freetype-2.5.2.recipe | 79 ------------------- media-libs/freetype/freetype-2.5.3.recipe | 2 + ...etype_with_subpixel_rendering-2.4.9.recipe | 24 ------ ....4.9_with_subpixel_rendering_enabled.patch | 12 --- .../freetype/patches/freetype-2.5.3.patchset | 31 ++++++++ 6 files changed, 33 insertions(+), 183 deletions(-) delete mode 100644 media-libs/freetype/freetype-2.4.9.recipe delete mode 100644 media-libs/freetype/freetype-2.5.2.recipe delete mode 100644 media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe delete mode 100644 media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch create mode 100644 media-libs/freetype/patches/freetype-2.5.3.patchset diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe deleted file mode 100644 index 83847869c..000000000 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY="A Free, High-Quality, and Portable Font Engine" -DESCRIPTION=" -FreeType is written in C, designed to be small, efficient, highly \ -customizable, and portable while capable of producing high-quality output \ -(glyph images) of most vector and bitmap font formats. -" -HOMEPAGE="http://www.freetype.org" -LICENSE="FreeType" -COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" -CHECKSUM_SHA256="c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9" -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - freetype$secondaryArchSuffix = $portVersion - lib:libfreetype$secondaryArchSuffix = 6.8.1 compat >= 6 - " -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libz$secondaryArchSuffix >= 1 - " -BUILD_REQUIRES=" - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - " - -BUILD() -{ - ./autogen.sh - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libfreetype - fixPkgconfig - - # devel package - packageEntries devel \ - $binDir \ - $dataRootDir/aclocal \ - $developDir -} - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - freetype${secondaryArchSuffix}_devel = $portVersion - cmd:freetype_config${secondaryArchSuffix} = $portVersion - devel:libfreetype${secondaryArchSuffix} = 6.8.1 compat >= 6 - " -REQUIRES_devel=" - freetype${secondaryArchSuffix} == $portVersion base - " diff --git a/media-libs/freetype/freetype-2.5.2.recipe b/media-libs/freetype/freetype-2.5.2.recipe deleted file mode 100644 index 804038989..000000000 --- a/media-libs/freetype/freetype-2.5.2.recipe +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY="A Free, High-Quality, and Portable Font Engine" -DESCRIPTION=" -FreeType is written in C, designed to be small, efficient, highly \ -customizable, and portable while capable of producing high-quality output \ -(glyph images) of most vector and bitmap font formats. -" -HOMEPAGE="http://www.freetype.org" -LICENSE="FreeType" -COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.5.2.tar.bz2" -CHECKSUM_SHA256="4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def" -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - freetype$secondaryArchSuffix = $portVersion - lib:libfreetype$secondaryArchSuffix = 6.11.1 compat >= 6 - " -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libbz2$secondaryArchSuffix - lib:libz$secondaryArchSuffix >= 1 - lib:libpng$secondaryArchSuffix - " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtool >= 2.4.2 - cmd:make - cmd:which - " - -BUILD() -{ - ./autogen.sh - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libfreetype - fixPkgconfig - - # Freetype headers are in a freetype2 subdirectory, but fixPkgconfig removes - # that from the pkg-config file, making it difficult for other ports to use - # freetype with pkg-config. - sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/freetype2," \ - $developLibDir/pkgconfig/freetype2.pc - - # devel package - packageEntries devel \ - $binDir \ - $dataRootDir/aclocal \ - $developDir -} - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - freetype${secondaryArchSuffix}_devel = $portVersion - cmd:freetype_config${secondaryArchSuffix} = $portVersion - devel:libfreetype${secondaryArchSuffix} = 6.11.1 compat >= 6 - " -REQUIRES_devel=" - freetype${secondaryArchSuffix} == $portVersion base - " diff --git a/media-libs/freetype/freetype-2.5.3.recipe b/media-libs/freetype/freetype-2.5.3.recipe index 250d574cf..8e3287595 100644 --- a/media-libs/freetype/freetype-2.5.3.recipe +++ b/media-libs/freetype/freetype-2.5.3.recipe @@ -13,6 +13,8 @@ REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +#PATCHES="freetype-$portVersion.patchset" + PROVIDES=" freetype$secondaryArchSuffix = $portVersion lib:libfreetype$secondaryArchSuffix = 6.11.2 compat >= 6 diff --git a/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe b/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe deleted file mode 100644 index 5c2a3adf1..000000000 --- a/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" -CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd freetype-2.4.9 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=/boot/develop/headers/3rdparty \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL() -{ - cd freetype-2.4.9 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch b/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch deleted file mode 100644 index 407d769c7..000000000 --- a/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN freetype-2.4.9/include/freetype/config/ftoption.h freetype-2.4.9-enable-subpixel-rendering/include/freetype/config/ftoption.h ---- freetype-2.4.9/include/freetype/config/ftoption.h 2011-07-20 04:46:15.035913728 +0000 -+++ freetype-2.4.9-enable-subpixel-rendering/include/freetype/config/ftoption.h 2012-09-05 16:30:50.453509120 +0000 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/media-libs/freetype/patches/freetype-2.5.3.patchset b/media-libs/freetype/patches/freetype-2.5.3.patchset new file mode 100644 index 000000000..ac0c3fc9e --- /dev/null +++ b/media-libs/freetype/patches/freetype-2.5.3.patchset @@ -0,0 +1,31 @@ +From 5dc597d69f711c41cb6c6e48276e0ef5eade1375 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Fri, 5 Sep 2014 15:43:17 +0400 +Subject: Enabling subpixel rendering and subpixel hinting + + +diff --git a/include/config/ftoption.h b/include/config/ftoption.h +index 5b11f0e..5042c23 100644 +--- a/include/config/ftoption.h ++++ b/include/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ +@@ -604,7 +604,7 @@ FT_BEGIN_HEADER + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + + /*************************************************************************/ +-- +1.8.3.4 +