[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2569-g4993de7
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2569-g4993de7
|
From: Julien B a. A. <ar...@us...> - 2011-10-24 22:29:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4993de71891783208f0408e710b45ffc05c62b22 (commit)
via 7336e6fa6cf890b925156b32de5f2c939d21d978 (commit)
via 3f8a94ee5c275bdc84983bedfdfbcf39ac83c888 (commit)
from c58511a69dd1358473973e5ba357e402c9db11b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4993de71891783208f0408e710b45ffc05c62b22
Author: Julien Boibessot <jul...@ar...>
Date: Tue Oct 25 00:26:59 2011 +0200
[BUILDROOT] imx-test: add mxc_vpu_test build by default and let it compile on recent kernels
commit 7336e6fa6cf890b925156b32de5f2c939d21d978
Author: Julien Boibessot <jul...@ar...>
Date: Tue Oct 25 00:25:00 2011 +0200
[DEMOS] Fixes build of capture on recent kernels. Also fixes freescale-tools (dependancy) and add correct captures's dependancy for i.MX51
commit 3f8a94ee5c275bdc84983bedfdfbcf39ac83c888
Author: Julien Boibessot <jul...@ar...>
Date: Tue Oct 25 00:20:57 2011 +0200
[BUILDROOT] imx-lib: better installation of libvpu in staging
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/demos.mk | 13 +++-
.../07-misc-20071002-v4l2_fixes.patch | 76 ++++++++++++++++++++
.../package/armadeus/freescale-tools/imx-lib.mk | 2 +
.../package/armadeus/freescale-tools/imx-test.mk | 2 +-
.../imx-test-02-mxc_vpu_test_v4l2_fixes.patch | 16 ++++
target/demos/camera/capture/vpu_codec.c | 2 +-
6 files changed, 105 insertions(+), 6 deletions(-)
create mode 100644 buildroot/package/armadeus/freescale-tools/07-misc-20071002-v4l2_fixes.patch
create mode 100644 buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index 20f318e..1199c1d 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -28,10 +28,15 @@ endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE),y)
ARMADEUS-DEMOS_SUBDIRS += camera/capture
ARMADEUS-DEMOS_DEPS = sdl
-ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE_VPU),y)
-ARMADEUS-DEMOS_DEPS += freescale-tools
-ARMADEUS-DEMOS_PARAMS = "VPU=yes"
-endif
+ ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE_VPU),y)
+ ARMADEUS-DEMOS_PARAMS = "VPU=yes"
+ ifeq ($(BR2_CPU_NAME),"imx51")
+ ARMADEUS-DEMOS_DEPS += imx-tool
+ endif
+ ifeq ($(BR2_CPU_NAME),"imx27")
+ ARMADEUS-DEMOS_DEPS += freescale-tools
+ endif
+ endif
endif
ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)
diff --git a/buildroot/package/armadeus/freescale-tools/07-misc-20071002-v4l2_fixes.patch b/buildroot/package/armadeus/freescale-tools/07-misc-20071002-v4l2_fixes.patch
new file mode 100644
index 0000000..a8df9cf
--- /dev/null
+++ b/buildroot/package/armadeus/freescale-tools/07-misc-20071002-v4l2_fixes.patch
@@ -0,0 +1,76 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff misc-20071002/test/mxc_vpu_test/vpu_capture.c misc-20071002.mod/test/mxc_vpu_test/vpu_capture.c
+--- misc-20071002/test/mxc_vpu_test/vpu_capture.c 2011-10-24 23:43:08.000000000 +0200
++++ misc-20071002.mod/test/mxc_vpu_test/vpu_capture.c 2011-10-24 20:40:54.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <fcntl.h>
+
+ #include <errno.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #include <string.h>
+ #include <malloc.h>
+
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff misc-20071002/test/mxc_vpu_test/vpu_codec.c misc-20071002.mod/test/mxc_vpu_test/vpu_codec.c
+--- misc-20071002/test/mxc_vpu_test/vpu_codec.c 2011-10-24 23:43:08.000000000 +0200
++++ misc-20071002.mod/test/mxc_vpu_test/vpu_codec.c 2011-10-24 20:44:03.000000000 +0200
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <sys/time.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+
+ #include "vpu_voip_test.h"
+ #include "vpu_display.h"
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff misc-20071002/test/mxc_vpu_test/vpu_codec_loopback_opt.c misc-20071002.mod/test/mxc_vpu_test/vpu_codec_loopback_opt.c
+--- misc-20071002/test/mxc_vpu_test/vpu_codec_loopback_opt.c 2011-10-24 23:43:08.000000000 +0200
++++ misc-20071002.mod/test/mxc_vpu_test/vpu_codec_loopback_opt.c 2011-10-24 20:46:04.000000000 +0200
+@@ -28,7 +28,7 @@
+ #include <pthread.h>
+ #include <signal.h>
+ #include <sys/time.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+
+ #include "vpu_voip_test.h"
+ #include "vpu_display.h"
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff misc-20071002/test/mxc_vpu_test/vpu_display.c misc-20071002.mod/test/mxc_vpu_test/vpu_display.c
+--- misc-20071002/test/mxc_vpu_test/vpu_display.c 2011-10-24 23:43:08.000000000 +0200
++++ misc-20071002.mod/test/mxc_vpu_test/vpu_display.c 2011-10-24 20:41:48.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <asm/types.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #include <linux/fb.h>
+ #include <sys/mman.h>
+ #include <math.h>
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff misc-20071002/test/mxc_vpu_test/vpu_voip_test.c misc-20071002.mod/test/mxc_vpu_test/vpu_voip_test.c
+--- misc-20071002/test/mxc_vpu_test/vpu_voip_test.c 2011-10-24 23:43:08.000000000 +0200
++++ misc-20071002.mod/test/mxc_vpu_test/vpu_voip_test.c 2011-10-24 20:45:13.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+
+ #include "rtp.h"
+ #include "vpu_display.h"
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff misc-20071002/test/mxc_vpu_test/vpu_loopback_opt_test.c misc-20071002.mod//test/mxc_vpu_test/vpu_loopback_opt_test.c
+--- misc-20071002/test/mxc_vpu_test/vpu_loopback_opt_test.c 2011-10-25 00:02:47.000000000 +0200
++++ misc-20071002.mod//test/mxc_vpu_test/vpu_loopback_opt_test.c 2011-10-24 23:50:01.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+
+ #include "rtp.h"
+ #include "vpu_display.h"
diff --git a/buildroot/package/armadeus/freescale-tools/imx-lib.mk b/buildroot/package/armadeus/freescale-tools/imx-lib.mk
index b68be67..14f27fd 100644
--- a/buildroot/package/armadeus/freescale-tools/imx-lib.mk
+++ b/buildroot/package/armadeus/freescale-tools/imx-lib.mk
@@ -24,6 +24,8 @@ endef
define IMX_LIB_INSTALL_STAGING_CMDS
install -D -m 755 $(@D)/vpu/libvpu.so $(STAGING_DIR)/usr/lib
+ install -D -m 755 $(@D)/vpu/vpu_io.h $(STAGING_DIR)/usr/include
+ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
endef
diff --git a/buildroot/package/armadeus/freescale-tools/imx-test.mk b/buildroot/package/armadeus/freescale-tools/imx-test.mk
index ad072ac..d200c20 100644
--- a/buildroot/package/armadeus/freescale-tools/imx-test.mk
+++ b/buildroot/package/armadeus/freescale-tools/imx-test.mk
@@ -22,7 +22,7 @@ define IMX_TEST_BUILD_CMDS
LINUXPATH=$(LINUX26_DIR) \
CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
PLATFORM=$(BUILD_PLATFORM) \
- DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_uart_test mxc_usb_test" \
+ DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
CFLAGS="$(BUILD_CFLAGS) -I$(LINUX26_DIR)/drivers/mxc/security/sahara2/include" \
-C $(@D)
endef
diff --git a/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch b/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
new file mode 100644
index 0000000..dd8f76d
--- /dev/null
+++ b/buildroot/package/armadeus/freescale-tools/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h
+--- imx-test-10.11.01/test/mxc_vpu_test/vpu_test.h 2010-11-02 21:53:40.000000000 +0100
++++ imx-test-10.11.01.mod/test/mxc_vpu_test/vpu_test.h 2011-10-24 23:26:23.000000000 +0200
+@@ -16,7 +16,7 @@
+ #ifndef _DEC_H
+ #define _DEC_H
+
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #include <pthread.h>
+ #include <errno.h>
+ #include <stdint.h>
diff --git a/target/demos/camera/capture/vpu_codec.c b/target/demos/camera/capture/vpu_codec.c
index 47917d4..0334ffb 100644
--- a/target/demos/camera/capture/vpu_codec.c
+++ b/target/demos/camera/capture/vpu_codec.c
@@ -30,7 +30,7 @@
#include <string.h>
#include <signal.h>
#include <sys/time.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include "rtp.h"
/*#include "vpu_voip_test.h"
hooks/post-receive
--
armadeus
|
