From ca4344d3568822d5297dc66b1468dd3d725542e7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 May 2015 11:16:09 +0200 Subject: [PATCH] gpu-viv-bin-mx6q: rename to package 'imx-gpu-viv', update to imx-gpu-viv-5.0.11.p4.4, merge package 'gpu-viv-g2d' to package 'imx-gpu-viv' Signed-off-by: Stephan Raue --- packages/graphics/gpu-viv-bin-mx6q/package.mk | 85 ----------------- packages/graphics/gpu-viv-g2d/package.mk | 45 --------- packages/graphics/imx-gpu-viv/package.mk | 94 +++++++++++++++++++ .../system.d/unbind-console.service | 0 packages/mediacenter/kodi/package.mk | 1 - projects/Generic/options | 2 +- projects/Nvidia_Legacy/options | 2 +- projects/RPi/options | 2 +- projects/RPi2/options | 2 +- projects/WeTek_Play/options | 2 +- projects/imx6/linux/linux.arm.conf | 4 +- projects/imx6/options | 4 +- 12 files changed, 103 insertions(+), 140 deletions(-) delete mode 100644 packages/graphics/gpu-viv-bin-mx6q/package.mk delete mode 100644 packages/graphics/gpu-viv-g2d/package.mk create mode 100644 packages/graphics/imx-gpu-viv/package.mk rename packages/graphics/{gpu-viv-bin-mx6q => imx-gpu-viv}/system.d/unbind-console.service (100%) diff --git a/packages/graphics/gpu-viv-bin-mx6q/package.mk b/packages/graphics/gpu-viv-bin-mx6q/package.mk deleted file mode 100644 index d821b95aa7..0000000000 --- a/packages/graphics/gpu-viv-bin-mx6q/package.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="gpu-viv-bin-mx6q" -PKG_VERSION="3.10.17-1.0.0-1" -PKG_REV="1" -PKG_ARCH="arm" -PKG_LICENSE="nonfree" -PKG_SITE="http://www.freescale.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="graphics" -PKG_SHORTDESC="gpu-viv-bin-mx6q: OpenGL-ES and VIVANTE driver for imx6q" -PKG_LONGDESC="gpu-viv-bin-mx6q: OpenGL-ES and VIVANTE driver for imx6q" - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then - FLOAT="softfp" -elif [ "$TARGET_FLOAT" = "hard" ]; then - FLOAT="hardfp" -fi - -make_target() { - : # nothing to make -} - -makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/include - cp -PRv $FLOAT/usr/include/* $SYSROOT_PREFIX/usr/include - - mkdir -p $SYSROOT_PREFIX/usr/lib - cp -PRv $FLOAT/usr/lib/libEGL-fb.so \ - $FLOAT/usr/lib/libEGL.so* \ - $FLOAT/usr/lib/libGLES_CL.so \ - $FLOAT/usr/lib/libGLES_CM.so \ - $FLOAT/usr/lib/libGLESv1_CL.so* \ - $FLOAT/usr/lib/libGLESv1_CM.so* \ - $FLOAT/usr/lib/libGLESv2-fb.so \ - $FLOAT/usr/lib/libGLESv2.so* \ - $FLOAT/usr/lib/libGAL-fb.so \ - $FLOAT/usr/lib/libGAL.so* \ - $FLOAT/usr/lib/libVIVANTE-fb.so \ - $FLOAT/usr/lib/libVIVANTE.so* \ - $FLOAT/usr/lib/libOpenCL.so \ - $SYSROOT_PREFIX/usr/lib - - mkdir -p $INSTALL/usr/lib - cp -PRv $FLOAT/usr/lib/libEGL-fb.so \ - $FLOAT/usr/lib/libEGL.so* \ - $FLOAT/usr/lib/libGLES_CL.so \ - $FLOAT/usr/lib/libGLES_CM.so \ - $FLOAT/usr/lib/libGLESv1_CL.so* \ - $FLOAT/usr/lib/libGLESv1_CM.so* \ - $FLOAT/usr/lib/libGLESv2-fb.so \ - $FLOAT/usr/lib/libGLESv2.so* \ - $FLOAT/usr/lib/libGLSLC.so* \ - $FLOAT/usr/lib/libGAL-fb.so \ - $FLOAT/usr/lib/libGAL.so* \ - $FLOAT/usr/lib/libVIVANTE-fb.so \ - $FLOAT/usr/lib/libVIVANTE.so* \ - $FLOAT/usr/lib/libOpenCL.so \ - $INSTALL/usr/lib -} - -post_install() { - enable_service unbind-console.service -} diff --git a/packages/graphics/gpu-viv-g2d/package.mk b/packages/graphics/gpu-viv-g2d/package.mk deleted file mode 100644 index 8ee641bf4a..0000000000 --- a/packages/graphics/gpu-viv-g2d/package.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="gpu-viv-g2d" -PKG_VERSION="3.10.17-1.0.2" -PKG_REV="1" -PKG_ARCH="arm" -PKG_LICENSE="nonfree" -PKG_SITE="http://www.freescale.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="graphics" -PKG_SHORTDESC="gpu-viv-g2d: Another vivante Binary for performant resizing" -PKG_LONGDESC="gpu-viv-g2d: Another vivante Binary for performant resizing" - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -make_target() { - : # nothing to make all binary -} - -makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr - cp -PRv usr/* $SYSROOT_PREFIX/usr - - mkdir -p $INSTALL/usr/lib - cp -PRv usr/lib/* $INSTALL/usr/lib -} diff --git a/packages/graphics/imx-gpu-viv/package.mk b/packages/graphics/imx-gpu-viv/package.mk new file mode 100644 index 0000000000..a105f8e177 --- /dev/null +++ b/packages/graphics/imx-gpu-viv/package.mk @@ -0,0 +1,94 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# +# OpenELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# OpenELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC. If not, see . +################################################################################ + +PKG_NAME="imx-gpu-viv" +PKG_VERSION="5.0.11.p4.4" +PKG_REV="1" +PKG_ARCH="arm" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.freescale.com" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS_TARGET="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="graphics" +PKG_SHORTDESC="imx-gpu-viv: OpenGL-ES and VIVANTE driver for imx6q" +PKG_LONGDESC="imx-gpu-viv: OpenGL-ES and VIVANTE driver for imx6q" + +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" + +if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then + FLOAT="softfp" +elif [ "$TARGET_FLOAT" = "hard" ]; then + FLOAT="hardfp" +fi + +make_target() { + : # nothing to make +} + +makeinstall_target() { + mkdir -p $SYSROOT_PREFIX/usr/include + cp -PRv $FLOAT/gpu-core/usr/include/* $SYSROOT_PREFIX/usr/include + cp -PRv $FLOAT/g2d/usr/include/* $SYSROOT_PREFIX/usr/include + + mkdir -p $SYSROOT_PREFIX/usr/lib + cp -PRv $FLOAT/gpu-core/usr/lib/libEGL-fb.so \ + $FLOAT/gpu-core/usr/lib/libEGL.so* \ + $FLOAT/gpu-core/usr/lib/libGLES_CL.so* \ + $FLOAT/gpu-core/usr/lib/libGLES_CM.so* \ + $FLOAT/gpu-core/usr/lib/libGLESv1_CL.so* \ + $FLOAT/gpu-core/usr/lib/libGLESv1_CM.so* \ + $FLOAT/gpu-core/usr/lib/libGLESv2-fb.so \ + $FLOAT/gpu-core/usr/lib/libGLESv2.so* \ + $FLOAT/gpu-core/usr/lib/libGAL-fb.so \ + $FLOAT/gpu-core/usr/lib/libGAL.so* \ + $FLOAT/gpu-core/usr/lib/libGAL_egl.fb.so \ + $FLOAT/gpu-core/usr/lib/libGAL_egl.so* \ + $FLOAT/gpu-core/usr/lib/libVIVANTE-fb.so \ + $FLOAT/gpu-core/usr/lib/libVIVANTE.so* \ + $FLOAT/gpu-core/usr/lib/libOpenCL.so \ + $FLOAT/gpu-core/usr/lib/libVSC.so \ + $FLOAT/g2d/usr/lib/libg2d*.so* \ + $SYSROOT_PREFIX/usr/lib + + mkdir -p $INSTALL/usr/lib + cp -PRv $FLOAT/gpu-core/usr/lib/libEGL-fb.so \ + $FLOAT/gpu-core/usr/lib/libEGL.so* \ + $FLOAT/gpu-core/usr/lib/libGLES_CL.so* \ + $FLOAT/gpu-core/usr/lib/libGLES_CM.so* \ + $FLOAT/gpu-core/usr/lib/libGLESv1_CL.so* \ + $FLOAT/gpu-core/usr/lib/libGLESv1_CM.so* \ + $FLOAT/gpu-core/usr/lib/libGLESv2-fb.so \ + $FLOAT/gpu-core/usr/lib/libGLESv2.so* \ + $FLOAT/gpu-core/usr/lib/libGLSLC.so* \ + $FLOAT/gpu-core/usr/lib/libGAL-fb.so \ + $FLOAT/gpu-core/usr/lib/libGAL.so* \ + $FLOAT/gpu-core/usr/lib/libGAL_egl.fb.so \ + $FLOAT/gpu-core/usr/lib/libGAL_egl.so* \ + $FLOAT/gpu-core/usr/lib/libVIVANTE-fb.so \ + $FLOAT/gpu-core/usr/lib/libVIVANTE.so* \ + $FLOAT/gpu-core/usr/lib/libOpenCL.so \ + $FLOAT/gpu-core/usr/lib/libVSC.so \ + $FLOAT/g2d/usr/lib/libg2d*.so* \ + $INSTALL/usr/lib +} + +post_install() { + enable_service unbind-console.service +} diff --git a/packages/graphics/gpu-viv-bin-mx6q/system.d/unbind-console.service b/packages/graphics/imx-gpu-viv/system.d/unbind-console.service similarity index 100% rename from packages/graphics/gpu-viv-bin-mx6q/system.d/unbind-console.service rename to packages/graphics/imx-gpu-viv/system.d/unbind-console.service diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 3e05bc20f3..4a052fc313 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -195,7 +195,6 @@ if [ ! "$KODIPLAYER_DRIVER" = default ]; then KODI_CXXFLAGS="$KODI_CXXFLAGS $BCM2835_INCLUDES" elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then KODI_CODEC="--enable-codec=imxvpu" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gpu-viv-g2d" elif [ "$KODIPLAYER_DRIVER" = libamcodec ]; then KODI_CODEC="--enable-codec=amcodec" else diff --git a/projects/Generic/options b/projects/Generic/options index 186ff67eba..1414dc0657 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -70,7 +70,7 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="mesa" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv) OPENGLES="no" # include uvesafb support (yes / no) diff --git a/projects/Nvidia_Legacy/options b/projects/Nvidia_Legacy/options index 24cde4cbb2..e818d4d45e 100644 --- a/projects/Nvidia_Legacy/options +++ b/projects/Nvidia_Legacy/options @@ -70,7 +70,7 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="mesa" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv) OPENGLES="no" # include uvesafb support (yes / no) diff --git a/projects/RPi/options b/projects/RPi/options index ce23603dc8..1f27263030 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -92,7 +92,7 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv) OPENGLES="bcm2835-driver" # include uvesafb support (yes / no) diff --git a/projects/RPi2/options b/projects/RPi2/options index 28b3747c9d..6f0460b111 100644 --- a/projects/RPi2/options +++ b/projects/RPi2/options @@ -92,7 +92,7 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv) OPENGLES="bcm2835-driver" # include uvesafb support (yes / no) diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options index 26918e9883..da7e407ba9 100644 --- a/projects/WeTek_Play/options +++ b/projects/WeTek_Play/options @@ -90,7 +90,7 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q / opengl-meson6) + # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv / opengl-meson6) OPENGLES="opengl-meson6" # include uvesafb support (yes / no) diff --git a/projects/imx6/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf index 9df37a778a..811883f459 100644 --- a/projects/imx6/linux/linux.arm.conf +++ b/projects/imx6/linux/linux.arm.conf @@ -3378,8 +3378,8 @@ CONFIG_MXC_IPU=y # MXC Vivante GPU support # CONFIG_MXC_GPU_VIV=y -# CONFIG_MXC_GPU_VIV_V5 is not set -CONFIG_MXC_GPU_VIV_V4=y +CONFIG_MXC_GPU_VIV_V5=y +# CONFIG_MXC_GPU_VIV_V4 is not set CONFIG_MXC_IPU_V3=y # diff --git a/projects/imx6/options b/projects/imx6/options index 74efdb35d6..c8945a4dc2 100644 --- a/projects/imx6/options +++ b/projects/imx6/options @@ -95,8 +95,8 @@ # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) - OPENGLES="gpu-viv-bin-mx6q" + # OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv) + OPENGLES="imx-gpu-viv" # include uvesafb support (yes / no) UVESAFB_SUPPORT="no"