[v4l-utils/el6: 33/34] Synchronize Kernel headers with upstream
mchehab
mchehab at fedoraproject.org
Mon Nov 24 12:57:00 UTC 2014
commit 3f3420e7887e4fc9c68ea7aae7a0b18d94056e72
Author: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
Date: Mon Nov 24 09:27:23 2014 -0200
Synchronize Kernel headers with upstream
This is needed to build with RHEL6's Kernel.
Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
0001-media-headers-sync.patch | 268 +++++++++++++++++++++++++++++++++++++++++
v4l-utils.spec | 2 +
2 files changed, 270 insertions(+), 0 deletions(-)
---
diff --git a/0001-media-headers-sync.patch b/0001-media-headers-sync.patch
new file mode 100644
index 0000000..cd5c5e4
--- /dev/null
+++ b/0001-media-headers-sync.patch
@@ -0,0 +1,268 @@
+diff --git a/Makefile.am b/Makefile.am
+index 03169ce..758d355 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,6 +36,7 @@ sync-with-kernel:
+ cp -a $(KERNEL_DIR)/usr/include/linux/v4l2-common.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/usr/include/linux/v4l2-subdev.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/usr/include/linux/v4l2-mediabus.h $(top_srcdir)/include/linux
++ cp -a $(KERNEL_DIR)/usr/include/linux/media-bus-format.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/usr/include/linux/ivtv.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/usr/include/linux/dvb/frontend.h $(top_srcdir)/include/linux/dvb
+ cp -a $(KERNEL_DIR)/usr/include/linux/dvb/dmx.h $(top_srcdir)/include/linux/dvb
+diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h
+index 8b93021..661f119 100644
+--- a/contrib/freebsd/include/linux/v4l2-controls.h
++++ b/contrib/freebsd/include/linux/v4l2-controls.h
+@@ -746,6 +746,8 @@ enum v4l2_auto_focus_range {
+ V4L2_AUTO_FOCUS_RANGE_INFINITY = 3,
+ };
+
++#define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE+32)
++#define V4L2_CID_TILT_SPEED (V4L2_CID_CAMERA_CLASS_BASE+33)
+
+ /* FM Modulator class control IDs */
+
+diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h
+index 02f2005..98e3615 100644
+--- a/contrib/freebsd/include/linux/videodev2.h
++++ b/contrib/freebsd/include/linux/videodev2.h
+@@ -111,6 +111,7 @@ typedef int8_t __s8;
+ /* Four-character-code (FOURCC) */
+ #define v4l2_fourcc(a, b, c, d)\
+ ((uint32_t)(a) | ((uint32_t)(b) << 8) | ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
++#define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1 << 31))
+
+ /*
+ * E N U M S
+@@ -339,6 +340,8 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16 XRGB-1-5-5-5 */
+ #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */
+ #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16 RGB-5-5-5 BE */
++#define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16 ARGB-5-5-5 BE */
++#define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16 XRGB-5-5-5 BE */
+ #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16 RGB-5-6-5 BE */
+ #define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H') /* 18 BGR-6-6-6 */
+ #define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3') /* 24 BGR-8-8-8 */
+diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
+new file mode 100644
+index 0000000..23b4090
+--- /dev/null
++++ b/include/linux/media-bus-format.h
+@@ -0,0 +1,125 @@
++/*
++ * Media Bus API header
++ *
++ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski at gmx.de>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#ifndef __LINUX_MEDIA_BUS_FORMAT_H
++#define __LINUX_MEDIA_BUS_FORMAT_H
++
++/*
++ * These bus formats uniquely identify data formats on the data bus. Format 0
++ * is reserved, MEDIA_BUS_FMT_FIXED shall be used by host-client pairs, where
++ * the data format is fixed. Additionally, "2X8" means that one pixel is
++ * transferred in two 8-bit samples, "BE" or "LE" specify in which order those
++ * samples are transferred over the bus: "LE" means that the least significant
++ * bits are transferred first, "BE" means that the most significant bits are
++ * transferred first, and "PADHI" and "PADLO" define which bits - low or high,
++ * in the incomplete high byte, are filled with padding bits.
++ *
++ * The bus formats are grouped by type, bus_width, bits per component, samples
++ * per pixel and order of subsamples. Numerical values are sorted using generic
++ * numerical sort order (8 thus comes before 10).
++ *
++ * As their value can't change when a new bus format is inserted in the
++ * enumeration, the bus formats are explicitly given a numerical value. The next
++ * free values for each category are listed below, update them when inserting
++ * new pixel codes.
++ */
++
++#define MEDIA_BUS_FMT_FIXED 0x0001
++
++/* RGB - next is 0x100e */
++#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001
++#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002
++#define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE 0x1003
++#define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE 0x1004
++#define MEDIA_BUS_FMT_BGR565_2X8_BE 0x1005
++#define MEDIA_BUS_FMT_BGR565_2X8_LE 0x1006
++#define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007
++#define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008
++#define MEDIA_BUS_FMT_RGB666_1X18 0x1009
++#define MEDIA_BUS_FMT_RGB888_1X24 0x100a
++#define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b
++#define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c
++#define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d
++
++/* YUV (including grey) - next is 0x2024 */
++#define MEDIA_BUS_FMT_Y8_1X8 0x2001
++#define MEDIA_BUS_FMT_UV8_1X8 0x2015
++#define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002
++#define MEDIA_BUS_FMT_VYUY8_1_5X8 0x2003
++#define MEDIA_BUS_FMT_YUYV8_1_5X8 0x2004
++#define MEDIA_BUS_FMT_YVYU8_1_5X8 0x2005
++#define MEDIA_BUS_FMT_UYVY8_2X8 0x2006
++#define MEDIA_BUS_FMT_VYUY8_2X8 0x2007
++#define MEDIA_BUS_FMT_YUYV8_2X8 0x2008
++#define MEDIA_BUS_FMT_YVYU8_2X8 0x2009
++#define MEDIA_BUS_FMT_Y10_1X10 0x200a
++#define MEDIA_BUS_FMT_UYVY10_2X10 0x2018
++#define MEDIA_BUS_FMT_VYUY10_2X10 0x2019
++#define MEDIA_BUS_FMT_YUYV10_2X10 0x200b
++#define MEDIA_BUS_FMT_YVYU10_2X10 0x200c
++#define MEDIA_BUS_FMT_Y12_1X12 0x2013
++#define MEDIA_BUS_FMT_UYVY8_1X16 0x200f
++#define MEDIA_BUS_FMT_VYUY8_1X16 0x2010
++#define MEDIA_BUS_FMT_YUYV8_1X16 0x2011
++#define MEDIA_BUS_FMT_YVYU8_1X16 0x2012
++#define MEDIA_BUS_FMT_YDYUYDYV8_1X16 0x2014
++#define MEDIA_BUS_FMT_UYVY10_1X20 0x201a
++#define MEDIA_BUS_FMT_VYUY10_1X20 0x201b
++#define MEDIA_BUS_FMT_YUYV10_1X20 0x200d
++#define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
++#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
++#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
++#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
++#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
++#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
++#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
++#define MEDIA_BUS_FMT_UYVY12_1X24 0x2020
++#define MEDIA_BUS_FMT_VYUY12_1X24 0x2021
++#define MEDIA_BUS_FMT_YUYV12_1X24 0x2022
++#define MEDIA_BUS_FMT_YVYU12_1X24 0x2023
++
++/* Bayer - next is 0x3019 */
++#define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001
++#define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013
++#define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002
++#define MEDIA_BUS_FMT_SRGGB8_1X8 0x3014
++#define MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8 0x3015
++#define MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8 0x3016
++#define MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8 0x3017
++#define MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8 0x3018
++#define MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8 0x300b
++#define MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8 0x300c
++#define MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8 0x3009
++#define MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8 0x300d
++#define MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE 0x3003
++#define MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE 0x3004
++#define MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE 0x3005
++#define MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE 0x3006
++#define MEDIA_BUS_FMT_SBGGR10_1X10 0x3007
++#define MEDIA_BUS_FMT_SGBRG10_1X10 0x300e
++#define MEDIA_BUS_FMT_SGRBG10_1X10 0x300a
++#define MEDIA_BUS_FMT_SRGGB10_1X10 0x300f
++#define MEDIA_BUS_FMT_SBGGR12_1X12 0x3008
++#define MEDIA_BUS_FMT_SGBRG12_1X12 0x3010
++#define MEDIA_BUS_FMT_SGRBG12_1X12 0x3011
++#define MEDIA_BUS_FMT_SRGGB12_1X12 0x3012
++
++/* JPEG compressed formats - next is 0x4002 */
++#define MEDIA_BUS_FMT_JPEG_1X8 0x4001
++
++/* Vendor specific formats - next is 0x5002 */
++
++/* S5C73M3 sensor specific interleaved UYVY and JPEG */
++#define MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8 0x5001
++
++/* HSV - next is 0x6002 */
++#define MEDIA_BUS_FMT_AHSV8888_1X32 0x6001
++
++#endif /* __LINUX_MEDIA_BUS_FORMAT_H */
+diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
+index 8b93021..661f119 100644
+--- a/include/linux/v4l2-controls.h
++++ b/include/linux/v4l2-controls.h
+@@ -746,6 +746,8 @@ enum v4l2_auto_focus_range {
+ V4L2_AUTO_FOCUS_RANGE_INFINITY = 3,
+ };
+
++#define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE+32)
++#define V4L2_CID_TILT_SPEED (V4L2_CID_CAMERA_CLASS_BASE+33)
+
+ /* FM Modulator class control IDs */
+
+diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
+index 87b83c3..ef4c72a 100644
+--- a/include/linux/videodev2.h
++++ b/include/linux/videodev2.h
+@@ -77,6 +77,7 @@
+ /* Four-character-code (FOURCC) */
+ #define v4l2_fourcc(a, b, c, d)\
+ ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
++#define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1 << 31))
+
+ /*
+ * E N U M S
+@@ -305,6 +306,8 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16 XRGB-1-5-5-5 */
+ #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */
+ #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16 RGB-5-5-5 BE */
++#define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16 ARGB-5-5-5 BE */
++#define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16 XRGB-5-5-5 BE */
+ #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16 RGB-5-6-5 BE */
+ #define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H') /* 18 BGR-6-6-6 */
+ #define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3') /* 24 BGR-8-8-8 */
+diff --git a/utils/v4l2-ctl/vivid-tpg.c b/utils/v4l2-ctl/vivid-tpg.c
+index 21e7f4e..cbcd625 100644
+--- a/utils/v4l2-ctl/vivid-tpg.c
++++ b/utils/v4l2-ctl/vivid-tpg.c
+@@ -183,7 +183,7 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc)
+ case V4L2_PIX_FMT_XBGR32:
+ case V4L2_PIX_FMT_ARGB32:
+ case V4L2_PIX_FMT_ABGR32:
+- tpg->is_yuv = 0;
++ tpg->is_yuv = false;
+ break;
+ case V4L2_PIX_FMT_NV16M:
+ case V4L2_PIX_FMT_NV61M:
+@@ -193,7 +193,7 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc)
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_YVYU:
+ case V4L2_PIX_FMT_VYUY:
+- tpg->is_yuv = 1;
++ tpg->is_yuv = true;
+ break;
+ default:
+ return false;
+@@ -249,7 +249,7 @@ void tpg_s_crop_compose(struct tpg_data *tpg, const struct v4l2_rect *crop,
+ }
+
+ void tpg_reset_source(struct tpg_data *tpg, unsigned width, unsigned height,
+- enum v4l2_field field)
++ u32 field)
+ {
+ unsigned p;
+
+diff --git a/utils/v4l2-ctl/vivid-tpg.h.patch b/utils/v4l2-ctl/vivid-tpg.h.patch
+index f200203..6348c19 100644
+--- a/utils/v4l2-ctl/vivid-tpg.h.patch
++++ b/utils/v4l2-ctl/vivid-tpg.h.patch
+@@ -1,8 +1,8 @@
+-diff --git b/utils/v4l2-ctl/vivid-tpg.h a/utils/v4l2-ctl/vivid-tpg.h
+-index 51ef7d1..76c373a 100644
+---- b/utils/v4l2-ctl/vivid-tpg.h
+-+++ a/utils/v4l2-ctl/vivid-tpg.h
+-@@ -20,13 +20,46 @@
++diff --git a/devel/v4l/patchwork//drivers/media/platform/vivid/vivid-tpg.h b/utils/v4l2-ctl/vivid-tpg.h
++index 8ef3e52ba3be..76c373a7b4f1 100644
++--- a/devel/v4l/patchwork//drivers/media/platform/vivid/vivid-tpg.h
+++++ b/utils/v4l2-ctl/vivid-tpg.h
++@@ -20,14 +20,46 @@
+ #ifndef _VIVID_TPG_H_
+ #define _VIVID_TPG_H_
+
+@@ -11,6 +11,7 @@ index 51ef7d1..76c373a 100644
+ -#include <linux/errno.h>
+ -#include <linux/random.h>
+ -#include <linux/slab.h>
++-#include <linux/vmalloc.h>
+ #include <linux/videodev2.h>
+
+ +#include <stdbool.h>
diff --git a/v4l-utils.spec b/v4l-utils.spec
index 8d6f8f4..b953d86 100644
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@ -7,6 +7,7 @@ Group: Applications/System
License: GPLv2+ and GPLv2
URL: http://www.linuxtv.org/downloads/v4l-utils/
Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
+Patch1: 0001-media-headers-sync.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel qt4-devel kernel-headers desktop-file-utils
BuildRequires: alsa-lib-devel doxygen
@@ -99,6 +100,7 @@ files for developing applications that use libdvbv5.
%prep
%setup -q
+%patch1 -p1
%build
More information about the scm-commits
mailing list