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..9fee2b07f69f9446a4c7208b7cd44d105a4b10d1 100644 --- a/thirdparty/harfbuzz/HPKBUILD +++ b/thirdparty/harfbuzz/HPKBUILD @@ -1,3 +1,15 @@ +# 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: 小肉头君 # Maintainer: 小肉头君 @@ -8,7 +20,7 @@ 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" @@ -20,11 +32,9 @@ builddir=$pkgname-$pkgver packagename=$builddir.tar.gz source envset.sh -autogenflag=true host= prepare() { - mkdir -p $builddir/$ARCH-build if [ $ARCH == "armeabi-v7a" ] then setarm32ENV @@ -35,18 +45,16 @@ prepare() { setarm64ENV host=aarch64-linux fi - if $autogenflag - then - cd $builddir - ./autogen.sh > `pwd`/build.log 2>&1 - cd $OLDPWD - autogenflag=false - fi + mkdir -p $builddir/$ARCH-build + # autogen可直接生产Makefile, 应直接生成到编译目录 + cd $builddir/$ARCH-build + ../autogen.sh > `pwd`/build.log 2>&1 + cd $OLDPWD } 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 + 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 >> `pwd`/build.log 2>&1 ret=$? cd $OLDPWD