summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/gpu-viv-bin-mx6q/Makefile13
-rw-r--r--package/gpu-viv-g2d/Makefile35
-rw-r--r--package/imx-lib/Makefile2
-rw-r--r--package/kodi/Makefile2
-rw-r--r--target/appliances/kodi.appliance2
5 files changed, 43 insertions, 11 deletions
diff --git a/package/gpu-viv-bin-mx6q/Makefile b/package/gpu-viv-bin-mx6q/Makefile
index 7de452f2c..9024275ba 100644
--- a/package/gpu-viv-bin-mx6q/Makefile
+++ b/package/gpu-viv-bin-mx6q/Makefile
@@ -6,10 +6,11 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= gpu-viv-bin-mx6q
PKG_VERSION:= 3.10.17-1.0.2
PKG_RELEASE:= 1
-PKG_HASH:= 92654c185835e139cc9485806ad184fdac21f4d640ec9d0e493669235d21de9b
+PKG_HASH:= d480546638b39d37b7e571d131b480a2f2f0380299ea6b2b691a02b2173ea273
PKG_DESCR:= imx vivante gpu library
PKG_SECTION:= libs/video
-PKG_BUILDDEP:= libfslvpuwrap
+PKG_DEPENDS:= libfslvpuwrap imx-lib imx-vpu gpu-viv-g2d
+PKG_BUILDDEP:= libfslvpuwrap imx-lib imx-vpu gpu-viv-g2d
PKG_URL:= http://www.freescale.com/
PKG_SITES:= http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
@@ -28,14 +29,10 @@ INSTALL_STYLE:= manual
gpu-viv-bin-mx6q-install:
$(INSTALL_DIR) $(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib
- $(CP) $(WRKBUILD)/gpu-core/usr/lib/lib*.so* \
- $(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib
- $(CP) $(WRKBUILD)/g2d/usr/lib/lib*.so* \
+ $(CP) $(WRKBUILD)/usr/lib/lib*.so* \
$(IDIR_GPU_VIV_BIN_MX6Q)/usr/lib
$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/include
- $(CP) $(WRKBUILD)/gpu-core/usr/include/* \
- $(STAGING_TARGET_DIR)/usr/include
- $(CP) $(WRKBUILD)/g2d/usr/include/* \
+ $(CP) $(WRKBUILD)/usr/include/* \
$(STAGING_TARGET_DIR)/usr/include
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gpu-viv-g2d/Makefile b/package/gpu-viv-g2d/Makefile
new file mode 100644
index 000000000..7d76071f2
--- /dev/null
+++ b/package/gpu-viv-g2d/Makefile
@@ -0,0 +1,35 @@
+# 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-g2d
+PKG_VERSION:= 3.10.17-1.0.2
+PKG_RELEASE:= 1
+PKG_HASH:= 585a19071d9801a02178b94434c8f6393fa59cd361e96b2721bb20562d287d28
+PKG_DESCR:= vivante 2d library
+PKG_SECTION:= libs/video
+PKG_URL:= http://www.freescale.com/
+PKG_SITES:= http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+
+PKG_SYSTEM_DEPENDS:= solidrun-imx6
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.bin
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GPU_VIV_G2D,gpu-viv-g2d,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
+gpu-viv-g2d-install:
+ $(INSTALL_DIR) $(IDIR_GPU_VIV_G2D)/usr/lib
+ $(CP) $(WRKBUILD)/usr/lib/lib*.so* \
+ $(IDIR_GPU_VIV_G2D)/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-lib/Makefile b/package/imx-lib/Makefile
index 9e14161da..fbb3f3db9 100644
--- a/package/imx-lib/Makefile
+++ b/package/imx-lib/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= imx-lib
PKG_VERSION:= 3.10.31-1.1.0-beta
PKG_RELEASE:= 1
PKG_HASH:= 011eb34c6fd1b1ea9894bbe07a539c1aeee1500bc8fdd29d8ce1dc1d02f79e24
-PKG_DESCR:= IMX library (Freescale)
+PKG_DESCR:= imx library
PKG_SECTION:= libs/video
PKG_URL:= http://www.freescale.com/
PKG_SITES:= http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index fd971e0c2..c34e30732 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -30,6 +30,8 @@ PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish
PKG_URL:= http://kodi.tv/
PKG_SITES:= https://github.com/xbmc/xbmc/archive/
+PKG_CFLINE_KODI:= select ADK_PACKAGE_GPU_VIV_BIN_MX6Q if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+
DISTFILES:= $(PKG_VERSION)-Isengard.tar.gz
WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Isengard
diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance
index a65a53f1a..7069d8e15 100644
--- a/target/appliances/kodi.appliance
+++ b/target/appliances/kodi.appliance
@@ -1,7 +1,5 @@
config ADK_APPLIANCE_KODI
bool "kodi multimedia appliance"
- select ADK_KERNEL_VERSION_3_14_45 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
- select ADK_KERNEL_VERSION_3_18_16 if ADK_TARGET_BOARD_BCM28XX
select ADK_TARGET_LIB_GLIBC
select ADK_PACKAGE_GLIBC
select ADK_PACKAGE_GLIBC_GCONV