From e5457130ae58f0ecab41354abc200f46af95b4b5 Mon Sep 17 00:00:00 2001 From: lxh Date: Fri, 15 Nov 2024 11:20:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.fdk-aac=E5=BA=93=E7=9A=84hpkcheck?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9=202.=E6=94=B9=E4=B8=BAgitee=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/fdk-aac/HPKBUILD | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/thirdparty/fdk-aac/HPKBUILD b/thirdparty/fdk-aac/HPKBUILD index 19a9bfad..8d69af29 100644 --- a/thirdparty/fdk-aac/HPKBUILD +++ b/thirdparty/fdk-aac/HPKBUILD @@ -10,11 +10,12 @@ license=("LicenseRef-scancode-fraunhofer-fdk-aac-codec") depends=() makedepends=() -source="https://github.com/mstorsjo/$pkgname/archive/refs/tags/$pkgver.tar.gz" - +#source="https://github.com/mstorsjo/$pkgname/archive/refs/tags/$pkgver.tar.gz"github链接挂了 +source="https://gitee.com/lycium_pkg_mirror/fdk-aac/repository/archive/v2.0.2.tar.gz" autounpack=true downloadpackage=true -builddir=$pkgname-${pkgver:1} +#builddir=$pkgname-${pkgver:1} +builddir=$pkgname-v${pkgver:1} packagename=$builddir.tar.gz prepare() { @@ -23,16 +24,18 @@ prepare() { build() { cd $builddir - ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DBUILD_SHARED_LIBS=OFF -DBUILD_PROGRAMS=ON -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 - make -j4 -C $ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1 + PKG_CONFIG_LIBDIR="${pkgconfigpath}" ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" \ + -DBUILD_SHARED_LIBS=OFF -DBUILD_PROGRAMS=ON \ + -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > $buildlog 2>&1 + $MAKE VERBOSE=1 -C $ARCH-build >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret } package() { - cd $builddir - make -C $ARCH-build install >> `pwd`/$ARCH-build/build.log 2>&1 + cd $builddir/$ARCH-build + $MAKE VERBOSE=1 install >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret -- Gitee From dc7810ad38c116abc6e6a73214e26392fb53aa30 Mon Sep 17 00:00:00 2001 From: lxh Date: Fri, 15 Nov 2024 11:47:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=94=B9=E4=B8=BAgitee?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=90=8E=E7=9A=84sha512=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/fdk-aac/SHA512SUM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/fdk-aac/SHA512SUM b/thirdparty/fdk-aac/SHA512SUM index 7080b348..892ad46e 100644 --- a/thirdparty/fdk-aac/SHA512SUM +++ b/thirdparty/fdk-aac/SHA512SUM @@ -1 +1 @@ -616207e85035d1659a2b7808ca6ec02ef53c1c4b39eb280fe861f82a4cf548e5db2ac381c496bad37dfc2b8c6677fe704d9fd8449e43d1f93d3e636239e0191b fdk-aac-2.0.2.tar.gz +18e458c65b236ef19bea5320361b34d9ef147fd5a0d4cc4230d47cbf8f517f30533bac0b68dac43f2dcec695f9b1e7393b14709dbdc05ab1ccb33033cf334aa1 fdk-aac-v2.0.2.tar.gz -- Gitee From 572fc7fba8a93ff457839314a4c43c3790bddc60 Mon Sep 17 00:00:00 2001 From: lxh Date: Fri, 22 Nov 2024 07:57:57 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8A=8A=E7=89=88=E6=9C=AC=E7=94=A8?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9D=A5=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/fdk-aac/HPKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/fdk-aac/HPKBUILD b/thirdparty/fdk-aac/HPKBUILD index 8d69af29..8d2e45b7 100644 --- a/thirdparty/fdk-aac/HPKBUILD +++ b/thirdparty/fdk-aac/HPKBUILD @@ -11,7 +11,7 @@ depends=() makedepends=() #source="https://github.com/mstorsjo/$pkgname/archive/refs/tags/$pkgver.tar.gz"github链接挂了 -source="https://gitee.com/lycium_pkg_mirror/fdk-aac/repository/archive/v2.0.2.tar.gz" +source="https://gitee.com/lycium_pkg_mirror/fdk-aac/repository/archive/$pkgver.tar.gz" autounpack=true downloadpackage=true #builddir=$pkgname-${pkgver:1} -- Gitee From ba36be5202311da9d5eb24b1f84d11053908b565 Mon Sep 17 00:00:00 2001 From: lxh Date: Tue, 26 Nov 2024 02:23:53 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/fdk-aac/HPKBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/thirdparty/fdk-aac/HPKBUILD b/thirdparty/fdk-aac/HPKBUILD index 8d2e45b7..8e9f83b0 100644 --- a/thirdparty/fdk-aac/HPKBUILD +++ b/thirdparty/fdk-aac/HPKBUILD @@ -14,7 +14,6 @@ makedepends=() source="https://gitee.com/lycium_pkg_mirror/fdk-aac/repository/archive/$pkgver.tar.gz" autounpack=true downloadpackage=true -#builddir=$pkgname-${pkgver:1} builddir=$pkgname-v${pkgver:1} packagename=$builddir.tar.gz -- Gitee From beb3ba65c1d7f284d94f5fc3a202d458d4385188 Mon Sep 17 00:00:00 2001 From: lxh Date: Mon, 2 Dec 2024 02:25:39 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=9A1=E5=8D=B3?= =?UTF-8?q?=E5=8F=AF=E4=BF=9D=E7=95=99=E5=8E=9F=E6=9D=A5=E7=9A=84pkgver?= =?UTF-8?q?=E4=B8=AD=E7=9A=84v?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/fdk-aac/HPKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/fdk-aac/HPKBUILD b/thirdparty/fdk-aac/HPKBUILD index 8e9f83b0..9235bb30 100644 --- a/thirdparty/fdk-aac/HPKBUILD +++ b/thirdparty/fdk-aac/HPKBUILD @@ -14,7 +14,7 @@ makedepends=() source="https://gitee.com/lycium_pkg_mirror/fdk-aac/repository/archive/$pkgver.tar.gz" autounpack=true downloadpackage=true -builddir=$pkgname-v${pkgver:1} +builddir=$pkgname-${pkgver} packagename=$builddir.tar.gz prepare() { -- Gitee