From a3209ea91478cc1369bfc66fa8851b93ed3e9eea Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Mon, 30 Aug 2021 10:45:11 +0200 Subject: [PATCH] Update build.sh --- build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index a454468..098d3f1 100644 --- a/build.sh +++ b/build.sh @@ -49,7 +49,7 @@ function build_mfx { } function build_aom { - git clone -q https://aomedia.googlesource.com/aom $SRC/libaom + git clone -q -b v3.1.2 https://aomedia.googlesource.com/aom $SRC/libaom cd $SRC/libaom rm -rf work mkdir work @@ -58,11 +58,12 @@ function build_aom { MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration="$MSBUILD_CONFIG" AOM.sln cp $MSBUILD_CONFIG/aom.lib $BUILD/lib/aom.lib cp -r ../aom $BUILD/include/aom + printf "prefix=$BUILD\nexec_prefix=\${prefix}\nincludedir=\${prefix}/include\nlibdir=\${exec_prefix}/lib\nName: aom\nVersion: 3.1.2\nLibs: -L\${libdir} -laom\nCflags: -I\${includedir}\n" > $BUILD/lib/pkgconfig/aom.pc #cmake -DAOM_CONFIG_DIR=. -DAOM_ROOT=.. -DCMAKE_INSTALL_PREFIX=@prefix@ -DCMAKE_PROJECT_NAME=aom -DCONFIG_MULTITHREAD=true -DHAVE_PTHREAD_H=false -P "../build/cmake/pkg_config.cmake" - sed -i "s#@prefix@#$BUILD#g" aom.pc - sed -i '/^Libs\.private.*/d' aom.pc + #sed -i "s#@prefix@#$BUILD#g" aom.pc + #sed -i '/^Libs\.private.*/d' aom.pc #sed -i 's/-lm//' aom.pc - cp aom.pc $BUILD/lib/pkgconfig/aom.pc + #cp aom.pc $BUILD/lib/pkgconfig/aom.pc add_comp libaom }