From 3c1d62c724cb064ff908e962aa04d10ce6c15aeb Mon Sep 17 00:00:00 2001 From: zhang-xiaobo1997 Date: Wed, 9 Mar 2022 11:38:42 +0800 Subject: [PATCH 1/2] modify for compile Signed-off-by: zhang-xiaobo1997 --- BUILD.gn | 6 +++--- libexif/i18n.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 222bdd2..512c65d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -129,7 +129,7 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera ohos_shared_library("libexif") { deps = [ ":exif_static" ] - subsystem_name = "common" + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" } -} - +} \ No newline at end of file diff --git a/libexif/i18n.h b/libexif/i18n.h index 86a4e5f..5ab4463 100644 --- a/libexif/i18n.h +++ b/libexif/i18n.h @@ -23,7 +23,7 @@ #include "config.h" -#ifdef ENABLE_NLS +#ifdef ENABLE_NLS_NEW # include # undef _ # define _(String) dgettext (GETTEXT_PACKAGE, String) -- Gitee From 07050a74adfd7125b3f5cf0d08446b692dcada73 Mon Sep 17 00:00:00 2001 From: zhang-xiaobo1997 Date: Wed, 9 Mar 2022 20:27:46 +0800 Subject: [PATCH 2/2] modify for format Signed-off-by: zhang-xiaobo1997 --- BUILD.gn | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 512c65d..229bba1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -4,7 +4,7 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera import("//build/lite/config/component/lite_component.gni") config("libexif_config") { - include_dirs = [ + include_dirs = [ "//third_party/libexif", "//third_party/libexif/libexif", "//third_party/libexif/libexif/pentax", @@ -13,11 +13,9 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera "//third_party/libexif/libexif/fuji", "//third_party/libexif/libexif/apple", "//third_party/libexif/contrib/watcom", - ] - - libexif_source = [ + libexif_source = [ "//third_party/libexif/libexif/exif-byte-order.c", "//third_party/libexif/libexif/exif-content.c", "//third_party/libexif/libexif/exif-data.c", @@ -46,13 +44,12 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera "//third_party/libexif/libexif/apple/exif-mnote-data-apple.c", "//third_party/libexif/libexif/apple/mnote-apple-entry.c", "//third_party/libexif/libexif/apple/mnote-apple-tag.c", - - ] - cflags = [ - "-DGETTEXT_PACKAGE=\"libexif-12\"", - "-DLOCALEDIR=\"//third_party/libexif/build/share/locale/locale\"", - ] -} + ] + cflags = [ + "-DGETTEXT_PACKAGE=\"libexif-12\"", + "-DLOCALEDIR=\"//third_party/libexif/build/share/locale/locale\"", + ] + } lite_library("libexif") { if (ohos_kernel_type == "liteos_m") { @@ -81,38 +78,36 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera ohos_source_set("exif_static") { sources = [ + "//third_party/libexif/libexif/apple/exif-mnote-data-apple.c", + "//third_party/libexif/libexif/apple/mnote-apple-entry.c", + "//third_party/libexif/libexif/apple/mnote-apple-tag.c", + "//third_party/libexif/libexif/canon/exif-mnote-data-canon.c", + "//third_party/libexif/libexif/canon/mnote-canon-entry.c", + "//third_party/libexif/libexif/canon/mnote-canon-tag.c", "//third_party/libexif/libexif/exif-byte-order.c", "//third_party/libexif/libexif/exif-content.c", "//third_party/libexif/libexif/exif-data.c", "//third_party/libexif/libexif/exif-entry.c", "//third_party/libexif/libexif/exif-format.c", + "//third_party/libexif/libexif/exif-gps-ifd.c", "//third_party/libexif/libexif/exif-ifd.c", "//third_party/libexif/libexif/exif-loader.c", "//third_party/libexif/libexif/exif-log.c", "//third_party/libexif/libexif/exif-mem.c", "//third_party/libexif/libexif/exif-mnote-data.c", - "//third_party/libexif/libexif/exif-gps-ifd.c", "//third_party/libexif/libexif/exif-tag.c", "//third_party/libexif/libexif/exif-utils.c", - "//third_party/libexif/libexif/pentax/exif-mnote-data-pentax.c", - "//third_party/libexif/libexif/pentax/mnote-pentax-entry.c", - "//third_party/libexif/libexif/pentax/mnote-pentax-tag.c", - "//third_party/libexif/libexif/olympus/exif-mnote-data-olympus.c", - "//third_party/libexif/libexif/olympus/mnote-olympus-entry.c", - "//third_party/libexif/libexif/olympus/mnote-olympus-tag.c", "//third_party/libexif/libexif/fuji/exif-mnote-data-fuji.c", "//third_party/libexif/libexif/fuji/mnote-fuji-entry.c", "//third_party/libexif/libexif/fuji/mnote-fuji-tag.c", - "//third_party/libexif/libexif/canon/exif-mnote-data-canon.c", - "//third_party/libexif/libexif/canon/mnote-canon-entry.c", - "//third_party/libexif/libexif/canon/mnote-canon-tag.c", - "//third_party/libexif/libexif/apple/exif-mnote-data-apple.c", - "//third_party/libexif/libexif/apple/mnote-apple-entry.c", - "//third_party/libexif/libexif/apple/mnote-apple-tag.c", - - + "//third_party/libexif/libexif/olympus/exif-mnote-data-olympus.c", + "//third_party/libexif/libexif/olympus/mnote-olympus-entry.c", + "//third_party/libexif/libexif/olympus/mnote-olympus-tag.c", + "//third_party/libexif/libexif/pentax/exif-mnote-data-pentax.c", + "//third_party/libexif/libexif/pentax/mnote-pentax-entry.c", + "//third_party/libexif/libexif/pentax/mnote-pentax-tag.c", ] - include_dirs = [ + include_dirs = [ "//third_party/libexif", "//third_party/libexif/libexif", "//third_party/libexif/libexif/pentax", @@ -121,7 +116,6 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera "//third_party/libexif/libexif/fuji", "//third_party/libexif/libexif/apple", "//third_party/libexif/contrib/watcom", - ] configs = [ ":build_private_config" ] @@ -132,4 +126,4 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera subsystem_name = "multimedia" part_name = "multimedia_image_standard" } -} \ No newline at end of file +} -- Gitee