From 68e4184c9a7a67e759ad416d17903e41e946fc79 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 15 Jan 2020 18:47:46 +0000
Subject: [PATCH] hyperion: cleanup package

---
 packages/addons/service/hyperion/package.mk | 38 ++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk
index 472b960249..0157a56669 100644
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -12,6 +12,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hyperion-project/hyperion"
 PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python2 libusb qtbase protobuf rpi_ws281x"
+PKG_DEPENDS_UNPACK="rpi_ws281x"
 PKG_SECTION="service"
 PKG_SHORTDESC="Hyperion: an AmbiLight controller"
 PKG_LONGDESC="Hyperion($PKG_VERSION_DATE) is an modern opensource AmbiLight implementation."
@@ -20,35 +21,34 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Hyperion"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=0"
-PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=0"
-PKG_FB_SUPPORT="-DENABLE_FB=1"
-PKG_X11_SUPPORT="-DENABLE_X11=0"
+PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=OFF"
+PKG_FB_SUPPORT="-DENABLE_FB=ON"
+PKG_X11_SUPPORT="-DENABLE_X11=OFF"
 
 if [ "$PROJECT" = "RPi" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
-  PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=1"
-  PKG_FB_SUPPORT="-DENABLE_FB=0"
+  PKG_DEPENDS_TARGET+=" bcm2835-driver"
+  PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=ON"
+  PKG_FB_SUPPORT="-DENABLE_FB=OFF"
 elif [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xorg-server xrandr"
-  PKG_X11_SUPPORT="-DENABLE_X11=1"
+  PKG_DEPENDS_TARGET+=" xorg-server xrandr"
+  PKG_X11_SUPPORT="-DENABLE_X11=ON"
 fi
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                        -DHYPERION_VERSION_ID="$PKG_VERSION" \
-                       $PKG_AMLOGIC_SUPPORT \
+                       -DENABLE_AMLOGIC=OFF \
                        $PKG_DISPMANX_SUPPORT \
                        $PKG_FB_SUPPORT \
-                       -DENABLE_OSX=0 \
-                       -DUSE_SYSTEM_PROTO_LIBS=1 \
-                       -DENABLE_SPIDEV=1 \
-                       -DENABLE_TINKERFORGE=0 \
-                       -DENABLE_V4L2=1 \
-                       -DENABLE_WS2812BPWM=0 \
-                       -DENABLE_WS281XPWM=1 \
+                       -DENABLE_OSX=OFF \
+                       -DUSE_SYSTEM_PROTO_LIBS=ON \
+                       -DENABLE_SPIDEV=ON \
+                       -DENABLE_TINKERFORGE=OFF \
+                       -DENABLE_V4L2=ON \
+                       -DENABLE_WS2812BPWM=OFF \
+                       -DENABLE_WS281XPWM=ON \
                        $PKG_X11_SUPPORT \
-                       -DENABLE_QT5=1 \
-                       -DENABLE_TESTS=0 \
+                       -DENABLE_QT5=ON \
+                       -DENABLE_TESTS=OFF \
                        -Wno-dev"
 
 pre_build_target() {