diff --git a/ohos/build_ohos_arm64.py b/ohos/build_ohos_arm64.py index 0fec6b1bfec..3bc5e0e06e6 100644 --- a/ohos/build_ohos_arm64.py +++ b/ohos/build_ohos_arm64.py @@ -33,7 +33,7 @@ if __name__ == '__main__': run_build_cmd = 'PKG_CONFIG_PATH=./pkgconfig ' run_build_cmd += 'meson setup '+ sys.argv[3] + ' build-ohos ' - run_build_cmd += '-Dplatforms=ohos -Degl-native-platform=ohos -Ddri-drivers= -Dgallium-drivers=panfrost \ + run_build_cmd += '-Dplatforms=ohos -Degl-native-platform=ohos -Dgallium-drivers=panfrost \ -Dvulkan-drivers= -Dgbm=enabled -Degl=enabled -Dgles1=enabled -Dgles2=enabled -Dcpp_rtti=false -Dglx=disabled -Dtools=panfrost -Ddri-search-path=/vendor/lib64/chipsetsdk ' run_build_cmd += '--cross-file=cross_file ' run_build_cmd += '--prefix=' + os.getcwd() + '/build-ohos/install' diff --git a/ohos/pkgconfig_template/libjpeg.pc b/ohos/pkgconfig_template/libjpeg.pc index cc091dcfb9b..3ef5838d2fc 100644 --- a/ohos/pkgconfig_template/libjpeg.pc +++ b/ohos/pkgconfig_template/libjpeg.pc @@ -1,6 +1,6 @@ ohos_project_dir=ohos_project_directory_stub -libdir=${ohos_project_dir}/out/ohos-arm-release/obj/third_party/libjpeg-turbo/ -includedir=${ohos_project_dir}/third_party/libjpeg-turbo +libdir=${ohos_project_dir}/out/ohos-arm-release/obj/third_party/libjpeg/ +includedir=${ohos_project_dir}/third_party/libjpeg Name: jpeg Description: jpeg diff --git a/ohos/pkgconfig_template/libpng.pc b/ohos/pkgconfig_template/libpng.pc index 6f534c961ee..54b6fc6abc6 100644 --- a/ohos/pkgconfig_template/libpng.pc +++ b/ohos/pkgconfig_template/libpng.pc @@ -1,5 +1,5 @@ ohos_project_dir=ohos_project_directory_stub -libdir=${ohos_project_dir}/out/ohos-arm-release/thirdparty/libpng/ +libdir=${ohos_project_dir}/out/ohos-arm-release/common/graphic_2d/ includedir=${ohos_project_dir}/third_party/libpng Name: png diff --git a/ohos/pkgconfig_template/libsurface.pc b/ohos/pkgconfig_template/libsurface.pc index 62fff8b0757..af31e40d6ba 100644 --- a/ohos/pkgconfig_template/libsurface.pc +++ b/ohos/pkgconfig_template/libsurface.pc @@ -1,6 +1,6 @@ ohos_project_dir=ohos_project_directory_stub libdir=${ohos_project_dir}/out/ohos-arm-release/graphic/graphic_surface/ -includedir=${ohos_project_dir}/out/ohos-arm-release/innerkits/ohos-x86_64/graphic_surface/surface/include/ +includedir=${ohos_project_dir}/out/ohos-arm-release/innerkits/ohos-arm/graphic_surface/surface/include/ Name: libsurface Version: 2.4.1 diff --git a/ohos/pkgconfig_template/libudev.pc b/ohos/pkgconfig_template/libudev.pc index b078feb46d5..2ec44585492 100644 --- a/ohos/pkgconfig_template/libudev.pc +++ b/ohos/pkgconfig_template/libudev.pc @@ -1,9 +1,9 @@ ohos_project_dir=ohos_project_directory_stub -libdir=${ohos_project_dir}/out/ohos-arm-release/obj/foundation/multimodalinput/input/libudev/ -includedir=${ohos_project_dir}/foundation/multimodalinput/input/libudev/include/ +libdir=${ohos_project_dir}/out/ohos-arm-release/packages/phone/system/lib/ +includedir=${ohos_project_dir}/third_party/eudev/export_include -Name: udev -Description: udev +Name: eudev +Description: eudev Version: 2.5.109 -Libs: -L${libdir} -lmmi_libudev +Libs: -L${libdir} -ludev.z Cflags: -I${includedir} \ No newline at end of file