summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKwang Son <k.son@samsung.com>2020-05-13 16:57:17 +0900
committerKwang Son <k.son@samsung.com>2020-05-13 16:57:17 +0900
commit2dd0e29b093e597bf7d899ff9f5f16f01276335e (patch)
tree6c8fd67a2abb2ba2c05832bc06cefbc1d14d90d4
parent05ee1c400fa1e912b7d94c2f1c4f8369ded9f0df (diff)
downloadmediavision-2dd0e29b093e597bf7d899ff9f5f16f01276335e.tar.gz
mediavision-2dd0e29b093e597bf7d899ff9f5f16f01276335e.tar.bz2
mediavision-2dd0e29b093e597bf7d899ff9f5f16f01276335e.zip
Add capi-media-vision-common.pcsubmit/tizen/20200514.015807
capi-media-vision-common.pc was not exist Change-Id: Ida62970d0dc22c0f20fec4b2d708c956a59bbab0 Signed-off-by: Kwang Son <k.son@samsung.com>
-rw-r--r--CMakeLists.txt12
-rw-r--r--packaging/capi-media-vision.spec49
2 files changed, 37 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72c23951..b7fcd3fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,6 +194,18 @@ CONFIGURE_FILE(
)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+SET(PC_NAME ${fw_name}-common)
+SET(PC_LDFLAGS "-l${MV_COMMON_LIB_NAME}")
+CONFIGURE_FILE(
+ ${fw_name}.pc.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-common.pc
+ @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-common.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+# now all sub package dependent common
+SET(PC_REQUIRED ${fw_name}-common)
+
SET(PC_NAME ${fw_name}-barcode)
SET(PC_LDFLAGS "-l${MV_BARCODE_DETECTOR_LIB_NAME} -l${MV_BARCODE_GENERATOR_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
CONFIGURE_FILE(
diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index e5d97a23..2fdf73f4 100644
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -60,7 +60,7 @@ Media Vision common library for Tizen Native API.
%package common-devel
Summary: Multimedia Vision common Library
Group: Multimedia/Framework
-Requires: capi-media-vision-common
+Requires: %{name}-common
%description common-devel
Media Vision common library for Tizen Native API (DEV).
@@ -68,7 +68,7 @@ Media Vision common library for Tizen Native API (DEV).
%package barcode
Summary: Multimedia Vision Barcode Library
Group: Multimedia/Framework
-Requires: capi-media-vision-common
+Requires: %{name}-common
%description barcode
Media Vision barcode library for Tizen Native API.
@@ -76,8 +76,8 @@ Media Vision barcode library for Tizen Native API.
%package barcode-devel
Summary: Multimedia Vision Barcode Library
Group: Multimedia/Framework
-Requires: capi-media-vision-barcode
-Requires: capi-media-vision-common-devel
+Requires: %{name}-barcode
+Requires: %{name}-common-devel
%description barcode-devel
Media Vision barcode library for Tizen Native API (DEV).
@@ -85,7 +85,7 @@ Media Vision barcode library for Tizen Native API (DEV).
%package face
Summary: Multimedia Vision Library
Group: Multimedia/Framework
-Requires: capi-media-vision-common
+Requires: %{name}-common
%description face
Media Vision face library for Tizen Native API.
@@ -93,8 +93,8 @@ Media Vision face library for Tizen Native API.
%package face-devel
Summary: Multimedia Vision Face Library (DEV)
Group: Multimedia/Framework
-Requires: capi-media-vision-face
-Requires: capi-media-vision-common-devel
+Requires: %{name}-face
+Requires: %{name}-common-devel
%description face-devel
Media Vision face library for Tizen Native API (DEV).
@@ -102,7 +102,7 @@ Media Vision face library for Tizen Native API (DEV).
%package image
Summary: Multimedia Vision Image Library
Group: Multimedia/Framework
-Requires: capi-media-vision-common
+Requires: %{name}-common
%description image
Media Vision Image library for Tizen Native API.
@@ -110,8 +110,8 @@ Media Vision Image library for Tizen Native API.
%package image-devel
Summary: Multimedia Vision Image Library
Group: Multimedia/Framework
-Requires: capi-media-vision-image
-Requires: capi-media-vision-common-devel
+Requires: %{name}-image
+Requires: %{name}-common-devel
%description image-devel
Media Vision Image library for Tizen Native API (DEV).
@@ -119,7 +119,7 @@ Media Vision Image library for Tizen Native API (DEV).
%package surveillance
Summary: Multimedia Vision Surveillance Library
Group: Multimedia/Framework
-Requires: capi-media-vision-face
+Requires: %{name}-face
%description surveillance
Media Vision Surveillance library for Tizen Native API.
@@ -127,8 +127,8 @@ Media Vision Surveillance library for Tizen Native API.
%package surveillance-devel
Summary: Multimedia Vision Surveillance Library
Group: Multimedia/Framework
-Requires: capi-media-vision-surveillance
-Requires: capi-media-vision-common-devel
+Requires: %{name}-surveillance
+Requires: %{name}-common-devel
%description surveillance-devel
Media Vision Surveillance library for Tizen Native API (DEV).
@@ -136,7 +136,7 @@ Media Vision Surveillance library for Tizen Native API (DEV).
%package inference
Summary: Multimedia Vision Inference Library
Group: Multimedia/Framework
-Requires: capi-media-vision-common
+Requires: %{name}-common
%description inference
Media Vision inference library for Tizen Native API.
@@ -144,8 +144,8 @@ Media Vision inference library for Tizen Native API.
%package inference-devel
Summary: Multimedia Vision inference Library
Group: Multimedia/Framework
-Requires: capi-media-vision-inference
-Requires: capi-media-vision-common-devel
+Requires: %{name}-inference
+Requires: %{name}-common-devel
%description inference-devel
Media Vision Inference library for Tizen Native API (DEV).
@@ -153,11 +153,11 @@ Media Vision Inference library for Tizen Native API (DEV).
%package testsuite
Summary: Multimedia Vision Test Suite
Group: Multimedia/Framework
-Requires: capi-media-vision-barcode
-Requires: capi-media-vision-face
-Requires: capi-media-vision-image
-Requires: capi-media-vision-surveillance
-Requires: capi-media-vision-inference
+Requires: %{name}-barcode
+Requires: %{name}-face
+Requires: %{name}-image
+Requires: %{name}-surveillance
+Requires: %{name}-inference
%description testsuite
Media Vision Test Suite.
@@ -214,10 +214,10 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
%postun -p /sbin/ldconfig
%files
-%manifest capi-media-vision.manifest
+%manifest %{name}.manifest
%license LICENSE.APLv2
%{_datadir}/%{name}/media-vision-config.json
-%{_libdir}/libcapi-media-vision.so.*
+%{_libdir}/lib%{name}.so.*
%{_libdir}/libmv*.so
%files devel
@@ -227,13 +227,14 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
%TZ_SYS_BIN/*
%files common
-%manifest capi-media-vision.manifest
+%manifest %{name}.manifest
%license LICENSE.APLv2
%{_datadir}/%{name}/media-vision-config.json
%{_libdir}/libmv_common*.so
%files common-devel
%{_includedir}/media/mv_common.h
+%{_libdir}/pkgconfig/*common.pc
%files barcode
%{_libdir}/libmv_barcode*.so