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

[Shih-Yuan Lee]

[You-Sheng Yang (vicamo)]

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

[You-Sheng Yang (vicamo)]

review: Approve

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})
 
 #------------------------- Compilation settings -------------------------
 
+include(GNUInstallDirs)
+
 # -fPIC in xos way
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -243,6 +245,11 @@ set_target_properties(camhal_static PROPERTIES OUTPUT_NAME "camhal")
 target_link_libraries(camhal ${CMAKE_DL_LIBS})
 target_link_libraries(camhal_static ${CMAKE_DL_LIBS})
 
+set (THREADS_PREFER_PTHREAD_FLAG ON)
+find_package (Threads REQUIRED)
+target_link_libraries(camhal ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(camhal_static ${CMAKE_THREAD_LIBS_INIT})
+
 target_link_libraries(camhal expat rt)
 target_link_libraries(camhal_static expat rt)
 
@@ -391,15 +398,13 @@ else()
 endif()
 
 # Install libraries
-install(TARGETS camhal camhal_static
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib
-        )
+install(TARGETS camhal camhal_static)
 
 # Install package config file
 configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein
                ${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)
-install(FILES libcamhal.pc DESTINATION lib/pkgconfig)
+install(FILES libcamhal.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 endif() #NOT CAL_BUILD
 
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 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/lib
-includedir=@CMAKE_INSTALL_PREFIX@/include/libcamhal
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/libcamhal
 
 Name: libcamhal
 Description: 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 @@
+ipu6-camera-hal (0~git202112130639.4585612-1) UNRELEASED; urgency=medium
+
+  [ You-Sheng Yang ]
+  * cmake: fix multiarch installation path
+  * cmake: link pthread properly
+
+  [ Shih-Yuan Lee (FourDollars) ]
+  * debian: Revert "debian: add patches for unexpectedly reverted fixes"
+
+ -- Shih-Yuan Lee (FourDollars) <[e-mail]>  Mon, 13 Dec 2021 20:32:04 +0800
+
 ipu6-camera-hal (0~git202112030433.aa8c9d8-1) UNRELEASED; urgency=medium
 
   * Intel tributo_20211202 release
diff --git a/debian/patches/0001-fix-multiarch-build.patch b/debian/patches/0001-fix-multiarch-build.patch
deleted file mode 100644
index 7ca5245..0000000
--- a/debian/patches/0001-fix-multiarch-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: You-Sheng Yang <[e-mail]>
-Date: Mon, 28 Dec 2020 20:12:57 +0800
-Subject: [PATCH] fix multiarch build
-
----
- CMakeLists.txt             | 10 +++++-----
- cmake/libcamhal.pc.cmakein |  4 ++--
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a9a41d..19bb36c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,6 +69,8 @@ message(STATUS "install prefix: " ${CMAKE_INSTALL_PREFIX})
- 
- #------------------------- Compilation settings -------------------------
- 
-+include(GNUInstallDirs)
-+
- # -fPIC in xos way
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- 
-@@ -371,15 +373,13 @@ else()
- endif()
- 
- # Install libraries
--install(TARGETS camhal camhal_static
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib
--        )
-+install(TARGETS camhal camhal_static)
- 
- # Install package config file
- configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein
-                ${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY)
--install(FILES libcamhal.pc DESTINATION lib/pkgconfig)
-+install(FILES libcamhal.pc
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
- endif() #NOT CAL_BUILD
- 
-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 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@CMAKE_INSTALL_PREFIX@/lib
--includedir=@CMAKE_INSTALL_PREFIX@/include/libcamhal
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/libcamhal
- 
- Name: libcamhal
- Description: Camera HAL Library
diff --git a/debian/patches/0003-cmake-link-pthread-properly.patch b/debian/patches/0003-cmake-link-pthread-properly.patch
deleted file mode 100644
index 8dbe406..0000000
--- a/debian/patches/0003-cmake-link-pthread-properly.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: You-Sheng Yang <[e-mail]>
-Date: Mon, 28 Dec 2020 22:15:59 +0800
-Subject: [PATCH] cmake: link pthread properly
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8aaddda..1146af3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -243,6 +243,11 @@ set_target_properties(camhal_static PROPERTIES OUTPUT_NAME "camhal")
- target_link_libraries(camhal ${CMAKE_DL_LIBS})
- target_link_libraries(camhal_static ${CMAKE_DL_LIBS})
- 
-+set (THREADS_PREFER_PTHREAD_FLAG ON)
-+find_package (Threads REQUIRED)
-+target_link_libraries(camhal ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries(camhal_static ${CMAKE_THREAD_LIBS_INIT})
-+
- target_link_libraries(camhal expat rt)
- target_link_libraries(camhal_static expat rt)
- 
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 @@
-0001-fix-multiarch-build.patch
 0002-cmake-specify-library-version.patch
-0003-cmake-link-pthread-properly.patch
 0004-cmake-correct-CAMERA_DEFAULT_CFG_PATH.patch
 0005-cmake-link-to-corresponding-ia_imaging-gcss-libs.patch
 0006-cmake-build-libcamhal.so-from-static-lib.patch