aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2018-02-09 13:25:44 +0000
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2018-02-09 11:29:55 -0200
commit315aa179a48ed54c68f0c44a73fb96d08d05a1f2 (patch)
tree704f68a580d65e031b64a88bab213c6b98983947
parent1bd58c1ad8dd76edcf5b526ebc4bc4764b66108f (diff)
update make sync-with-kernel target
There were some changes at v4l2-tpg that causes make sync-with-kernel to fail. Fix them. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--Makefile.am2
-rw-r--r--utils/common/v4l2-tpg.patch12
2 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index ac7eca68..93e0973a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ sync-with-kernel:
cp -a $(KERNEL_DIR)/usr/include/linux/lirc.h $(top_srcdir)/include/linux
cp -a $(KERNEL_DIR)/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c $(top_srcdir)/utils/common
cp -a $(KERNEL_DIR)/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c $(top_srcdir)/utils/common
- cp -a $(KERNEL_DIR)/include/media/v4l2-tpg* $(top_srcdir)/utils/common
+ cp -a $(KERNEL_DIR)/include/media/tpg/v4l2-tpg* $(top_srcdir)/utils/common
patch -p0 <$(top_srcdir)/utils/common/v4l2-tpg.patch
cp -a $(KERNEL_DIR)/include/uapi/linux/cec.h $(top_srcdir)/include/linux
cp -a $(KERNEL_DIR)/include/uapi/linux/cec-funcs.h $(top_srcdir)/include/linux
diff --git a/utils/common/v4l2-tpg.patch b/utils/common/v4l2-tpg.patch
index d3955cf6..cdc632ec 100644
--- a/utils/common/v4l2-tpg.patch
+++ b/utils/common/v4l2-tpg.patch
@@ -1,6 +1,6 @@
--- utils/common/v4l2-tpg.h.bak 2016-04-22 09:22:11.168936563 +0200
+++ utils/common/v4l2-tpg.h 2016-04-22 09:23:07.337262639 +0200
-@@ -20,13 +20,56 @@
+@@ -20,12 +20,56 @@
#ifndef _V4L2_TPG_H_
#define _V4L2_TPG_H_
@@ -10,7 +10,6 @@
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
#include <linux/videodev2.h>
--#include <media/v4l2-tpg-colors.h>
+
+#include <stdbool.h>
+#include <stdlib.h>
@@ -65,12 +64,11 @@
TPG_PAT_75_COLORBAR,
--- ../media-git/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c 2016-04-21 08:15:35.439610205 +0200
+++ utils/common/v4l2-tpg-core.c 2016-04-22 09:29:50.955939090 +0200
-@@ -20,8 +20,7 @@
- * SOFTWARE.
+@@ -20,7 +20,7 @@
*/
--#include <linux/module.h>
--#include <media/v4l2-tpg.h>
+ #include <linux/module.h>
+-#include <media/tpg/v4l2-tpg.h>
+#include "v4l2-tpg.h"
/* Must remain in sync with enum tpg_pattern */
@@ -210,7 +208,7 @@
*/
#include <linux/videodev2.h>
--#include <media/v4l2-tpg-colors.h>
+-#include <media/tpg/v4l2-tpg.h>
+#include "v4l2-tpg-colors.h"
/* sRGB colors with range [0-255] */

Privacy Policy