Merge pull request #4510 from HiassofT/le10-rpi-addon-cleanup

addons: drop legacy RPi MMAL/OMX/dispmanx support

packages/addons/addon-depends/ffmpegx/package.mk

@@ -14,10 +14,6 @@ PKG_BUILD_FLAGS="-gold -sysroot"
 # Dependencies
 get_graphicdrivers
 
-if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
-fi
-
 if [ "$TARGET_ARCH" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" nasm:host x265"
 
@@ -39,28 +35,8 @@ pre_configure_target() {
   cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
-  if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
-    CFLAGS="$CFLAGS -DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL"
-    PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
-  fi
-
 # HW encoders
 
-  # RPi 0-3
-  if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
-    PKG_FFMPEG_HW_ENCODERS_RPi="\
-    `#Video encoders` \
-    --enable-omx-rpi \
-    --enable-mmal \
-    --enable-encoder=h264_omx \
-    \
-    `#Video hwaccel` \
-    --enable-hwaccel=h264_mmal \
-    --enable-hwaccel=mpeg2_mmal \
-    --enable-hwaccel=mpeg4_mmal \
-    --enable-hwaccel=vc1_mmal"
-  fi
-
   # Generic
   if [[ "$TARGET_ARCH" = "x86_64" ]]; then
     PKG_FFMPEG_HW_ENCODERS_GENERIC="\
@@ -142,7 +118,6 @@ configure_target() {
     --disable-doc \
     \
     `#Hardware accelerated decoding encoding` \
-    $PKG_FFMPEG_HW_ENCODERS_RPi \
     $PKG_FFMPEG_HW_ENCODERS_GENERIC \
     \
     `#General options` \

packages/addons/service/dispmanx_vnc/changelog.txt

@@ -1,20 +0,0 @@
-106
-- Fix versioning
-
-105
-- Update to 5bde54b
-
-104
-- Force build against systemd
-
-103
-- Update to 77b33a6
-
-102
-- Build with Linux 4.7 RPi libraries
-
-101
-- Move settings to Kodi
-
-100
-- Initial addon

packages/addons/service/dispmanx_vnc/package.mk

@@ -1,35 +1,26 @@
 # SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dispmanx_vnc"
-PKG_VERSION="5bde54b5a43a2e6f65994f3b9c665db90c45923f"
+PKG_VERSION="1.0"
-PKG_SHA256="1f096cd70d86620596db947757486064fe37dc2766ad33530318c35b279472aa"
+PKG_REV="100"
-PKG_VERSION_DATE="2018-08-18"
-PKG_REV="106"
 PKG_ARCH="arm"
 PKG_ADDON_PROJECTS="RPi"
 PKG_LICENSE="OSS"
-PKG_SITE="https://github.com/patrikolausson/dispmanx_vnc"
+PKG_SITE=""
-PKG_URL="https://github.com/patrikolausson/dispmanx_vnc/archive/$PKG_VERSION.tar.gz"
+PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig openssl"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="Raspberry Pi VNC: a Virtual Network Computing server for Raspberry Pi"
+PKG_SHORTDESC="Addon removed"
-PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION_DATE) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"
+PKG_LONGDESC="Addon removed"
+PKG_TOOLCHAIN="manual"
+
+PKG_ADDON_BROKEN="Raspberry Pi VNC was removed."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Raspberry Pi VNC"
-PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_TYPE="xbmc.broken"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
-
-pre_make_target() {
-  export SYSROOT_PREFIX
-}
-
-makeinstall_target() {
-  :
-}
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  :
-    cp -p $PKG_BUILD/dispmanx_vncserver $ADDON_BUILD/$PKG_ADDON_ID/bin
 }

packages/addons/service/dispmanx_vnc/patches/dispmanx_vnc-0001_fix-cross-compile.patch

@@ -1,20 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2016-01-22 20:52:21.000000000 +0100
-+++ b/Makefile	2016-01-22 21:29:34.601124600 +0100
-@@ -1,9 +1,11 @@
--CXX = g++
--CXXFLAGS = -Wall -std=c++11 -O3 -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM
-+CXX ?= g++
-+CXXFLAGS += -Wall -std=c++11 -O3 -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM
- 
--INCLUDES = -I/opt/vc/include/ -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
--LIB_PATHS = -L/opt/vc/lib/
--LIBS = -lGLESv2 -lEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lvncserver -lconfig++
-+SYSROOT_PREFIX ?=
-+
-+INCLUDES = -I$(SYSROOT_PREFIX)/usr/include/ -I$(SYSROOT_PREFIX)/usr/include/interface/vcos/pthreads -I$(SYSROOT_PREFIX)/usr/include/interface/vmcs_host/linux
-+LIB_PATHS = -L$(SYSROOT_PREFIX)/usr/lib/
-+LIBS = -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lconfig++ -lz -lssl -lcrypto -lresolv -lvncserver -ljpeg -lpng16 -lsystemd
- 
- SOURCES = main.cpp \
- 		UFile.cpp \

packages/addons/service/dispmanx_vnc/source/bin/dispmanx_vncserver-service

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-. /etc/profile
-oe_setup_addon service.system.dispmanx_vnc
-
-if [ -f "$ADDON_HOME/dispmanx_vncserver.conf" ]; then
-  rm "$ADDON_HOME/dispmanx_vncserver.conf"
-fi
-
-options="-p $vnc_port -s $vnc_screen -t $vnc_framerate"
-if [ "$vnc_relative" == "true" ]
-then
-   options="$options -r"
-else
-   options="$options -a"
-fi
-if [ "$vnc_unsafe" == "true" ]
-then
-   options="$options -u"
-fi
-if [ "$vnc_fullscreen" == "true" ]
-then
-   options="$options -f"
-fi
-if [ "$vnc_multithreaded" == "true" ]
-then
-   options="$options -m"
-fi
-if [ ! -z "$vnc_password" ]
-then
-   options="$options -P $vnc_password"
-fi
-if [ "$vnc_downscale" == "true" ]
-then
-   options="$options -d"
-fi
-
-#/bin/sleep 10
-dispmanx_vncserver $options

packages/addons/service/dispmanx_vnc/source/default.py

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-import subprocess
-import xbmc
-import xbmcaddon
-
-
-class Monitor(xbmc.Monitor):
-
-   def __init__(self, *args, **kwargs):
-      xbmc.Monitor.__init__(self)
-      self.id = xbmcaddon.Addon().getAddonInfo('id')
-
-   def onSettingsChanged(self):
-      subprocess.call(['systemctl', 'restart', self.id])
-
-
-if __name__ == "__main__":
-   Monitor().waitForAbort()
-

packages/addons/service/dispmanx_vnc/source/resources/language/English/strings.po

@@ -1,46 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: dispmanx_vnc
-# Addon id: service.system.dispmanx_vnc
-# Addon Provider: awiouy at gmail dot com
-msgid ""
-msgstr ""
-
-msgctxt "#30000"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "#30001"
-msgid "relative"
-msgstr ""
-
-msgctxt "#30002"
-msgid "port"
-msgstr ""
-
-msgctxt "#30003"
-msgid "screen"
-msgstr ""
-
-msgctxt "#30004"
-msgid "unsafe"
-msgstr ""
-
-msgctxt "#30005"
-msgid "fullscreen"
-msgstr ""
-
-msgctxt "#30006"
-msgid "multi-threaded"
-msgstr ""
-
-msgctxt "#30007"
-msgid "password"
-msgstr ""
-
-msgctxt "#30008"
-msgid "frame-rate"
-msgstr ""
-
-msgctxt "#30009"
-msgid "downscale"
-msgstr ""

packages/addons/service/dispmanx_vnc/source/resources/settings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-   <category   label="30000">
-      <setting label="30001" id="vnc_relative"      type="bool"   default="false" />
-      <setting label="30002" id="vnc_port"          type="number" default="5900"  />
-      <setting label="30003" id="vnc_screen"        type="number" default="0"     />
-      <setting label="30004" id="vnc_unsafe"        type="bool"   default="false" />
-      <setting label="30005" id="vnc_fullscreen"    type="bool"   default="false" />
-      <setting label="30006" id="vnc_multithreaded" type="bool"   default="false" />
-      <setting label="30007" id="vnc_password"      type="text"   option="hidden" />
-      <setting label="30008" id="vnc_framerate"     type="number" default="15"    />
-      <setting label="30009" id="vnc_downscale"     type="bool"   default="false" />
-    </category>
-</settings>

packages/addons/service/dispmanx_vnc/source/settings-default.xml

@@ -1,11 +0,0 @@
-<settings>
-    <setting id="vnc_downscale" value="false" />
-    <setting id="vnc_framerate" value="15" />
-    <setting id="vnc_fullscreen" value="false" />
-    <setting id="vnc_multithreaded" value="false" />
-    <setting id="vnc_password" value="" />
-    <setting id="vnc_port" value="5900" />
-    <setting id="vnc_relative" value="false" />
-    <setting id="vnc_screen" value="0" />
-    <setting id="vnc_unsafe" value="false" />
-</settings>

packages/addons/service/dispmanx_vnc/source/system.d/service.system.dispmanx_vnc.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=dispmanx_vnc
-After=kodi.service
-
-[Service]
-ExecStart=/bin/sh /storage/.kodi/addons/service.system.dispmanx_vnc/bin/dispmanx_vncserver-service
-TimeoutStopSec=1
-Restart=always
-RestartSec=2
-StartLimitInterval=0
-
-[Install]
-WantedBy=kodi.target

packages/addons/service/hyperion/changelog.txt

@@ -1,3 +1,6 @@
+112
+- Remove legacy RPi dispmanx support
+
 111
 - update qt to 5.14.0
   * fixes screenshot not saving png files

packages/addons/service/hyperion/package.mk

@@ -6,7 +6,7 @@ PKG_NAME="hyperion"
 PKG_VERSION="fb413cd7e8825ffc26925013f57ac93a774f12bc"
 PKG_SHA256="fafa4eeddacb15a8fd96b0e69fac400faa735c6e1ccd78673c9d96b0ac84d7a3"
 PKG_VERSION_DATE="2019-08-19"
-PKG_REV="111"
+PKG_REV="112"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hyperion-project/hyperion"
@@ -26,11 +26,7 @@ PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=OFF"
 PKG_FB_SUPPORT="-DENABLE_FB=ON"
 PKG_X11_SUPPORT="-DENABLE_X11=OFF"
 
-if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
+if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET+=" bcm2835-driver"
-  PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=ON"
-  PKG_FB_SUPPORT="-DENABLE_FB=OFF"
-elif [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET+=" xorg-server xrandr"
   PKG_X11_SUPPORT="-DENABLE_X11=ON"
 fi

packages/addons/tools/ffmpeg-tools/changelog.txt

@@ -1,3 +1,6 @@
+112
+- Remove legacy RPi MMAL/OMX support
+
 111
 - Update AV1 to 2020-06-20
 - Update FFmpeg to 4.3

packages/addons/tools/ffmpeg-tools/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="ffmpeg-tools"
 PKG_VERSION="1.0"
-PKG_REV="111"
+PKG_REV="112"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"