Browse Source

freetype: update to 2.11.0

Remove upstreamed patches.

Switch to AUTORELEASE for simplicity.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 3 years ago
parent
commit
2fdd8dbcb1
4 changed files with 4 additions and 108 deletions
  1. +4
    -4
      libs/freetype/Makefile
  2. +0
    -37
      libs/freetype/patches/010-meson.patch
  3. +0
    -11
      libs/freetype/patches/020-distutils.patch
  4. +0
    -56
      libs/freetype/patches/030-meson-pkgconfig.patch

+ 4
- 4
libs/freetype/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=freetype
PKG_VERSION:=2.10.4
PKG_RELEASE:=2
PKG_VERSION:=2.11.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/freetype
PKG_HASH:=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
PKG_HASH:=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later
@ -39,7 +39,7 @@ define Package/libfreetype/description
endef
MESON_ARGS += \
-Dzlib=system \
-Dzlib=enabled \
-Dbzip2=disabled \
-Dpng=enabled \
-Dharfbuzz=disabled \


+ 0
- 37
libs/freetype/patches/010-meson.patch View File

@ -1,37 +0,0 @@
From 40c5681ab92e7db1298273ccf3c816e6a1498260 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Mon, 26 Oct 2020 18:09:56 +0100
Subject: [PATCH] * meson.build: Fix 'harfbuzz' and 'brotli' build options
(#59347).
Without this patch, 'harfbuzz' and 'brotli' are always required.
Patch submitted anonymously in Savannah bug report.
---
meson.build | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/meson.build
+++ b/meson.build
@@ -267,13 +267,17 @@ ft2_deps += [libpng_dep]
harfbuzz_dep = dependency('harfbuzz',
version: '>= 1.8.0',
required: get_option('harfbuzz'))
-ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
-ft2_deps += [harfbuzz_dep]
+if harfbuzz_dep.found()
+ ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
+ ft2_deps += [harfbuzz_dep]
+endif
# Brotli decompression support
brotli_dep = dependency('libbrotlidec', required: get_option('brotli'))
-ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BROTLI']
-ft2_deps += [brotli_dep]
+if brotli_dep.found()
+ ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BROTLI']
+ ft2_deps += [brotli_dep]
+endif
# We can now generate `ftoption.h`.
ftoption_h = custom_target('ftoption.h',

+ 0
- 11
libs/freetype/patches/020-distutils.patch View File

@ -1,11 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ project('freetype2', 'c',
# running an external command is required.
python = import('python')
-python_exe = python.find_installation(required: true)
+python_exe = 'python3'
ft2_version = run_command(python_exe,
files('builds/meson/extract_freetype_version.py'),

+ 0
- 56
libs/freetype/patches/030-meson-pkgconfig.patch View File

@ -1,56 +0,0 @@
From 26e2a89598d69c7aba76c83f6a1fcf1db17574ab Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 4 Nov 2020 21:00:22 +0100
Subject: [PATCH] * meson.build: Fix .pc file generation.
For backwards compatibility we need the libtool version, not the .so
number.
Reported by Nikolaus.
Downloaded from upstream commit:
https://gitlab.freedesktop.org/freetype/freetype/-/commit/26e2a89598d69c7aba76c83f6a1fcf1db17574ab
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
ChangeLog | 9 +++++++++
meson.build | 10 +++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
--- a/meson.build
+++ b/meson.build
@@ -32,11 +32,15 @@ ft2_version = run_command(python_exe,
files('builds/meson/extract_freetype_version.py'),
files('include/freetype/freetype.h')).stdout().strip()
-ft2_libtool_version = run_command(python_exe,
+ft2_so_version = run_command(python_exe,
files('builds/meson/extract_libtool_version.py'),
'--soversion',
files('builds/unix/configure.raw')).stdout().strip()
+ft2_libtool_version = run_command(python_exe,
+ files('builds/meson/extract_libtool_version.py'),
+ files('builds/unix/configure.raw')).stdout().strip()
+
ft2_includes = include_directories('include')
@@ -320,7 +324,7 @@ ft2_lib = library('freetype',
include_directories: ft2_includes,
dependencies: ft2_deps,
install: true,
- version: ft2_libtool_version,
+ version: ft2_so_version,
)
@@ -328,7 +332,7 @@ ft2_lib = library('freetype',
freetype2_dep = declare_dependency(
include_directories: ft2_includes,
link_with: ft2_lib,
- version: ft2_libtool_version)
+ version: ft2_so_version)
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,

Loading…
Cancel
Save