Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/kernel-ver.mk

@@ -4,11 +4,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		ce49828adecf8908eb3a9ffc5b860d44
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_14_22),y)
-KERNEL_VERSION:=	3.14.22
+ifeq ($(ADK_KERNEL_VERSION_3_14_26),y)
+KERNEL_VERSION:=	3.14.26
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		cb00fadd0a720cc2d1690792e72e0134
+KERNEL_MD5SUM:=		9a91a9c507c9efb68c7075e151c30fa7
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_12_33),y)
 KERNEL_VERSION:=	3.12.33

package/firmware-imx/Makefile

@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		firmware-imx
-PKG_VERSION:=		3.10.17-1.0.0
+PKG_VERSION:=		3.10.31-1.1.0-beta
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		29a54f6e5bf889a00cd8ca85080af223
-PKG_DESCR:=		IMX firmware (Freescale)
+PKG_MD5SUM:=		4e102affc4273f424da4cec9f46adae8
+PKG_DESCR:=		IMX VPU firmware (Freescale)
 PKG_SECTION:=		sys/firmware
 PKG_URL:=		http://www.freescale.com/
 PKG_SITES:=		http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
@@ -25,8 +25,8 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 firmware-imx-install:
-	$(INSTALL_DIR) $(IDIR_FIRMWARE_IMX)/lib/firmware
-	${CP} ${WRKBUILD}/firmware/{sdma,vpu} \
-		$(IDIR_FIRMWARE_IMX)/lib/firmware
+	$(INSTALL_DIR) $(IDIR_FIRMWARE_IMX)/lib/firmware/vpu
+	${CP} ${WRKBUILD}/firmware/vpu/vpu_fw_imx6* \
+		$(IDIR_FIRMWARE_IMX)/lib/firmware/vpu
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/imx-lib/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		imx-lib
-PKG_VERSION:=		3.10.17-1.0.0
+PKG_VERSION:=		3.10.31-1.1.0-beta
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8e3346d5f33b5aa5f915a0dd8aa99cc9
+PKG_MD5SUM:=		0485e457eafe5a10274d171b3af79e2f
 PKG_DESCR:=		IMX library (Freescale)
 PKG_SECTION:=		libs/video
 PKG_URL:=		http://www.freescale.com/

package/imx-vpu/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		imx-vpu
-PKG_VERSION:=		3.10.17-1.0.0
+PKG_VERSION:=		3.10.31-1.1.0-beta
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		71ea1b803864101ebf88a1bab45514d2
+PKG_MD5SUM:=		ab76e7395b6a178a8538a6d5beb87656
 PKG_DESCR:=		IMX VPU library (Freescale)
 PKG_DEPENDS:=		firmware-imx
 PKG_SECTION:=		libs/video

package/kodi/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
-PKG_VERSION:=		14.0rc2
+PKG_VERSION:=		14.0rc3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f56aeb81db6878fcac6631f6a3e2c702
+PKG_MD5SUM:=		ab161aa0dee4ca77b977d3ca2f4ebdd5
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
@@ -174,23 +174,25 @@ CONFIGURE_ARGS+=	--disable-x11 \
 endif
 
 pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
+	(cd $(WRKBUILD)/lib/cpluff && env PATH='$(AUTOTOOL_PATH)' ./autogen.sh)
 
 pre-build:
-	PATH=$(HOST_PATH) \
+	PATH='$(HOST_PATH)' \
 	make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
 		CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
 		 -C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder
 
 kodi-install:
-	$(INSTALL_DIR) $(IDIR_KODI)/usr/lib/xbmc/addons
-	$(CP) $(WRKINST)/usr/lib/xbmc/* \
-		$(IDIR_KODI)/usr/lib/xbmc
-	$(INSTALL_DIR) $(IDIR_KODI)/usr/share/xbmc
-	$(CP) $(WRKINST)/usr/share/xbmc/* \
-		$(IDIR_KODI)/usr/share/xbmc
+	$(INSTALL_DIR) $(IDIR_KODI)/usr/lib/kodi/addons
+	$(CP) $(WRKINST)/usr/lib/kodi/* \
+		$(IDIR_KODI)/usr/lib/kodi
+	$(INSTALL_DIR) $(IDIR_KODI)/usr/share/kodi
+	$(CP) $(WRKINST)/usr/share/kodi/* \
+		$(IDIR_KODI)/usr/share/kodi
 	$(INSTALL_DIR) $(IDIR_KODI)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/xbmc \
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/kodi-standalone \
+		$(IDIR_KODI)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/kodi \
 		$(IDIR_KODI)/usr/bin
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/kodi/files/kodi.init

@@ -12,11 +12,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	export LD_LIBRARY_PATH=/opt/vc/lib
-	xbmc &
+	kodi &
 	;;
 stop)
-	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
+	kill $(pgrep -f /usr/lib/kodi/kodi.bin)
 	;;
 restart)
 	sh $0 stop

package/kodi/patches/patch-configure_in

@@ -1,6 +1,6 @@
---- kodi-14.0alpha4.orig/configure.in	2014-10-06 11:34:24.000000000 -0500
-+++ kodi-14.0alpha4/configure.in	2014-10-08 01:40:53.444436000 -0500
-@@ -1011,7 +1011,7 @@ if test "$use_gles" = "yes"; then
+--- kodi-14.0rc2.orig/configure.in	2014-12-05 19:38:42.000000000 -0600
++++ kodi-14.0rc2/configure.in	2014-12-07 03:43:25.212418001 -0600
+@@ -1008,7 +1008,7 @@ if test "$use_gles" = "yes"; then
        AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
        AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
        AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)

package/kodi/patches/patch-tools_Linux_kodi_sh_in

@@ -0,0 +1,39 @@
+--- kodi-14.0rc2.orig/tools/Linux/kodi.sh.in	2014-12-05 19:38:43.000000000 -0600
++++ kodi-14.0rc2/tools/Linux/kodi.sh.in	2014-12-07 08:33:01.128418001 -0600
+@@ -86,15 +86,7 @@ print_crash_report()
+   echo -n " Kernel: " >> $FILE
+   uname -rvs >> $FILE
+   echo -n " Release: " >> $FILE
+-  if [ -f /etc/os-release ]; then
+-	  . /etc/os-release
+-	  echo $NAME $VERSION >> $FILE
+-  elif command_exists lsb_release; then
+-    echo >> $FILE
+-    lsb_release -a 2> /dev/null | sed -e 's/^/    /' >> $FILE
+-  else
+-    echo "lsb_release not available" >> $FILE
+-  fi
++  echo OpenADK >> $FILE
+   echo "############## END SYSTEM INFO ##############" >> $FILE
+   echo >> $FILE
+   echo "############### STACK TRACE #################" >> $FILE
+@@ -138,19 +130,6 @@ print_crash_report()
+ }
+ 
+ migrate_home
+-python @datadir@/${bin_name}/FEH.py $SAVED_ARGS
+-RET=$?
+-if [ $RET -ne 0 ]; then
+-  exit $RET
+-fi
+-
+-if command_exists gdb; then
+-  # Output warning in case ulimit is unsupported by shell
+-  eval ulimit -c unlimited
+-  if [ ! $? = "0" ]; then
+-    echo "${bin_name}: ulimit is unsupported by this shell" 1>&2
+-  fi
+-fi
+ 
+ LOOP=1
+ while [ $(( $LOOP )) = "1" ]

package/kodi/patches/patch-xbmc_Application_cpp

@@ -0,0 +1,14 @@
+--- kodi-14.0rc2.orig/xbmc/Application.cpp	2014-12-05 19:38:44.000000000 -0600
++++ kodi-14.0rc2/xbmc/Application.cpp	2014-12-07 10:16:27.900418001 -0600
+@@ -1076,10 +1076,7 @@ bool CApplication::InitDirectoriesLinux(
+     userName = "root";
+ 
+   std::string userHome;
+-  if (getenv("HOME"))
+-    userHome = getenv("HOME");
+-  else
+-    userHome = "/root";
++  userHome = "/data/kodi";
+ 
+   std::string appBinPath, appPath;
+   std::string appName = CCompileInfo::GetAppName();

package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp

@@ -1,6 +1,6 @@
---- kodi-14.0alpha4.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-09-05 14:09:59.000000000 +0200
-+++ kodi-14.0alpha4/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-09-05 15:53:47.432904545 +0200
-@@ -490,8 +490,8 @@ void CDVDDemuxFFmpeg::Reset()
+--- kodi-14.0rc2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-12-05 19:38:44.000000000 -0600
++++ kodi-14.0rc2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-12-07 03:43:25.308418001 -0600
+@@ -520,8 +520,8 @@ void CDVDDemuxFFmpeg::Reset()
  void CDVDDemuxFFmpeg::Flush()
  {
    // naughty usage of an internal ffmpeg function
@@ -9,5 +9,5 @@
 +  //if (m_pFormatContext)
 +   // av_read_frame_flush(m_pFormatContext);
  
-   m_iCurrentPts = DVD_NOPTS_VALUE;
+   m_currentPts = DVD_NOPTS_VALUE;
  

package/kodi/patches/patch-xbmc_utils_SystemInfo_cpp

@@ -1,11 +1,52 @@
---- kodi-14.0alpha4.orig/xbmc/utils/SystemInfo.cpp	2014-10-10 15:03:29.000000000 -0500
-+++ kodi-14.0alpha4/xbmc/utils/SystemInfo.cpp	2014-10-29 20:29:31.614352000 -0500
-@@ -618,7 +618,7 @@ std::string CSysInfo::GetOsName(bool emp
- #elif defined (TARGET_ANDROID)
+--- kodi-14.0rc2.orig/xbmc/utils/SystemInfo.cpp	2014-12-05 19:38:44.000000000 -0600
++++ kodi-14.0rc2/xbmc/utils/SystemInfo.cpp	2014-12-07 23:48:19.332418001 -0600
+@@ -615,16 +615,11 @@ std::string CSysInfo::GetOsName(bool emp
+     osName = "iOS";
+ #elif defined(TARGET_DARWIN_OSX)
+     osName = "OS X";
+-#elif defined (TARGET_ANDROID)
++#elif defined(TARGET_ANDROID)
      osName = "Android";
  #elif defined(TARGET_LINUX)
 -    osName = getValueFromOs_release("NAME");
+-    if (osName.empty())
+-      osName = getValueFromLsb_release(lsb_rel_distributor);
+-    if (osName.empty())
+-      osName = getValueFromOs_release("ID");
+-#endif // defined(TARGET_LINUX)
+-
 +    osName = "OpenADK";
++#endif
      if (osName.empty())
-       osName = getValueFromLsb_release(lsb_rel_distributor);
-     if (osName.empty())
+       osName = "Unknown OS";
+   }
+@@ -665,7 +660,7 @@ std::string CSysInfo::GetOsVersion(void)
+ #elif defined(TARGET_LINUX)
+   osVersion = getValueFromOs_release("VERSION_ID");
+   if (osVersion.empty())
+-    osVersion = getValueFromLsb_release(lsb_rel_release);
++    osVersion = "1.0";
+ #endif // defined(TARGET_LINUX)
+ 
+   if (osVersion.empty())
+@@ -737,19 +732,7 @@ std::string CSysInfo::GetOsPrettyNameWit
+ #elif defined(TARGET_ANDROID)
+   osNameVer = GetOsName() + " " + GetOsVersion() + " API level " +   StringUtils::Format("%d", CJNIBuild::SDK_INT);
+ #elif defined(TARGET_LINUX)
+-  osNameVer = getValueFromOs_release("PRETTY_NAME");
+-  if (osNameVer.empty())
+-  {
+-    osNameVer = getValueFromLsb_release(lsb_rel_description);
+-    std::string osName(GetOsName(true));
+-    if (!osName.empty() && osNameVer.find(osName) == std::string::npos)
+-      osNameVer = osName + osNameVer;
+-    if (osNameVer.empty())
+-      osNameVer = "Unknown Linux Distribution";
+-  }
+-
+-  if (osNameVer.find(GetOsVersion()) == std::string::npos)
+-    osNameVer += " " + GetOsVersion();
++  osNameVer = GetOsName() + " " + GetOsVersion();
+ #endif // defined(TARGET_LINUX)
+ 
+   if (osNameVer.empty())

scripts/install.sh

@@ -518,7 +518,7 @@ if (( datafssz )); then
 	((keep)) || create_fs "$datapart" ADKDATA ext4
 	((keep)) || tune_fs "$datapart"
 	mount_fs "$datapart" "$D" ext4
-	mkdir -m0755 "$D/mpd" "$D/xbmc" 2>/dev/null
+	mkdir -m0755 "$D/mpd" "$D/kodi" 2>/dev/null
 	umount_fs "$D"
 	case $target {
 	(raspberry-pi)

target/arm/kernel/solidrun-imx6

@@ -11,6 +11,7 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
 CONFIG_PCI_IMX6=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y

target/config/Config.in.kernelversion.choice

@@ -4,7 +4,7 @@
 choice
 prompt "Kernel Version"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_3_14_22 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+default ADK_KERNEL_VERSION_3_14_26 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 default ADK_KERNEL_VERSION_3_17.4
 
 config ADK_KERNEL_VERSION_3_17_4
@@ -13,8 +13,8 @@ config ADK_KERNEL_VERSION_3_17_4
 	boolean
 	select ADK_KERNEL_VERSION_3_17
 
-config ADK_KERNEL_VERSION_3_14_22
-	prompt "3.14.22"
+config ADK_KERNEL_VERSION_3_14_26
+	prompt "3.14.26"
 	boolean
 	select ADK_KERNEL_VERSION_3_14
 

target/config/Config.in.kernelversion.default

@@ -19,7 +19,7 @@ config ADK_KERNEL_VERSION_3_4
 config ADK_KERNEL_VERSION
 	string
 	default "3.17.4" if ADK_KERNEL_VERSION_3_17_4
-	default "3.14.22" if ADK_KERNEL_VERSION_3_14_22
+	default "3.14.26" if ADK_KERNEL_VERSION_3_14_26
 	default "3.12.33" if ADK_KERNEL_VERSION_3_12_33
 	default "3.10.53" if ADK_KERNEL_VERSION_3_10_53
 	default "3.4.103" if ADK_KERNEL_VERSION_3_4_103

target/linux/config/Config.in.graphics

@@ -60,6 +60,9 @@ config ADK_KERNEL_FB_MXC_HDMI
 config ADK_KERNEL_MXC_IPU
  	boolean
 
+config ADK_KERNEL_MXC_VPU
+ 	boolean
+
 config ADK_KERNEL_MXC_GPU_VIV
  	boolean
 
@@ -237,6 +240,7 @@ config ADK_KERNEL_DRM_VIVANTE
 	select ADK_KERNEL_MXC_MIPI_CSI2
 	select ADK_KERNEL_MXC_MLB150
 	select ADK_KERNEL_FB_MXC_EDID
+	select ADK_KERNEL_MXC_VPU
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_14
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6