Merge pull request #2082 from CvH/9.0-hyperion

hyperion: update to 1c21232

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

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,18 +17,16 @@
 ################################################################################
 
 PKG_NAME="rpi_ws281x"
-PKG_VERSION="3e6ea50"
+PKG_VERSION="f580777"
-PKG_SHA256="3f5190f8f7e02f5e219035b5e166d8fad737688ed901f2511b1235af63e3dfc1"
+PKG_SHA256="edc831ff9daac354c54bfab1dad52f282ad44225d5769e6ae2b45160fe21762e"
 PKG_ARCH="any"
-PKG_LICENSE=""
+PKG_LICENSE="BSD-3c"
 PKG_SITE="https://github.com/hyperion-project/rpi_ws281x"
 PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION=""
 PKG_SHORTDESC="Userspace Raspberry Pi PWM library for WS281X LEDs"
 PKG_LONGDESC="Userspace Raspberry Pi PWM library for WS281X LEDs"
-
-PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {

packages/addons/service/hyperion/changelog.txt

@@ -1,3 +1,6 @@
+106
+- Update to version 1c21232
+
 105
 - Update protobuf to 3.1.0
 - Fix build with gcc 6

packages/addons/service/hyperion/package.mk

@@ -1,6 +1,7 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
 #      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +18,8 @@
 ################################################################################
 
 PKG_NAME="hyperion"
-PKG_VERSION="355a324"
+PKG_VERSION="1c21232"
-PKG_SHA256="ea434d02fc2a08fc300e85f88f3dfefd116a1a2be8f67734fab59739570aeeef"
+PKG_SHA256="aea69ba3027c0f967880a65f0c39a2cd7f9cf913947b755ac37a2572a77d51c0"
 PKG_REV="106"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hyperion-project/hyperion"
@@ -32,21 +33,21 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Hyperion"
 PKG_ADDON_TYPE="xbmc.service"
 
-AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=0"
+PKG_AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=0"
-DISPMANX_SUPPORT="-DENABLE_DISPMANX=0"
+PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=0"
-FB_SUPPORT="-DENABLE_FB=1"
+PKG_FB_SUPPORT="-DENABLE_FB=1"
-X11_SUPPORT="-DENABLE_X11=0"
+PKG_X11_SUPPORT="-DENABLE_X11=0"
 
 if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libamcodec"
-  AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=1"
+  PKG_AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=1"
 elif [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
-  DISPMANX_SUPPORT="-DENABLE_DISPMANX=1"
+  PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=1"
-  FB_SUPPORT="-DENABLE_FB=0"
+  PKG_FB_SUPPORT="-DENABLE_FB=0"
 elif [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xorg-server xrandr"
-  X11_SUPPORT="-DENABLE_X11=1"
+  PKG_X11_SUPPORT="-DENABLE_X11=1"
 fi
 
 pre_build_target() {
@@ -59,9 +60,9 @@ pre_configure_target() {
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                        -DHYPERION_VERSION_ID="$PKG_VERSION" \
-                       $AMLOGIC_SUPPORT \
+                       $PKG_AMLOGIC_SUPPORT \
-                       $DISPMANX_SUPPORT \
+                       $PKG_DISPMANX_SUPPORT \
-                       $FB_SUPPORT \
+                       $PKG_FB_SUPPORT \
                        -DENABLE_OSX=0 \
                        -DUSE_SYSTEM_PROTO_LIBS=1 \
                        -DENABLE_SPIDEV=1 \
@@ -69,7 +70,7 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                        -DENABLE_V4L2=1 \
                        -DENABLE_WS2812BPWM=0 \
                        -DENABLE_WS281XPWM=1 \
-                       $X11_SUPPORT \
+                       $PKG_X11_SUPPORT \
                        -DENABLE_QT5=1 \
                        -DENABLE_TESTS=0 \
                        -Wno-dev"