From 27ef17ff2d875726c21dd5e20a36f7df79ff09da Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 29 Dec 2018 23:52:02 +0000
Subject: [PATCH] hyperion: fix intertwined vars and funcs

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

diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk
index ecac3d87e4..053ae08e22 100644
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -36,14 +36,6 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_X11_SUPPORT="-DENABLE_X11=1"
 fi
 
-pre_build_target() {
-  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
-}
-
-pre_configure_target() {
-  echo "" > ../cmake/FindGitVersion.cmake
-}
-
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                        -DHYPERION_VERSION_ID="$PKG_VERSION" \
                        $PKG_AMLOGIC_SUPPORT \
@@ -61,6 +53,14 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                        -DENABLE_TESTS=0 \
                        -Wno-dev"
 
+pre_build_target() {
+  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
+}
+
+pre_configure_target() {
+  echo "" > ../cmake/FindGitVersion.cmake
+}
+
 makeinstall_target() {
   : # nothing to do here
 }