From patchwork Tue May 19 12:01:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 3820 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 161D3603D9 for ; Tue, 19 May 2020 14:01:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LbeLEETw"; dkim-atps=neutral Received: from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9910B30C; Tue, 19 May 2020 14:01:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589889695; bh=d5c/POYbWoULs1GHI2fTCllQ2XUUIEoStns97XfM5fk=; h=From:To:Cc:Subject:Date:From; b=LbeLEETwn4IQ8PJcp+bfX1WvV4XQtRmxG+t0KayhXNiCgZP0hOCMxdkJYMjyFc7Bv +ESx1QhmkqyPaEV3MOcerjBK2tsE2QysEs3Rs0i6H0EhovFITzhHxZTPTY4fWkkANB emO4VMLSVgUtbgMDErsYON3P4diH24zHGiC82iUU= From: Kieran Bingham To: libcamera devel Date: Tue, 19 May 2020 13:01:30 +0100 Message-Id: <20200519120130.2399495-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: Move DRM headers to include/drm X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2020 12:01:36 -0000 The local copy of the DRM headers are stored under include/linux/drm*. When installed on a host system, they are instead installed to /usr/include/drm/*, and as such building a userspace application against the libcamera headers currently fails to find linux/drm_fourcc.h. Fix up the file locations, and references throughout the project. Signed-off-by: Kieran Bingham Acked-by: Laurent Pinchart --- include/{linux => drm}/drm.h | 0 include/{linux => drm}/drm_fourcc.h | 0 include/{linux => drm}/drm_mode.h | 0 include/libcamera/pixelformats.h | 2 +- src/gstreamer/gstlibcamera-utils.cpp | 2 +- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +- src/libcamera/v4l2_pixelformat.cpp | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename include/{linux => drm}/drm.h (100%) rename include/{linux => drm}/drm_fourcc.h (100%) rename include/{linux => drm}/drm_mode.h (100%) diff --git a/include/linux/drm.h b/include/drm/drm.h similarity index 100% rename from include/linux/drm.h rename to include/drm/drm.h diff --git a/include/linux/drm_fourcc.h b/include/drm/drm_fourcc.h similarity index 100% rename from include/linux/drm_fourcc.h rename to include/drm/drm_fourcc.h diff --git a/include/linux/drm_mode.h b/include/drm/drm_mode.h similarity index 100% rename from include/linux/drm_mode.h rename to include/drm/drm_mode.h diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h index 89966e5e664c..e3cdb711b828 100644 --- a/include/libcamera/pixelformats.h +++ b/include/libcamera/pixelformats.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index a3cb0746e012..41ca2b90867d 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -8,7 +8,7 @@ #include "gstlibcamera-utils.h" -#include +#include using namespace libcamera; diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 07ca9f5d7f53..198ec295a840 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "libcamera/internal/camera_sensor.h" diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 36776be99e59..1c4a05b37e23 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include