diff options
Diffstat (limited to 'package/harfbuzz')
| -rw-r--r-- | package/harfbuzz/Makefile | 23 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/harfbuzz/patches/patch-src_harfbuzz_pc_in | 18 |
3 files changed, 17 insertions, 35 deletions
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 41711b0e4..12b640b83 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 1.4.2 +PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 -PKG_HASH:= 8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3 +PKG_HASH:= 810bcd3d22fae3c2c18c3688455abc1cd0d7fb2fae25404890b0d77e6443bd0a PKG_DESCR:= opentype text shaping engine PKG_SECTION:= libs/fonts -PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ +PKG_SITES:= https://github.com/harfbuzz/harfbuzz/archive/refs/tags/ PKG_DEPENDS:= cairo icu4c PKG_BUILDDEP:= cairo icu4c HOST_BUILDDEP:= cairo-host icu4c-host PKG_NEEDS:= c++ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,8 +24,19 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_LDFLAGS+= -lpthread -lrt -HOST_STYLE:= auto +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dfreetype=disabled \ + -Dtests=disabled + +host-postinstall: + $(CP) $(WRKBUILD)/meson-private/harfbuzz.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig/ harfbuzz-install: $(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib diff --git a/package/harfbuzz/patches/patch-Makefile_in b/package/harfbuzz/patches/patch-Makefile_in deleted file mode 100644 index 9ef495e70..000000000 --- a/package/harfbuzz/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- harfbuzz-1.2.3.orig/Makefile.in 2016-02-25 04:26:05.967296536 +0100 -+++ harfbuzz-1.2.3/Makefile.in 2016-04-03 19:27:12.062508784 +0200 -@@ -373,7 +373,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - NULL = - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src util test docs win32 -+SUBDIRS = src - EXTRA_DIST = \ - autogen.sh \ - harfbuzz.doap \ diff --git a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in deleted file mode 100644 index 291829515..000000000 --- a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in +++ /dev/null @@ -1,18 +0,0 @@ ---- harfbuzz-1.2.3.orig/src/harfbuzz.pc.in 2016-01-06 13:00:36.113138042 +0100 -+++ harfbuzz-1.2.3/src/harfbuzz.pc.in 2016-03-12 21:55:46.457327612 +0100 -@@ -1,13 +1,10 @@ - prefix=%prefix% --exec_prefix=%exec_prefix% --libdir=%libdir% --includedir=%includedir% - - Name: harfbuzz - Description: HarfBuzz text shaping library - Version: %VERSION% - --Libs: -L${libdir} -lharfbuzz -+Libs: -L${prefix}/lib -lharfbuzz - Libs.private: %libs_private% - Requires.private: %requires_private% --Cflags: -I${includedir}/harfbuzz -+Cflags: -I${prefix}/include/harfbuzz |