diff --git a/media-libs/freetype/freetype-2.11.0.recipe b/media-libs/freetype/freetype-2.11.1.recipe similarity index 89% rename from media-libs/freetype/freetype-2.11.0.recipe rename to media-libs/freetype/freetype-2.11.1.recipe index 7975c170d..936b603d0 100644 --- a/media-libs/freetype/freetype-2.11.0.recipe +++ b/media-libs/freetype/freetype-2.11.1.recipe @@ -3,15 +3,14 @@ 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="https://www.freetype.org/" -COPYRIGHT="1996-2018 David Turner, Robert Wilhelm, Werner Lemberg, et al." +COPYRIGHT="1996-2021 David Turner, Robert Wilhelm, Werner Lemberg, et al." LICENSE="FreeType" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.xz" -CHECKSUM_SHA256="8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7" +CHECKSUM_SHA256="3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8" PATCHES=" enable-validation-modules.patchset - use-includedir.patchset - gcc2-buildfix.patchset + python3.patch " #PATCHES="freetype-subpixel.patchset" # enable patented subpixel rendering @@ -20,7 +19,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" freetype$secondaryArchSuffix = $portVersion - lib:libfreetype$secondaryArchSuffix = 6.18.0 compat >= 6 + lib:libfreetype$secondaryArchSuffix = 6.18.1 compat >= 6 " REQUIRES=" haiku$secondaryArchSuffix @@ -37,7 +36,7 @@ fi PROVIDES_devel=" freetype${secondaryArchSuffix}_devel = $portVersion - devel:libfreetype${secondaryArchSuffix} = 6.18.0 compat >= 6 + devel:libfreetype${secondaryArchSuffix} = 6.18.1 compat >= 6 " REQUIRES_devel=" freetype${secondaryArchSuffix} == $portVersion base @@ -73,7 +72,7 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage freetype$secondaryArchSuffix \ - $libDir/libfreetype.so.6.18.0 + $libDir/libfreetype.so.6.18.1 BUILD() { diff --git a/media-libs/freetype/patches/gcc2-buildfix.patchset b/media-libs/freetype/patches/gcc2-buildfix.patchset deleted file mode 100644 index 89497b696..000000000 --- a/media-libs/freetype/patches/gcc2-buildfix.patchset +++ /dev/null @@ -1,32 +0,0 @@ -From 037ec5401d0a598c8a208bc5fddd051e0e33b8c2 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 26 Nov 2021 12:13:26 +0100 -Subject: [PATCH] gcc2 fix - ---- - src/smooth/ftgrays.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c -index 86118fb..354ff7e 100644 ---- a/src/smooth/ftgrays.c -+++ b/src/smooth/ftgrays.c -@@ -1959,6 +1959,7 @@ typedef ptrdiff_t FT_PtrDist; - /* Initialize the null cell at the start of the `cells` array. */ - /* Note that this requires `ras.cell_free` initialization to skip */ - /* over the first entry in the array. */ -+{ - PCell null_cell = NULL_CELL_PTR( ras ); - null_cell->x = CELL_MAX_X_VALUE; - null_cell->area = 0; -@@ -2023,6 +2024,7 @@ typedef ptrdiff_t FT_PtrDist; - } - - return Smooth_Err_Ok; -+} - } - - --- -2.30.2 - diff --git a/media-libs/freetype/patches/use-includedir.patchset b/media-libs/freetype/patches/use-includedir.patchset deleted file mode 100644 index 7773835f4..000000000 --- a/media-libs/freetype/patches/use-includedir.patchset +++ /dev/null @@ -1,74 +0,0 @@ -From dfbbabf282d5fe93b44fece1a21e8cfe68f81307 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 26 Nov 2021 10:35:39 +0100 -Subject: [PATCH] Haiku: use includedir where possible - -switch to python3 ---- - builds/meson/extract_freetype_version.py | 2 +- - meson.build | 15 ++++++--------- - 2 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/builds/meson/extract_freetype_version.py b/builds/meson/extract_freetype_version.py -index ab79fdb..fa83e9d 100644 ---- a/builds/meson/extract_freetype_version.py -+++ b/builds/meson/extract_freetype_version.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (C) 2020-2021 by - # David Turner, Robert Wilhelm, and Werner Lemberg. -diff --git a/meson.build b/meson.build -index 0eb780b..7c4ce3c 100644 ---- a/meson.build -+++ b/meson.build -@@ -59,7 +59,7 @@ ftmodule_h = custom_target('ftmodule.h', - command: [python_exe, files('builds/meson/parse_modules_cfg.py'), - '--format=ftmodule.h', '@INPUT@', '--output', '@OUTPUT@'], - install: true, -- install_dir: 'include/freetype2/freetype/config', -+ install_dir: get_option('includedir') + '/freetype2/freetype/config', - ) - ft2_sources = [ftmodule_h] - -@@ -303,7 +303,7 @@ ftoption_h = custom_target('ftoption.h', - output: 'ftoption.h', - command: ftoption_command, - install: true, -- install_dir: 'include/freetype2/freetype/config', -+ install_dir: get_option('includedir') + '/freetype2/freetype/config', - ) - ft2_sources += ftoption_h - ft2_defines += ['-DFT_CONFIG_OPTIONS_H='] -@@ -330,7 +330,7 @@ if use_unix_ftsystem_c - output: 'ftconfig.h', - command: ftconfig_command, - install: true, -- install_dir: 'include/freetype2/freetype/config', -+ install_dir: get_option('includedir') + '/freetype2/freetype/config', - ) - ft2_sources += ftconfig_h - ft2_defines += ['-DFT_CONFIG_CONFIG_H='] -@@ -357,15 +357,12 @@ freetype_dep = declare_dependency( - meson.override_dependency('freetype2', freetype_dep) - - --# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below, --# i.e., the subdir value seems to be ignored, contrary to examples in the --# Meson documentation. - install_headers('include/ft2build.h', -- install_dir: 'include/freetype2') -+ subdir: 'freetype2') - install_headers(ft2_public_headers, -- install_dir: 'include/freetype2/freetype') -+ subdir: 'freetype2/freetype') - install_headers(ft2_config_headers, -- install_dir: 'include/freetype2/freetype/config') -+ subdir: 'freetype2/freetype/config') - - - pkgconfig = import('pkgconfig') --- -2.30.2 -