diff --git a/thirdparty/freetype2/HPKBUILD b/thirdparty/freetype2/HPKBUILD index 86a35a691c57109dcb99b719b98919f4adab0ced..1441ecef797af5674c8faa0844706cba515cc5f8 100644 --- a/thirdparty/freetype2/HPKBUILD +++ b/thirdparty/freetype2/HPKBUILD @@ -1,5 +1,19 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # Contributor: tyBrave # Maintainer: tyBrave + pkgname=freetype2 pkgver=2.13.0 pkgrel=0 @@ -7,7 +21,7 @@ pkgdesc="" url="https://sourceforge.net/projects/freetype" archs=("armeabi-v7a" "arm64-v8a") license=("GPL FTL") -depends=("zlib" "bzip2" "brotli" "libpng" "harfbuzz") +depends=("zlib" "bzip2" "brotli" "libpng") makedepends=() source="https://sourceforge.net/projects/freetype/files/$pkgname/$pkgver/freetype-$pkgver.tar.xz" @@ -53,7 +67,6 @@ check() { add_executable(freetype-cmake-test main.c)\n target_link_libraries(freetype-cmake-test PUBLIC $LYCIUM_ROOT/usr/$pkgname/$ARCH/lib/libfreetype.a)\n - target_link_libraries(freetype-cmake-test PUBLIC $LYCIUM_ROOT/usr/harfbuzz/$ARCH/lib/libharfbuzz.so)\n target_link_libraries(freetype-cmake-test PUBLIC $LYCIUM_ROOT/usr/brotli/$ARCH/lib/libbrotlidec.so)\n target_link_libraries(freetype-cmake-test PUBLIC $LYCIUM_ROOT/usr/bzip2/$ARCH/lib/libbz2.a)\n target_link_libraries(freetype-cmake-test PUBLIC $LYCIUM_ROOT/usr/libpng/$ARCH/lib/libpng.a)\n diff --git a/thirdparty/harfbuzz/HPKBUILD b/thirdparty/harfbuzz/HPKBUILD index a76d17bf16d96fb3f4968a91c53ddc2decae080f..9fa4edc0525bdf88ab3da8528dbf2be0db067d6b 100644 --- a/thirdparty/harfbuzz/HPKBUILD +++ b/thirdparty/harfbuzz/HPKBUILD @@ -1,4 +1,17 @@ -# Contributor: 小肉头君 +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Contributor: 小肉头君 , 城meto # Maintainer: 小肉头君 pkgname=harfbuzz @@ -8,16 +21,18 @@ pkgdesc="HarfBuzz text shaping engine." url="https://github.com/harfbuzz/harfbuzz" archs=("armeabi-v7a" "arm64-v8a") license=("Old MIT") -depends=() +depends=("freetype2") makedepends=() -source="https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +# 原仓地址: https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz, 因网络原因使用镜像 +source="https://gitee.com/lycium_pkg_mirror/$pkgname/repository/archive/$pkgver.zip" autounpack=true downloadpackage=true buildtools="configure" builddir=$pkgname-$pkgver -packagename=$builddir.tar.gz +packagename=$builddir.zip source envset.sh autogenflag=true @@ -46,8 +61,8 @@ prepare() { build() { cd $builddir/$ARCH-build - ../configure "$@" --host=$host --with-freetype=no --with-icu=no --with-glib=no -with-cairo=no --enable-static > `pwd`/build.log 2>&1 - make -j4 >> `pwd`/build.log 2>&1 + PKG_CONFIG_PATH=${pkgconfigpath} ../configure "$@" --host=$host --with-freetype=yes --with-icu=no --with-glib=no -with-cairo=no --enable-static > `pwd`/build.log 2>&1 + make -j4 VERBOSE=1 >> `pwd`/build.log 2>&1 ret=$? cd $OLDPWD return $ret diff --git a/thirdparty/harfbuzz/SHA512SUM b/thirdparty/harfbuzz/SHA512SUM index 4ef719855f9fa0a4cf601f9638885bd9dee60683..63c1d0a81e2b776803a6cd04a159b09ff2bf260f 100644 --- a/thirdparty/harfbuzz/SHA512SUM +++ b/thirdparty/harfbuzz/SHA512SUM @@ -1 +1 @@ -aaef6801c73492624f19dececd956c03fda82a441b81553dfcd0bd47e5120b1d61acfef422a6cd0ded490d16ee4ee9088abdc0faba2a84884905e7cd63fe59d6 harfbuzz-7.1.0.tar.gz +7a51be0c3ac58731505878d9b2b656c7daece0b5151e5da7025a6b21c375de65b21df53622961cb747bac5e0d69b7045396334263706c56c4d4c97f7b7b2ef1e harfbuzz-7.1.0.zip