From 0dd697faf2f93d9df6c3addeb60eb15a0344870b Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sat, 11 Nov 2017 09:15:40 -0800 Subject: [PATCH] remove various imx related references --- .../moonlight-embedded/package.mk | 7 ------- .../repository.linuxserver.docker/package.mk | 2 +- packages/addons/script/moonlight/package.mk | 2 -- packages/addons/service/docker/package.mk | 2 +- .../addons/service/touchscreen/package.mk | 2 +- packages/devel/libcec/package.mk | 10 ++-------- packages/linux/package.mk | 20 ------------------- .../screensaver.shadertoy/package.mk | 3 --- .../visualization.shadertoy/package.mk | 3 --- packages/mediacenter/kodi/package.mk | 4 ---- 10 files changed, 5 insertions(+), 50 deletions(-) diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk index ef3c0e3cda..bfe37a6589 100644 --- a/packages/addons/addon-depends/moonlight-embedded/package.mk +++ b/packages/addons/addon-depends/moonlight-embedded/package.mk @@ -32,9 +32,6 @@ PKG_AUTORECONF="no" FREESCALE_V4L_INCLUDE="" if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" -elif [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libfslvpuwrap gpu-viv-bin-mx6q v4l-utils" - FREESCALE_V4L_INCLUDE="-DFREESCALE_INCLUDE_DIR=$(get_build_dir v4l-utils)/lib/include" elif [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libamcodec" elif [ "$DISPLAYSERVER" = "x11" ]; then @@ -47,10 +44,6 @@ pre_build_target() { cp -a $(get_build_dir moonlight-common-c)/* $PKG_BUILD/third_party/moonlight-common-c } -pre_configure_target() { - [ "$PROJECT" = "imx6" ] && strip_gold || true -} - makeinstall_target() { : } diff --git a/packages/addons/repository/repository.linuxserver.docker/package.mk b/packages/addons/repository/repository.linuxserver.docker/package.mk index 5de8eaa2b9..b0cf7543af 100644 --- a/packages/addons/repository/repository.linuxserver.docker/package.mk +++ b/packages/addons/repository/repository.linuxserver.docker/package.mk @@ -20,7 +20,7 @@ PKG_NAME="repository.linuxserver.docker" PKG_VERSION="9.0" PKG_REV="102" PKG_ARCH="any" -PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6 WeTek_Hub WeTek_Play_2 Odroid_C2" +PKG_ADDON_PROJECTS="Generic RPi RPi2 WeTek_Hub WeTek_Play_2 Odroid_C2" PKG_LICENSE="GPL" PKG_SITE="https://linuxserver.io" PKG_URL="" diff --git a/packages/addons/script/moonlight/package.mk b/packages/addons/script/moonlight/package.mk index f413480e73..2cbfc32755 100644 --- a/packages/addons/script/moonlight/package.mk +++ b/packages/addons/script/moonlight/package.mk @@ -70,8 +70,6 @@ addon() { if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then cp -P $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libmoonlight-pi.so $ADDON_BUILD/$PKG_ADDON_ID/lib - elif [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then - cp -P $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libmoonlight-imx.so $ADDON_BUILD/$PKG_ADDON_ID/lib elif [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then cp -P $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libmoonlight-aml.so $ADDON_BUILD/$PKG_ADDON_ID/lib fi diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 6e45f9137d..f96762336b 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -20,7 +20,7 @@ PKG_NAME="docker" PKG_VERSION="" PKG_REV="116" PKG_ARCH="any" -PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6 WeTek_Hub WeTek_Play_2 Odroid_C2" +PKG_ADDON_PROJECTS="Generic RPi RPi2 WeTek_Hub WeTek_Play_2 Odroid_C2" PKG_LICENSE="" PKG_SITE="http://www.docker.com/" PKG_DEPENDS_TARGET="toolchain moby" diff --git a/packages/addons/service/touchscreen/package.mk b/packages/addons/service/touchscreen/package.mk index df1ed8a11e..f129d24300 100644 --- a/packages/addons/service/touchscreen/package.mk +++ b/packages/addons/service/touchscreen/package.mk @@ -20,7 +20,7 @@ PKG_NAME="touchscreen" PKG_VERSION="1.0" PKG_REV="101" PKG_ARCH="any" -PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6" +PKG_ADDON_PROJECTS="Generic RPi RPi2" PKG_LICENSE="GPL" PKG_SITE="" PKG_URL="" diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 86f58505c4..24cd2e7a0d 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -23,7 +23,6 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://libcec.pulse-eight.com/" PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz" -[ "$PROJECT" = "imx6" ] && PKG_PATCH_DIRS="${LINUX#imx6-}" PKG_DEPENDS_TARGET="toolchain systemd lockdev p8-platform swig:host" PKG_SECTION="system" PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor" @@ -32,18 +31,13 @@ PKG_AUTORECONF="no" PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=1 \ -DCMAKE_INSTALL_LIBDIR:STRING=lib \ - -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib" + -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \ + -DHAVE_IMX_API=0" if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" fi -if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_IMX_API=1" -else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_IMX_API=0" -fi - if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then if [ "$TARGET_KERNEL_ARCH" = "arm64" ]; then PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_AOCEC_API=1" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7af697c099..98cb53c924 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -45,26 +45,6 @@ case "$LINUX" in PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*" PKG_PATCH_DIRS="amlogic-3.14" ;; - imx6-3.14-sr) - PKG_VERSION="3.14-sr" - PKG_SHA256="04ce73fe6434bb31197e94a9c51e3c44aba7f5226450ff4cec21bc5c985f986d" - PKG_COMMIT="2fb11e2" - PKG_SITE="http://solid-run.com/wiki/doku.php?id=products:imx6:software:development:kernel" - PKG_URL="https://github.com/SolidRun/linux-fslc/archive/$PKG_COMMIT.tar.gz" - PKG_SOURCE_NAME="$PKG_NAME-$LINUX-$PKG_COMMIT.tar.gz" - PKG_SOURCE_DIR="$PKG_NAME-fslc-${PKG_COMMIT}*" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan" - ;; - imx6-4.4-xbian) - PKG_VERSION="4.4-xbian" - PKG_SHA256="5d7074937a31042b0764bc975f7280500a0728a00a7a46ab6b06372f42d37ede" - PKG_COMMIT="3bde863" - PKG_SITE="https://github.com/xbianonpi/xbian-sources-kernel/tree/imx6-4.4.y" - PKG_URL="https://github.com/xbianonpi/xbian-sources-kernel/archive/$PKG_COMMIT.tar.gz" - PKG_SOURCE_NAME="$PKG_NAME-$LINUX-$PKG_COMMIT.tar.gz" - PKG_SOURCE_DIR="xbian-sources-kernel-${PKG_COMMIT}*" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced" - ;; *) PKG_VERSION="4.13.12" PKG_SHA256="bf98065bf0e3aa5af379d0808f157be48ca4e452a55468fc4ce814b17cf9de74" diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk index 430fba07c1..58a65a8902 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk @@ -49,8 +49,5 @@ pre_configure_target() { -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" export CFLAGS="$CFLAGS $BCM2835_INCLUDES" export CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES" - elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then - export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB" - export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB" fi } diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk index d839059b12..f75498720f 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk @@ -49,8 +49,5 @@ pre_configure_target() { -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" export CFLAGS="$CFLAGS $BCM2835_INCLUDES" export CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES" - elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then - export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB" - export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB" fi } diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index e7008f0cb3..1cf5ec1b76 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -192,10 +192,6 @@ if [ ! "$KODIPLAYER_DRIVER" = default ]; then KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm" CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS" CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS" - elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then - KODI_PLAYER="-DCORE_PLATFORM_NAME=imx" - CFLAGS="$CFLAGS -DHAS_IMXVPU -DLINUX -DEGL_API_FB" - CXXFLAGS="$CXXFLAGS -DHAS_IMXVPU -DLINUX -DEGL_API_FB" elif [ "$KODIPLAYER_DRIVER" = libamcodec ]; then KODI_PLAYER="-DCORE_PLATFORM_NAME=aml" fi