From 1f37c6315f0718daf86085088252986ef3196362 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 13 May 2015 15:32:33 -0500
Subject: fix kodi on imx6

---
 package/gpu-viv-bin-mx6q/Makefile | 34 ----------------------------------
 package/imx-gpu-viv/Makefile      | 34 ++++++++++++++++++++++++++++++++++
 package/kodi/Makefile             |  4 ++--
 target/appliances/kodi.appliance  |  2 +-
 4 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 package/gpu-viv-bin-mx6q/Makefile
 create mode 100644 package/imx-gpu-viv/Makefile

diff --git a/package/gpu-viv-bin-mx6q/Makefile b/package/gpu-viv-bin-mx6q/Makefile
deleted file mode 100644
index 948e97190..000000000
--- a/package/gpu-viv-bin-mx6q/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		gpu-viv-bin-mx6q
-PKG_VERSION:=		3.10.17-1.0.0
-PKG_RELEASE:=		1
-PKG_HASH:=		7e5a3db22b99740756f408b881691f81c03090256754e44f69369bf039e9cbcf
-PKG_DESCR:=		imx gpu library (vivante gpu)
-PKG_SECTION:=		libs/video
-PKG_URL:=		http://www.freescale.com/
-PKG_SITES:=		http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-hfp.bin
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-hfp
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,GPU_VIV_BIN_MX6Q,gpu-viv-bin-mx6q,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-gpu-viv-bin-mx6q-install:
-	$(INSTALL_DIR) $(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib
-	$(CP) $(WRKBUILD)/usr/lib/lib*.so* \
-		$(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib
-	$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/include
-	$(CP) $(WRKBUILD)/usr/include/* \
-		$(STAGING_TARGET_DIR)/usr/include
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/imx-gpu-viv/Makefile b/package/imx-gpu-viv/Makefile
new file mode 100644
index 000000000..df9ba77a4
--- /dev/null
+++ b/package/imx-gpu-viv/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		imx-gpu-viv
+PKG_VERSION:=		5.0.11.p4.4
+PKG_RELEASE:=		1
+PKG_HASH:=		92654c185835e139cc9485806ad184fdac21f4d640ec9d0e493669235d21de9b
+PKG_DESCR:=		imx vivante gpu library
+PKG_SECTION:=		libs/video
+PKG_URL:=		http://www.freescale.com/
+PKG_SITES:=		http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-hfp.bin
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-hfp
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,IMX_GPU_VIV,imx-gpu-viv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+imx-gpu-viv-install:
+	$(INSTALL_DIR) $(IDIR_IMX_GPU_VIV)/usr/lib
+	$(CP) $(WRKBUILD)/gpu-core/usr/lib/lib*.so* \
+		$(IDIR_IMX_GPU_VIV)/usr/lib
+	$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/include
+	$(CP) $(WRKBUILD)/gpu-core/usr/include/* \
+		$(STAGING_TARGET_DIR)/usr/include
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 572c6826b..d0cb87c13 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -65,8 +65,8 @@ PKG_DEPENDS_RASPBERRY_PI:=	bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm28xx-vc
 PKG_DEPENDS_RASPBERRY_PI2:=	bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs
 PKG_BUILDDEP_RASPBERRY_PI2:=	bcm28xx-vc
-PKG_DEPENDS_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
-PKG_BUILDDEP_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
+PKG_DEPENDS_SOLIDRUN_IMX6:=	libfslvpuwrap imx-gpu-viv
+PKG_BUILDDEP_SOLIDRUN_IMX6:=	libfslvpuwrap imx-gpu-viv
 PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 solidrun-imx6
 
 DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance
index 68232afa4..4982a6f77 100644
--- a/target/appliances/kodi.appliance
+++ b/target/appliances/kodi.appliance
@@ -23,7 +23,7 @@ config ADK_APPLIANCE_KODI
 	select ADK_PACKAGE_BCM28XX_VC_LIBS if ADK_TARGET_BOARD_BCM28XX
 	select ADK_PACKAGE_BCM28XX_VC_GL_LIBS if ADK_TARGET_BOARD_BCM28XX
 	select ADK_PACKAGE_LIBFSLVPUWRAP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	select ADK_PACKAGE_IMX_GPU_VIV if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_ARCH_ARM_WITH_NEON if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	help
 	  Create a small kodi multimedia appliance. Please enable additional features
-- 
cgit v1.2.3