jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 21:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1634 from vpeter4/imx6_options_8

Browse Source 
imx6/options: unify linux version strings and simplify it's usage …
This commit is contained in:
Christian Hewitt 2017-05-24 00:12:21 +04:00 committed by GitHub
commit 7a8d54fded
5 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/devel/libcec/package.mk
View File

@ -22,13 +22,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://libcec.pulse-eight.com/" PKG_SITE="http://libcec.pulse-eight.com/"
PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz"
if [ "$PROJECT" = "imx6" ]; then [ "$PROJECT" = "imx6" ] && PKG_PATCH_DIRS="${LINUX#imx6-}"
if [ "$LINUX_VERSION" = "sr-3.14" ]; then
PKG_PATCH_DIRS="3.14-sr"
else
PKG_PATCH_DIRS="4.4-xbian"
fi
fi
PKG_DEPENDS_TARGET="toolchain systemd lockdev p8-platform" PKG_DEPENDS_TARGET="toolchain systemd lockdev p8-platform"
PKG_SECTION="system" PKG_SECTION="system"
PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor" PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"

2
packages/graphics/imx-gpu-viv/package.mk
View File

@ -62,7 +62,7 @@ makeinstall_target() {
g2d/usr/lib/libg2d*.so*" g2d/usr/lib/libg2d*.so*"
# missing in 5.0.11.p7.4-hfp # missing in 5.0.11.p7.4-hfp
if [ "$LINUX" = "imx6-3.14-sr" ]; then if [ "$PKG_VERSION" = "5.0.11.p4.5-hfp" ]; then
LIBS_COPY="$LIBS_COPY \ LIBS_COPY="$LIBS_COPY \
gpu-core/usr/lib/libGAL_egl.fb.so \ gpu-core/usr/lib/libGAL_egl.fb.so \
gpu-core/usr/lib/libGAL_egl.so*" gpu-core/usr/lib/libGAL_egl.so*"

9
packages/linux/package.mk
View File

@ -130,15 +130,6 @@ post_patch() {
sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config
sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config
fi fi
# enable different libcec version for imx6 project with kernel 4.4
# using customized kernel driver
if [ "$PROJECT" = "imx6" ]; then
if [ "$LIBCEC_TYPE" = "xbian" -a "$LINUX" = "imx6-4.4-xbian" ]; then
sed -i -e "s|# CONFIG_MXC_HDMI_CEC is not set|CONFIG_MXC_HDMI_CEC=y|" $PKG_BUILD/.config
sed -i -e "s|CONFIG_MXC_HDMI_CEC_SR=y||" $PKG_BUILD/.config
fi
fi
} }
makeinstall_host() { makeinstall_host() {

3
projects/imx6/linux/4.4-xbian/linux.arm.conf
View File

@ -5874,8 +5874,7 @@ CONFIG_MXC_VPU=y
# #
# MXC HDMI CEC (Consumer Electronics Control) support # MXC HDMI CEC (Consumer Electronics Control) support
# #
# CONFIG_MXC_HDMI_CEC is not set CONFIG_MXC_HDMI_CEC=y
CONFIG_MXC_HDMI_CEC_SR=y
# #
# MXC MIPI Support # MXC MIPI Support

15
projects/imx6/options
View File

@ -50,20 +50,23 @@
# Kernel to use. # Kernel to use.
# default is 4.4 from xbian # default is 4.4 from xbian
if [ "$LINUX_VERSION" = "sr-3.14" ]; then if [ "$LINUX_VERSION" = "3.14-sr" ]; then
LINUX="imx6-3.14-sr" LINUX="imx6-$LINUX_VERSION"
# OpenGL-ES implementation to use # OpenGL-ES implementation to use
OPENGLES="imx-gpu-viv" OPENGLES="imx-gpu-viv"
elif [ "$LINUX_VERSION" = "xbian-4.8" ]; then elif [ "$LINUX_VERSION" = "4.8-xbian" ]; then
LINUX="imx6-4.8-xbian" LINUX="imx6-$LINUX_VERSION"
LIBCEC_TYPE="xbian"
# OpenGL-ES implementation to use
OPENGLES="gpu-viv-bin-mx6q"
elif [ "$LINUX_VERSION" = "4.10-xbian" ]; then
LINUX="imx6-$LINUX_VERSION"
# OpenGL-ES implementation to use # OpenGL-ES implementation to use
OPENGLES="gpu-viv-bin-mx6q" OPENGLES="gpu-viv-bin-mx6q"
else else
LINUX="imx6-4.4-xbian" LINUX="imx6-4.4-xbian"
LIBCEC_TYPE="xbian"
# OpenGL-ES implementation to use # OpenGL-ES implementation to use
OPENGLES="imx-gpu-viv" OPENGLES="imx-gpu-viv"