{"id":3820,"url":"https://patchwork.libcamera.org/api/1.1/patches/3820/?format=json","web_url":"https://patchwork.libcamera.org/patch/3820/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200519120130.2399495-1-kieran.bingham@ideasonboard.com>","date":"2020-05-19T12:01:30","name":"[libcamera-devel] libcamera: Move DRM headers to include/drm","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f9e128b840a63175e358d01d191150b64dc912af","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3820/mbox/","series":[{"id":913,"url":"https://patchwork.libcamera.org/api/1.1/series/913/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=913","date":"2020-05-19T12:01:30","name":"[libcamera-devel] libcamera: Move DRM headers to include/drm","version":1,"mbox":"https://patchwork.libcamera.org/series/913/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3820/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3820/checks/","tags":{},"headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 161D3603D9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 14:01:36 +0200 (CEST)","from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net\n\t[86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9910B30C;\n\tTue, 19 May 2020 14:01:34 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"LbeLEETw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589889695;\n\tbh=d5c/POYbWoULs1GHI2fTCllQ2XUUIEoStns97XfM5fk=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=LbeLEETwn4IQ8PJcp+bfX1WvV4XQtRmxG+t0KayhXNiCgZP0hOCMxdkJYMjyFc7Bv\n\t+ESx1QhmkqyPaEV3MOcerjBK2tsE2QysEs3Rs0i6H0EhovFITzhHxZTPTY4fWkkANB\n\temO4VMLSVgUtbgMDErsYON3P4diH24zHGiC82iUU=","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"libcamera devel <libcamera-devel@lists.libcamera.org>","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","Content-Transfer-Encoding":"8bit","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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 19 May 2020 12:01:36 -0000"},"content":"The local copy of the DRM headers are stored under include/linux/drm*.\n\nWhen installed on a host system, they are instead installed to\n/usr/include/drm/*, and as such building a userspace application against\nthe libcamera headers currently fails to find linux/drm_fourcc.h.\n\nFix up the file locations, and references throughout the project.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n include/{linux => drm}/drm.h                       | 0\n include/{linux => drm}/drm_fourcc.h                | 0\n include/{linux => drm}/drm_mode.h                  | 0\n include/libcamera/pixelformats.h                   | 2 +-\n src/gstreamer/gstlibcamera-utils.cpp               | 2 +-\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n src/libcamera/v4l2_pixelformat.cpp                 | 2 +-\n 7 files changed, 4 insertions(+), 4 deletions(-)\n rename include/{linux => drm}/drm.h (100%)\n rename include/{linux => drm}/drm_fourcc.h (100%)\n rename include/{linux => drm}/drm_mode.h (100%)","diff":"diff --git a/include/linux/drm.h b/include/drm/drm.h\nsimilarity index 100%\nrename from include/linux/drm.h\nrename to include/drm/drm.h\ndiff --git a/include/linux/drm_fourcc.h b/include/drm/drm_fourcc.h\nsimilarity index 100%\nrename from include/linux/drm_fourcc.h\nrename to include/drm/drm_fourcc.h\ndiff --git a/include/linux/drm_mode.h b/include/drm/drm_mode.h\nsimilarity index 100%\nrename from include/linux/drm_mode.h\nrename to include/drm/drm_mode.h\ndiff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h\nindex 89966e5e664c..e3cdb711b828 100644\n--- a/include/libcamera/pixelformats.h\n+++ b/include/libcamera/pixelformats.h\n@@ -11,7 +11,7 @@\n #include <stdint.h>\n #include <string>\n \n-#include <linux/drm_fourcc.h>\n+#include <drm/drm_fourcc.h>\n \n namespace libcamera {\n \ndiff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\nindex a3cb0746e012..41ca2b90867d 100644\n--- a/src/gstreamer/gstlibcamera-utils.cpp\n+++ b/src/gstreamer/gstlibcamera-utils.cpp\n@@ -8,7 +8,7 @@\n \n #include \"gstlibcamera-utils.h\"\n \n-#include <linux/drm_fourcc.h>\n+#include <drm/drm_fourcc.h>\n \n using namespace libcamera;\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 07ca9f5d7f53..198ec295a840 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -18,7 +18,7 @@\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n-#include <linux/drm_fourcc.h>\n+#include <drm/drm_fourcc.h>\n #include <linux/videodev2.h>\n \n #include \"libcamera/internal/camera_sensor.h\"\ndiff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\nindex 36776be99e59..1c4a05b37e23 100644\n--- a/src/libcamera/v4l2_pixelformat.cpp\n+++ b/src/libcamera/v4l2_pixelformat.cpp\n@@ -12,7 +12,7 @@\n #include <map>\n #include <string.h>\n \n-#include <linux/drm_fourcc.h>\n+#include <drm/drm_fourcc.h>\n \n #include <libcamera/pixelformats.h>\n \n","prefixes":["libcamera-devel"]}