ipu6-camera-hal

Merge ~fourdollars/ipu6-camera-hal/+git/packaging:main into ~oem-solutions-engineers/ipu6-camera-hal/+git/packaging:main

  1. Git
  2. lp:~fourdollars/ipu6-camera-hal/+git/packaging
  3. main
  4. Merge into main
Proposed by Shih-Yuan Lee
Status: Merged
Approved by: You-Sheng Yang
Approved revision: afbc62d926d76cc2c551c33aef97502710a1123d
Merged at revision: afbc62d926d76cc2c551c33aef97502710a1123d
Proposed branch: ~fourdollars/ipu6-camera-hal/+git/packaging:main
Merge into: ~oem-solutions-engineers/ipu6-camera-hal/+git/packaging:main
Diff against target: 179 lines (+23/-33)
5 files modified
CMakeLists.txt (+10/-5)
cmake/libcamhal.pc.cmakein (+2/-2)
debian/changelog (+11/-0)
debian/patches/series (+0/-2)
dev/null (+0/-24)
Reviewer Review Type Date Requested Status
You-Sheng Yang Approve
Review via email: mp+413083@code.launchpad.net
To post a comment you must log in.
Revision history for this message
You-Sheng Yang (vicamo) wrote :

Already pushed tag upstream/0_git202112130639.4585612 to lp:~oem-solutions-engineers/ipu6-camera-hal/+git/packaging.

Revision history for this message
You-Sheng Yang (vicamo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b3b653..6a49e0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,8 @@ message(STATUS "install prefix: " ${CMAKE_INSTALL_PREFIX})
6868
69#------------------------- Compilation settings -------------------------69#------------------------- Compilation settings -------------------------
7070
71include(GNUInstallDirs)
72
71# -fPIC in xos way73# -fPIC in xos way
72set(CMAKE_POSITION_INDEPENDENT_CODE ON)74set(CMAKE_POSITION_INDEPENDENT_CODE ON)
7375
@@ -243,6 +245,11 @@ set_target_properties(camhal_static PROPERTIES OUTPUT_NAME "camhal")
243target_link_libraries(camhal ${CMAKE_DL_LIBS})245target_link_libraries(camhal ${CMAKE_DL_LIBS})
244target_link_libraries(camhal_static ${CMAKE_DL_LIBS})246target_link_libraries(camhal_static ${CMAKE_DL_LIBS})
245247
248set (THREADS_PREFER_PTHREAD_FLAG ON)
249find_package (Threads REQUIRED)
250target_link_libraries(camhal ${CMAKE_THREAD_LIBS_INIT})
251target_link_libraries(camhal_static ${CMAKE_THREAD_LIBS_INIT})
252
246target_link_libraries(camhal expat rt)253target_link_libraries(camhal expat rt)
247target_link_libraries(camhal_static expat rt)254target_link_libraries(camhal_static expat rt)
248255
@@ -391,15 +398,13 @@ else()
391endif()398endif()
392399
393# Install libraries400# Install libraries
394install(TARGETS camhal camhal_static401install(TARGETS camhal camhal_static)
395 LIBRARY DESTINATION lib
396 ARCHIVE DESTINATION lib
397 )
398402
399# Install package config file403# Install package config file
400configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein404configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein
401 ${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)405 ${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)
402install(FILES libcamhal.pc DESTINATION lib/pkgconfig)406install(FILES libcamhal.pc
407 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
403408
404endif() #NOT CAL_BUILD409endif() #NOT CAL_BUILD
405410
diff --git a/cmake/libcamhal.pc.cmakein b/cmake/libcamhal.pc.cmakein
index fe9e6ab..27ad098 100644
--- a/cmake/libcamhal.pc.cmakein
+++ b/cmake/libcamhal.pc.cmakein
@@ -1,7 +1,7 @@
1prefix=@CMAKE_INSTALL_PREFIX@1prefix=@CMAKE_INSTALL_PREFIX@
2exec_prefix=@CMAKE_INSTALL_PREFIX@2exec_prefix=@CMAKE_INSTALL_PREFIX@
3libdir=@CMAKE_INSTALL_PREFIX@/lib3libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
4includedir=@CMAKE_INSTALL_PREFIX@/include/libcamhal4includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/libcamhal
55
6Name: libcamhal6Name: libcamhal
7Description: Camera HAL Library7Description: Camera HAL Library
diff --git a/debian/changelog b/debian/changelog
index 22a571d..c3a0f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
1ipu6-camera-hal (0~git202112130639.4585612-1) UNRELEASED; urgency=medium
2
3 [ You-Sheng Yang ]
4 * cmake: fix multiarch installation path
5 * cmake: link pthread properly
6
7 [ Shih-Yuan Lee (FourDollars) ]
8 * debian: Revert "debian: add patches for unexpectedly reverted fixes"
9
10 -- Shih-Yuan Lee (FourDollars) <sylee@canonical.com> Mon, 13 Dec 2021 20:32:04 +0800
11
1ipu6-camera-hal (0~git202112030433.aa8c9d8-1) UNRELEASED; urgency=medium12ipu6-camera-hal (0~git202112030433.aa8c9d8-1) UNRELEASED; urgency=medium
213
3 * Intel tributo_20211202 release14 * Intel tributo_20211202 release
diff --git a/debian/patches/0001-fix-multiarch-build.patch b/debian/patches/0001-fix-multiarch-build.patch
4deleted file mode 10064415deleted file mode 100644
index 7ca5245..0000000
--- a/debian/patches/0001-fix-multiarch-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From: You-Sheng Yang <vicamo@gmail.com>
2Date: Mon, 28 Dec 2020 20:12:57 +0800
3Subject: [PATCH] fix multiarch build
4
5---
6 CMakeLists.txt | 10 +++++-----
7 cmake/libcamhal.pc.cmakein | 4 ++--
8 2 files changed, 7 insertions(+), 7 deletions(-)
9
10diff --git a/CMakeLists.txt b/CMakeLists.txt
11index 5a9a41d..19bb36c 100644
12--- a/CMakeLists.txt
13+++ b/CMakeLists.txt
14@@ -69,6 +69,8 @@ message(STATUS "install prefix: " ${CMAKE_INSTALL_PREFIX})
15
16 #------------------------- Compilation settings -------------------------
17
18+include(GNUInstallDirs)
19+
20 # -fPIC in xos way
21 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
22
23@@ -371,15 +373,13 @@ else()
24 endif()
25
26 # Install libraries
27-install(TARGETS camhal camhal_static
28- LIBRARY DESTINATION lib
29- ARCHIVE DESTINATION lib
30- )
31+install(TARGETS camhal camhal_static)
32
33 # Install package config file
34 configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein
35 ${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)
36-install(FILES libcamhal.pc DESTINATION lib/pkgconfig)
37+install(FILES libcamhal.pc
38+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
39
40 endif() #NOT CAL_BUILD
41
42diff --git a/cmake/libcamhal.pc.cmakein b/cmake/libcamhal.pc.cmakein
43index fe9e6ab..27ad098 100644
44--- a/cmake/libcamhal.pc.cmakein
45+++ b/cmake/libcamhal.pc.cmakein
46@@ -1,7 +1,7 @@
47 prefix=@CMAKE_INSTALL_PREFIX@
48 exec_prefix=@CMAKE_INSTALL_PREFIX@
49-libdir=@CMAKE_INSTALL_PREFIX@/lib
50-includedir=@CMAKE_INSTALL_PREFIX@/include/libcamhal
51+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
52+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/libcamhal
53
54 Name: libcamhal
55 Description: Camera HAL Library
diff --git a/debian/patches/0003-cmake-link-pthread-properly.patch b/debian/patches/0003-cmake-link-pthread-properly.patch
56deleted file mode 1006440deleted file mode 100644
index 8dbe406..0000000
--- a/debian/patches/0003-cmake-link-pthread-properly.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From: You-Sheng Yang <vicamo@gmail.com>
2Date: Mon, 28 Dec 2020 22:15:59 +0800
3Subject: [PATCH] cmake: link pthread properly
4
5---
6 CMakeLists.txt | 5 +++++
7 1 file changed, 5 insertions(+)
8
9diff --git a/CMakeLists.txt b/CMakeLists.txt
10index 8aaddda..1146af3 100644
11--- a/CMakeLists.txt
12+++ b/CMakeLists.txt
13@@ -243,6 +243,11 @@ set_target_properties(camhal_static PROPERTIES OUTPUT_NAME "camhal")
14 target_link_libraries(camhal ${CMAKE_DL_LIBS})
15 target_link_libraries(camhal_static ${CMAKE_DL_LIBS})
16
17+set (THREADS_PREFER_PTHREAD_FLAG ON)
18+find_package (Threads REQUIRED)
19+target_link_libraries(camhal ${CMAKE_THREAD_LIBS_INIT})
20+target_link_libraries(camhal_static ${CMAKE_THREAD_LIBS_INIT})
21+
22 target_link_libraries(camhal expat rt)
23 target_link_libraries(camhal_static expat rt)
24
diff --git a/debian/patches/series b/debian/patches/series
index be69491..554fc13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
10001-fix-multiarch-build.patch
20002-cmake-specify-library-version.patch10002-cmake-specify-library-version.patch
30003-cmake-link-pthread-properly.patch
40004-cmake-correct-CAMERA_DEFAULT_CFG_PATH.patch20004-cmake-correct-CAMERA_DEFAULT_CFG_PATH.patch
50005-cmake-link-to-corresponding-ia_imaging-gcss-libs.patch30005-cmake-link-to-corresponding-ia_imaging-gcss-libs.patch
60006-cmake-build-libcamhal.so-from-static-lib.patch40006-cmake-build-libcamhal.so-from-static-lib.patch

Subscribers

People subscribed via source and target branches