commit BSP v1.8.0

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

4 files changed, 143 insertions, 0 deletions

diff --git a/common/recipes-multimedia/omxil-sh/omxil-sh/0001-Removed-include-path-of-VPUMW-and-fixed-the-path-tha.patch b/common/recipes-multimedia/omxil-sh/omxil-sh/0001-Removed-include-path-of-VPUMW-and-fixed-the-path-tha.patch
new file mode 100644
index 0000000..032a286
--- /dev/null
+++ b/common/recipes-multimedia/omxil-sh/omxil-sh/0001-Removed-include-path-of-VPUMW-and-fixed-the-path-tha.patch
@@ -0,0 +1,28 @@
+From 26d17f5f9bedfc42fd3482c521ff7e492542d66a Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+Date: Tue, 25 Mar 2014 16:13:48 +0900
+Subject: [PATCH] Removed include path of VPUMW and fixed the path that refers
+ to firmware
+
+---
+ src/vpu5/Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vpu5/Makefile.am b/src/vpu5/Makefile.am
+index f446593..d7618ce 100644
+--- a/src/vpu5/Makefile.am
++++ b/src/vpu5/Makefile.am
+@@ -8,8 +8,8 @@ endif
+ 
+ VPU5_LIBS = -L@VPUMW_PATH@/lib \
+ 	@VPU_CMN_LIBS@
+-VPU5_CFLAGS = -I@VPUMW_PATH@/include \
+-	-DVPU5HG_FIRMWARE_PATH=\"@VPUMW_PATH@/lib/firmware\" \
++VPU5_CFLAGS = \
++	-DVPU5HG_FIRMWARE_PATH=\"/usr/lib/firmware\" \
+ 	-D$(VPU_VERSION) -D$(VPU_SERIES)
+ 
+ OPTIONAL_SOURCES =
+-- 
+1.7.9.5
+
diff --git a/common/recipes-multimedia/omxil-sh/omxil-sh/0001-vpu5-avc-parse-correct-pNal-size-calculation-for-EOS.patch b/common/recipes-multimedia/omxil-sh/omxil-sh/0001-vpu5-avc-parse-correct-pNal-size-calculation-for-EOS.patch
new file mode 100644
index 0000000..ca1f494
--- /dev/null
+++ b/common/recipes-multimedia/omxil-sh/omxil-sh/0001-vpu5-avc-parse-correct-pNal-size-calculation-for-EOS.patch
@@ -0,0 +1,29 @@
+From a0e04460ec45afd25d58985c9144819c41d7ad4d Mon Sep 17 00:00:00 2001
+From: Osamu Fukushima <osamu.fukushima.wr@renesas.com>
+Date: Thu, 30 May 2013 13:29:21 +0900
+Subject: [PATCH] vpu5: avc parse: correct pNal->size calculation for EOS nal
+
+---
+ src/vpu5/shvpu5_avcdec_parse.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/vpu5/shvpu5_avcdec_parse.c b/src/vpu5/shvpu5_avcdec_parse.c
+index bd6ea18..1e529f5 100644
+--- a/src/vpu5/shvpu5_avcdec_parse.c
++++ b/src/vpu5/shvpu5_avcdec_parse.c
+@@ -396,6 +396,12 @@ parseAVCBuffer(shvpu_decode_PrivateType *shvpu_decode_Private,
+ 			avcparse->pPrevBuffer = pBuffer;
+ 			pStartSub = NULL;
+ 			nSizeSub = 0;
++		} else if(eos) {
++			pStartSub = NULL;
++			nSizeSub = 0;
++			pNal->splitBufferLen = 0;
++			pNal->size = nRemainSize + 1;
++			nRemainSize = 0;
+ 		} else {
+ 			pNal->size = pHead - pStart;
+ 			nRemainSize -= pNal->size;
+-- 
+1.7.9.5
+
diff --git a/common/recipes-multimedia/omxil-sh/omxil-sh/vcp1-library-change.patch b/common/recipes-multimedia/omxil-sh/omxil-sh/vcp1-library-change.patch
new file mode 100644
index 0000000..15af4c4
--- /dev/null
+++ b/common/recipes-multimedia/omxil-sh/omxil-sh/vcp1-library-change.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 355289e..468f6ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -295,9 +295,8 @@ AS_CASE([$with_vpu5_version],
+ 	[VCP1],
+ 		[VPU_VERSION="VPU_VERSION_VCP1"
+ 		 VPU_SERIES="VPU5HA_SERIES"
+-		 VPU_CMN_LIBS="-lmcvdecvcp1a_lx30 -lmciphvcp1a_lx30"
+-		 VPU_DEC_LIBS="-lavcdecvcp1a_lx30 -lmciphvcp1cmndeca_lx30 \
+-			       -lmciphvcp1avcdeca_lx30 -lmciphvcp1cmna_lx30"],
++		 VPU_CMN_LIBS="-lvcp1_mciph -lvcp1_mciph_cmn -lvcp1_mciph_cmndec -lvcp1_mcvd"
++		 VPU_DEC_LIBS="-lvcp1_avcd -lvcp1_mciph_avcdec"],
+ dnl  	default
+ 		[with_vpu5_version=VPU5HG
+ 		VPU_VERSION="VPU_VERSION_5"
diff --git a/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb b/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb
new file mode 100644
index 0000000..e65072b
--- /dev/null
+++ b/common/recipes-multimedia/omxil-sh/omxil-sh_git.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "A collection of OpenMAX IL components for SH-Mobile, using the \
+Bellagio OpenMAX IL project framework."
+HOMEPAGE = "https://github.com/dhobsong/omxil-sh"
+BUGTRACKER = "https://github.com/dhobsong/omxil-sh"
+SECTION = "multimedia"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+PR = "r3"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRCREV = "af89fcc030e3e5f82ce669fdfea2af105a73cf87"
+SRC_URI = "git://github.com/dhobsong/omxil-sh.git \
+	file://0001-vpu5-avc-parse-correct-pNal-size-calculation-for-EOS.patch \
+	file://0001-Removed-include-path-of-VPUMW-and-fixed-the-path-tha.patch \
+"
+DEPENDS = "libomxil libuiomux"
+S = "${WORKDIR}/git"
+
+# for armadillo800eva
+SRCREV_armadillo800eva = "bd43cfba750773cd323fb546f279e76b37c6d713"
+SRC_URI_append_armadillo800eva = " file://vcp1-library-change.patch"
+CHECK_OMXIL_SH_MW = "${USE_RENESAS_MW_VCP1}" 
+CHECK_OMXIL_SH_MW += "${USE_RENESAS_MW_VPU5}"
+DEPENDS_append_armadillo800eva = ' ${@base_contains("CHECK_OMXIL_SH_MW", "1", "vcp1", "", d)}'
+
+inherit autotools pkgconfig
+
+VPUMW_PATH = "/usr/"
+
+EXTRA_OECONF = "--with-vpumw-path=${VPUMW_PATH} \
+	--enable-tl_conv=kernel \
+	--enable-tl_conv_internal \
+	--with-vpu5_version=VCP1 \
+	--disable-vpu5_encoder \
+	--disable-meram \
+	--enable-vpc \
+"
+ 
+do_configure() {
+	autoreconf -vif
+	oe_runconf
+}
+
+PACKAGES = "\
+	${PN} \
+	${PN}-dev \
+	${PN}-staticdev \
+"
+
+# need *.so, these are used by omx.
+INSANE_SKIP_${PN} = "dev-so" 
+FILES_${PN} += " \
+	${libdir}/bellagio/*.so.* \
+	${libdir}/bellagio/*.so \
+"
+
+FILES_${PN}-dev += " \
+	${libdir}/bellagio/*.la \
+"
+
+FILES_${PN}-staticdev = " \
+	${libdir}/bellagio/*.a \
+"
+
+#FILES_${PN}-dbg += " \
+#	${libdir}/bellagio/.debug/* \
+#"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"