From 93e72b695e477ac1efc22a0bdddb177199cf2fb9 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 12 May 2020 00:58:34 +0300 Subject: libcamera: Move internal headers to include/libcamera/internal/ The libcamera internal headers are located in src/libcamera/include/. The directory is added to the compiler headers search path with a meson include_directories() directive, and internal headers are included with (e.g. for the internal semaphore.h header) #include "semaphore.h" All was well, until libcxx decided to implement the C++20 synchronization library. The __threading_support header gained a #include to include the pthread's semaphore support. As include_directories() adds src/libcamera/include/ to the compiler search path with -I, the internal semaphore.h is included instead of the pthread version. Needless to say, the compiler isn't happy. Three options have been considered to fix this issue: - Use -iquote instead of -I. The -iquote option instructs gcc to only consider the header search path for headers included with the "" version. Meson unfortunately doesn't support this option. - Rename the internal semaphore.h header. This was deemed to be the beginning of a long whack-a-mole game, where namespace clashes with system libraries would appear over time (possibly dependent on particular system configurations) and would need to be constantly fixed. - Move the internal headers to another directory to create a unique namespace through path components. This causes lots of churn in all the existing source files through the all project. The first option would be best, but isn't available to us due to missing support in meson. Even if -iquote support was added, we would need to fix the problem before a new version of meson containing the required support would be released. The third option is thus the only practical solution available. Bite the bullet, and do it, moving headers to include/libcamera/internal/. Signed-off-by: Laurent Pinchart Acked-by: Jacopo Mondi --- test/v4l2_videodevice/buffer_sharing.cpp | 3 ++- test/v4l2_videodevice/capture_async.cpp | 3 ++- test/v4l2_videodevice/controls.cpp | 2 +- test/v4l2_videodevice/formats.cpp | 4 ++-- test/v4l2_videodevice/v4l2_m2mdevice.cpp | 8 ++++---- test/v4l2_videodevice/v4l2_videodevice_test.cpp | 6 +++--- test/v4l2_videodevice/v4l2_videodevice_test.h | 12 ++++++------ 7 files changed, 20 insertions(+), 18 deletions(-) (limited to 'test/v4l2_videodevice') diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index 14d3055a..ba2cc40d 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -16,7 +16,8 @@ #include #include -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "v4l2_videodevice_test.h" class BufferSharingTest : public V4L2VideoDeviceTest diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index b38aabc6..13cbcc80 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -11,7 +11,8 @@ #include #include -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "v4l2_videodevice_test.h" class CaptureAsyncTest : public V4L2VideoDeviceTest diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 347af211..9f09d036 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -10,7 +10,7 @@ #include #include -#include "v4l2_videodevice.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp index a7421421..043732dc 100644 --- a/test/v4l2_videodevice/formats.cpp +++ b/test/v4l2_videodevice/formats.cpp @@ -8,8 +8,8 @@ #include #include -#include "utils.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index d20e5dfc..44a39d4d 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -11,10 +11,10 @@ #include #include -#include "device_enumerator.h" -#include "media_device.h" -#include "thread.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "test.h" diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp index 93b9e72d..f23aaf8f 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp @@ -9,10 +9,10 @@ #include -#include "v4l2_videodevice_test.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" -#include "device_enumerator.h" -#include "media_device.h" +#include "v4l2_videodevice_test.h" using namespace std; using namespace libcamera; diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h index 9acaceb8..21054561 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.h +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h @@ -11,13 +11,13 @@ #include -#include "test.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" +#include "test.h" using namespace libcamera; -- cgit v1.2.1