diff --git a/packages/addons/addon-depends/chrome-depends/icu/package.mk b/packages/addons/addon-depends/chrome-depends/icu/package.mk
index bdeadd739a..e428a3f269 100644
--- a/packages/addons/addon-depends/chrome-depends/icu/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/icu/package.mk
@@ -18,15 +18,16 @@ PKG_ICU_OPTS="--disable-extras \
               --disable-tests \
               --disable-tools"
 
-
 PKG_CONFIGURE_OPTS_HOST="--enable-static \
                          --disable-shared \
                          $PKG_ICU_OPTS"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
-                         $PKG_ICU_OPTS"
+configure_package() {
+  PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
+                             $PKG_ICU_OPTS"
 
-PKG_CONFIGURE_SCRIPT="source/configure"
+  PKG_CONFIGURE_SCRIPT="source/configure"
+}
 
 post_makeinstall_target() {
   rm -rf $INSTALL
diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk
index d4d26bb825..290734ff7f 100644
--- a/packages/addons/addon-depends/protobuf/package.mk
+++ b/packages/addons/addon-depends/protobuf/package.mk
@@ -11,8 +11,6 @@ PKG_DEPENDS_HOST="toolchain zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib protobuf:host"
 PKG_LONGDESC="Protocol Buffers for Google's data interchange format."
 
-PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
-
 PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
                      -DBUILD_SHARED_LIBS=0 \
                      -Dprotobuf_BUILD_TESTS=0 \
@@ -21,6 +19,10 @@ PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
 
 PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_HOST"
 
+configure_package() {
+  PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
 
diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk
index 761542730f..d28ae529dc 100644
--- a/packages/audio/pulseaudio/package.mk
+++ b/packages/audio/pulseaudio/package.mk
@@ -79,8 +79,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --with-soxr \
                            --with-module-dir=/usr/lib/pulse"
 
-pre_configure_target()
-{
+pre_configure_target() {
   sed -e 's|; remixing-use-all-sink-channels = yes|; remixing-use-all-sink-channels = no|' \
       -i $PKG_BUILD/src/daemon/daemon.conf.in
 }
diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk
index e515f0048c..80c44b412b 100644
--- a/packages/compress/lz4/package.mk
+++ b/packages/compress/lz4/package.mk
@@ -11,9 +11,11 @@ PKG_DEPENDS_HOST="toolchain"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="lz4 data compressor/decompressor"
 
-PKG_CMAKE_SCRIPT="$PKG_BUILD/contrib/cmake_unofficial/CMakeLists.txt"
+configure_package() {
+  PKG_CMAKE_SCRIPT="$PKG_BUILD/contrib/cmake_unofficial/CMakeLists.txt"
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=0"
+  PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=0"
+}
 
 post_makeinstall_target() {
   rm -rf $INSTALL
diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
index 2545399082..60120e9b59 100644
--- a/packages/compress/zstd/package.mk
+++ b/packages/compress/zstd/package.mk
@@ -11,6 +11,7 @@ PKG_SOURCE_DIR=$PKG_NAME-$PKG_VERSION
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast real-time compression algorithm."
 
-
-PKG_CMAKE_SCRIPT="$PKG_BUILD/build/cmake/CMakeLists.txt"
-PKG_CMAKE_OPTS_HOST="-DTHREADS_PTHREAD_ARG=0"
+configure_package() {
+  PKG_CMAKE_SCRIPT="$PKG_BUILD/build/cmake/CMakeLists.txt"
+  PKG_CMAKE_OPTS_HOST="-DTHREADS_PTHREAD_ARG=0"
+}
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index fedd811828..a487ed0aa9 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -45,8 +45,6 @@ else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug"
 fi
 
-NSS_CONF_DIR="$PKG_BUILD/nss"
-
 pre_build_target() {
   cd $PKG_BUILD
     aclocal --force --verbose
diff --git a/packages/emulation/libretro-vram-test/package.mk b/packages/emulation/libretro-vram-test/package.mk
index 8d5d2774bd..e4e28d5391 100644
--- a/packages/emulation/libretro-vram-test/package.mk
+++ b/packages/emulation/libretro-vram-test/package.mk
@@ -12,9 +12,12 @@ PKG_LONGDESC="VRAM Test from libretro"
 PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="testsw_vram_libretro.so"
-PKG_LIBPATH="$PKG_BUILD/video/software/rendering_direct_to_vram/$PKG_LIBNAME"
 PKG_LIBVAR="VRAM-TEST_LIB"
 
+configure_package() {
+  PKG_LIBPATH="$PKG_BUILD/video/software/rendering_direct_to_vram/$PKG_LIBNAME"
+}
+
 make_target() {
   cd $PKG_BUILD/video/software/rendering_direct_to_vram
   make
diff --git a/packages/linux-drivers/gpu-aml/package.mk b/packages/linux-drivers/gpu-aml/package.mk
index ebd939f057..3be9b6685c 100644
--- a/packages/linux-drivers/gpu-aml/package.mk
+++ b/packages/linux-drivers/gpu-aml/package.mk
@@ -14,10 +14,12 @@ PKG_LONGDESC="gpu-aml: Linux drivers for Mali GPUs found in Amlogic Meson SoCs"
 PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
-PKG_UTGARD_VERSION="r5p1"
-PKG_UTGARD_BUILD_DIR="$PKG_BUILD/utgard/$PKG_UTGARD_VERSION"
-PKG_MIDGARD_VERSION="r16p0"
-PKG_MIDGARD_BUILD_DIR="$PKG_BUILD/midgard/$PKG_MIDGARD_VERSION/kernel/drivers/gpu/arm/midgard"
+configure_package() {
+  PKG_UTGARD_VERSION="r5p1"
+  PKG_UTGARD_BUILD_DIR="$PKG_BUILD/utgard/$PKG_UTGARD_VERSION"
+  PKG_MIDGARD_VERSION="r16p0"
+  PKG_MIDGARD_BUILD_DIR="$PKG_BUILD/midgard/$PKG_MIDGARD_VERSION/kernel/drivers/gpu/arm/midgard"
+}
 
 pre_configure_target() {
   sed -e "s|shell date|shell date -R|g" -i $PKG_BUILD/utgard/*/Kbuild
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 5e1b71b022..5017e77178 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -31,216 +31,218 @@ case $KODI_VENDOR in
     ;;
 esac
 
-# Single threaded LTO is very slow so rely on Kodi for parallel LTO support
-if [ "$LTO_SUPPORT" = "yes" ] && ! build_with_debug; then
-  PKG_KODI_USE_LTO="-DUSE_LTO=$CONCURRENCY_MAKE_LEVEL"
-fi
+configure_package() {
+  # Single threaded LTO is very slow so rely on Kodi for parallel LTO support
+  if [ "$LTO_SUPPORT" = "yes" ] && ! build_with_debug; then
+    PKG_KODI_USE_LTO="-DUSE_LTO=$CONCURRENCY_MAKE_LEVEL"
+  fi
 
-get_graphicdrivers
+  get_graphicdrivers
 
-PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
 
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr"
-  KODI_XORG="-DCORE_PLATFORM_NAME=x11"
-elif [ "$DISPLAYSERVER" = "weston" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wayland waylandpp"
-  CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"
-  CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS"
-  KODI_XORG="-DCORE_PLATFORM_NAME=wayland -DWAYLAND_RENDER_SYSTEM=gles"
-fi
-
-if [ ! "$OPENGL" = "no" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu"
-fi
-
-if [ "$OPENGLES_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES"
-fi
-
-if [ "$ALSA_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET alsa-lib"
-  KODI_ALSA="-DENABLE_ALSA=ON"
-else
-  KODI_ALSA="-DENABLE_ALSA=OFF"
-fi
-
-if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
-  KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=ON"
-else
-  KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=OFF"
-fi
-
-if [ "$ESPEAK_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET espeak"
-fi
-
-if [ "$CEC_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libcec"
-  KODI_CEC="-DENABLE_CEC=ON"
-else
-  KODI_CEC="-DENABLE_CEC=OFF"
-fi
-
-if [ "$KODI_OPTICAL_SUPPORT" = yes ]; then
-  KODI_OPTICAL="-DENABLE_OPTICAL=ON"
-else
-  KODI_OPTICAL="-DENABLE_OPTICAL=OFF"
-fi
-
-if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then
-  KODI_DVDCSS="-DENABLE_DVDCSS=ON \
-               -DLIBDVDCSS_URL=$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz"
-else
-  KODI_DVDCSS="-DENABLE_DVDCSS=OFF"
-fi
-
-if [ "$KODI_BLURAY_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbluray"
-  KODI_BLURAY="-DENABLE_BLURAY=ON"
-else
-  KODI_BLURAY="-DENABLE_BLURAY=OFF"
-fi
-
-if [ "$AVAHI_DAEMON" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi nss-mdns"
-  KODI_AVAHI="-DENABLE_AVAHI=ON"
-else
-  KODI_AVAHI="-DENABLE_AVAHI=OFF"
-fi
-
-case "$KODI_MYSQL_SUPPORT" in
-  mysql)   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql"
-           KODI_MYSQL="-DENABLE_MYSQLCLIENT=ON -DENABLE_MARIADBCLIENT=OFF"
-           ;;
-  mariadb) PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mariadb-connector-c"
-           KODI_MYSQL="-DENABLE_MARIADBCLIENT=ON -DENABLE_MYSQLCLIENT=OFF"
-           ;;
-  *)       KODI_MYSQL="-DENABLE_MYSQLCLIENT=OFF -DENABLE_MARIADBCLIENT=OFF"
-esac
-
-if [ "$KODI_AIRPLAY_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libplist"
-  KODI_AIRPLAY="-DENABLE_PLIST=ON"
-else
-  KODI_AIRPLAY="-DENABLE_PLIST=OFF"
-fi
-
-if [ "$KODI_AIRTUNES_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libshairplay"
-  KODI_AIRTUNES="-DENABLE_AIRTUNES=ON"
-else
-  KODI_AIRTUNES="-DENABLE_AIRTUNES=OFF"
-fi
-
-if [ "$KODI_NFS_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libnfs"
-  KODI_NFS="-DENABLE_NFS=ON"
-else
-  KODI_NFS="-DENABLE_NFS=OFF"
-fi
-
-if [ "$KODI_SAMBA_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba"
-fi
-
-if [ "$KODI_WEBSERVER_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libmicrohttpd"
-fi
-
-if [ "$KODI_UPNP_SUPPORT" = yes ]; then
-  KODI_UPNP="-DENABLE_UPNP=ON"
-else
-  KODI_UPNP="-DENABLE_UPNP=OFF"
-fi
-
-if target_has_feature neon; then
-  KODI_NEON="-DENABLE_NEON=ON"
-else
-  KODI_NEON="-DENABLE_NEON=OFF"
-fi
-
-if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau"
-  KODI_VDPAU="-DENABLE_VDPAU=ON"
-else
-  KODI_VDPAU="-DENABLE_VDPAU=OFF"
-fi
-
-if [ "$VAAPI_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva"
-  KODI_VAAPI="-DENABLE_VAAPI=ON"
-else
-  KODI_VAAPI="-DENABLE_VAAPI=OFF"
-fi
-
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  KODI_ARCH="-DWITH_CPU=$TARGET_ARCH"
-else
-  KODI_ARCH="-DWITH_ARCH=$TARGET_ARCH"
-fi
-
-if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET led_tools"
-fi
-
-if [ ! "$KODIPLAYER_DRIVER" = default ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $KODIPLAYER_DRIVER libinput libxkbcommon"
-  if [ "$KODIPLAYER_DRIVER" = bcm2835-driver ]; then
-    KODI_PLAYER="-DCORE_PLATFORM_NAME=rbpi"
-  elif [ "$KODIPLAYER_DRIVER" = mesa -o "$KODIPLAYER_DRIVER" = rkmpp ]; then
-    KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm -DGBM_RENDER_SYSTEM=gles"
+  if [ "$DISPLAYSERVER" = "x11" ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr"
+    KODI_XORG="-DCORE_PLATFORM_NAME=x11"
+  elif [ "$DISPLAYSERVER" = "weston" ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wayland waylandpp"
     CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"
     CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS"
-  elif [ "$KODIPLAYER_DRIVER" = libamcodec ]; then
-    KODI_PLAYER="-DCORE_PLATFORM_NAME=aml"
+    KODI_XORG="-DCORE_PLATFORM_NAME=wayland -DWAYLAND_RENDER_SYSTEM=gles"
   fi
-fi
 
-KODI_LIBDVD="$KODI_DVDCSS \
-             -DLIBDVDNAV_URL=$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
-             -DLIBDVDREAD_URL=$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
+  if [ ! "$OPENGL" = "no" ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu"
+  fi
 
-PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-                       -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \
-                       -DWITH_JSONSCHEMABUILDER=$TOOLCHAIN/bin/JsonSchemaBuilder \
-                       -DDEPENDS_PATH=$PKG_BUILD/depends \
-                       -DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/$PKG_PYTHON_VERSION \
-                       -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION \
-                       -DGIT_VERSION=$PKG_VERSION \
-                       -DWITH_FFMPEG=$(get_build_dir ffmpeg) \
-                       -DENABLE_INTERNAL_FFMPEG=OFF \
-                       -DFFMPEG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr \
-                       -DENABLE_INTERNAL_CROSSGUID=OFF \
-                       -DENABLE_UDEV=ON \
-                       -DENABLE_DBUS=ON \
-                       -DENABLE_XSLT=ON \
-                       -DENABLE_CCACHE=ON \
-                       -DENABLE_LIRCCLIENT=ON \
-                       -DENABLE_EVENTCLIENTS=ON \
-                       -DENABLE_LDGOLD=ON \
-                       -DENABLE_DEBUGFISSION=OFF \
-                       -DENABLE_APP_AUTONAME=OFF \
-                       -DENABLE_INTERNAL_FLATBUFFERS=OFF \
-                       $PKG_KODI_USE_LTO \
-                       $KODI_ARCH \
-                       $KODI_NEON \
-                       $KODI_VDPAU \
-                       $KODI_VAAPI \
-                       $KODI_CEC \
-                       $KODI_XORG \
-                       $KODI_SAMBA \
-                       $KODI_NFS \
-                       $KODI_LIBDVD \
-                       $KODI_AVAHI \
-                       $KODI_UPNP \
-                       $KODI_MYSQL \
-                       $KODI_AIRPLAY \
-                       $KODI_AIRTUNES \
-                       $KODI_OPTICAL \
-                       $KODI_BLURAY \
-                       $KODI_PLAYER"
+  if [ "$OPENGLES_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES"
+  fi
+
+  if [ "$ALSA_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET alsa-lib"
+    KODI_ALSA="-DENABLE_ALSA=ON"
+  else
+    KODI_ALSA="-DENABLE_ALSA=OFF"
+ fi
+
+  if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
+    KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=ON"
+  else
+    KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=OFF"
+  fi
+
+  if [ "$ESPEAK_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET espeak"
+  fi
+
+  if [ "$CEC_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libcec"
+    KODI_CEC="-DENABLE_CEC=ON"
+  else
+    KODI_CEC="-DENABLE_CEC=OFF"
+  fi
+
+  if [ "$KODI_OPTICAL_SUPPORT" = yes ]; then
+    KODI_OPTICAL="-DENABLE_OPTICAL=ON"
+  else
+    KODI_OPTICAL="-DENABLE_OPTICAL=OFF"
+  fi
+
+  if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then
+    KODI_DVDCSS="-DENABLE_DVDCSS=ON \
+                 -DLIBDVDCSS_URL=$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz"
+  else
+    KODI_DVDCSS="-DENABLE_DVDCSS=OFF"
+  fi
+
+  if [ "$KODI_BLURAY_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbluray"
+    KODI_BLURAY="-DENABLE_BLURAY=ON"
+  else
+    KODI_BLURAY="-DENABLE_BLURAY=OFF"
+  fi
+
+  if [ "$AVAHI_DAEMON" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi nss-mdns"
+    KODI_AVAHI="-DENABLE_AVAHI=ON"
+  else
+    KODI_AVAHI="-DENABLE_AVAHI=OFF"
+  fi
+
+  case "$KODI_MYSQL_SUPPORT" in
+    mysql)   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql"
+             KODI_MYSQL="-DENABLE_MYSQLCLIENT=ON -DENABLE_MARIADBCLIENT=OFF"
+             ;;
+    mariadb) PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mariadb-connector-c"
+             KODI_MYSQL="-DENABLE_MARIADBCLIENT=ON -DENABLE_MYSQLCLIENT=OFF"
+             ;;
+    *)       KODI_MYSQL="-DENABLE_MYSQLCLIENT=OFF -DENABLE_MARIADBCLIENT=OFF"
+  esac
+
+  if [ "$KODI_AIRPLAY_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libplist"
+    KODI_AIRPLAY="-DENABLE_PLIST=ON"
+  else
+    KODI_AIRPLAY="-DENABLE_PLIST=OFF"
+  fi
+
+  if [ "$KODI_AIRTUNES_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libshairplay"
+    KODI_AIRTUNES="-DENABLE_AIRTUNES=ON"
+  else
+    KODI_AIRTUNES="-DENABLE_AIRTUNES=OFF"
+  fi
+
+  if [ "$KODI_NFS_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libnfs"
+    KODI_NFS="-DENABLE_NFS=ON"
+  else
+    KODI_NFS="-DENABLE_NFS=OFF"
+  fi
+
+  if [ "$KODI_SAMBA_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba"
+  fi
+
+  if [ "$KODI_WEBSERVER_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libmicrohttpd"
+  fi
+
+  if [ "$KODI_UPNP_SUPPORT" = yes ]; then
+    KODI_UPNP="-DENABLE_UPNP=ON"
+  else
+    KODI_UPNP="-DENABLE_UPNP=OFF"
+  fi
+
+  if target_has_feature neon; then
+    KODI_NEON="-DENABLE_NEON=ON"
+  else
+    KODI_NEON="-DENABLE_NEON=OFF"
+  fi
+
+  if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau"
+    KODI_VDPAU="-DENABLE_VDPAU=ON"
+  else
+    KODI_VDPAU="-DENABLE_VDPAU=OFF"
+  fi
+
+  if [ "$VAAPI_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva"
+    KODI_VAAPI="-DENABLE_VAAPI=ON"
+  else
+    KODI_VAAPI="-DENABLE_VAAPI=OFF"
+  fi
+
+  if [ "$TARGET_ARCH" = "x86_64" ]; then
+    KODI_ARCH="-DWITH_CPU=$TARGET_ARCH"
+  else
+    KODI_ARCH="-DWITH_ARCH=$TARGET_ARCH"
+  fi
+
+  if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET led_tools"
+  fi
+
+  if [ ! "$KODIPLAYER_DRIVER" = default ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $KODIPLAYER_DRIVER libinput libxkbcommon"
+    if [ "$KODIPLAYER_DRIVER" = bcm2835-driver ]; then
+      KODI_PLAYER="-DCORE_PLATFORM_NAME=rbpi"
+    elif [ "$KODIPLAYER_DRIVER" = mesa -o "$KODIPLAYER_DRIVER" = rkmpp ]; then
+      KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm -DGBM_RENDER_SYSTEM=gles"
+      CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"
+      CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS"
+    elif [ "$KODIPLAYER_DRIVER" = libamcodec ]; then
+      KODI_PLAYER="-DCORE_PLATFORM_NAME=aml"
+    fi
+  fi
+
+  KODI_LIBDVD="$KODI_DVDCSS \
+               -DLIBDVDNAV_URL=$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
+               -DLIBDVDREAD_URL=$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
+
+  PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
+                         -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \
+                         -DWITH_JSONSCHEMABUILDER=$TOOLCHAIN/bin/JsonSchemaBuilder \
+                         -DDEPENDS_PATH=$PKG_BUILD/depends \
+                         -DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/$PKG_PYTHON_VERSION \
+                         -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION \
+                         -DGIT_VERSION=$PKG_VERSION \
+                         -DWITH_FFMPEG=$(get_build_dir ffmpeg) \
+                         -DENABLE_INTERNAL_FFMPEG=OFF \
+                         -DFFMPEG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr \
+                         -DENABLE_INTERNAL_CROSSGUID=OFF \
+                         -DENABLE_UDEV=ON \
+                         -DENABLE_DBUS=ON \
+                         -DENABLE_XSLT=ON \
+                         -DENABLE_CCACHE=ON \
+                         -DENABLE_LIRCCLIENT=ON \
+                         -DENABLE_EVENTCLIENTS=ON \
+                         -DENABLE_LDGOLD=ON \
+                         -DENABLE_DEBUGFISSION=OFF \
+                         -DENABLE_APP_AUTONAME=OFF \
+                         -DENABLE_INTERNAL_FLATBUFFERS=OFF \
+                         $PKG_KODI_USE_LTO \
+                         $KODI_ARCH \
+                         $KODI_NEON \
+                         $KODI_VDPAU \
+                         $KODI_VAAPI \
+                         $KODI_CEC \
+                         $KODI_XORG \
+                         $KODI_SAMBA \
+                         $KODI_NFS \
+                         $KODI_LIBDVD \
+                         $KODI_AVAHI \
+                         $KODI_UPNP \
+                         $KODI_MYSQL \
+                         $KODI_AIRPLAY \
+                         $KODI_AIRTUNES \
+                         $KODI_OPTICAL \
+                         $KODI_BLURAY \
+                         $KODI_PLAYER"
+}
 
 pre_configure_target() {
   export LIBS="$LIBS -lncurses"
diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk
index 6c860ba5ab..0110b677d5 100644
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@@ -13,78 +13,80 @@ PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)"
 PKG_LONGDESC="A free SMB / CIFS fileserver and client."
 PKG_BUILD_FLAGS="-gold"
 
-PKG_MAKE_OPTS_TARGET="V=1"
+configure_package() {
+  PKG_MAKE_OPTS_TARGET="V=1"
 
-if [ "$AVAHI_DAEMON" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
-  SMB_AVAHI="--enable-avahi"
-else
-  SMB_AVAHI="--disable-avahi"
-fi
+  if [ "$AVAHI_DAEMON" = yes ]; then
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
+    SMB_AVAHI="--enable-avahi"
+  else
+    SMB_AVAHI="--disable-avahi"
+  fi
 
-if [ "$TARGET_ARCH" = x86_64 ]; then
-  SMB_AESNI="--accel-aes=intelaesni"
-else
-  SMB_AESNI="--accel-aes=none"
-fi
+  if [ "$TARGET_ARCH" = x86_64 ]; then
+    SMB_AESNI="--accel-aes=intelaesni"
+  else
+    SMB_AESNI="--accel-aes=none"
+  fi
 
-PKG_CONFIGURE_OPTS="--prefix=/usr \
-                    --sysconfdir=/etc \
-                    --localstatedir=/var \
-                    --with-lockdir=/var/lock \
-                    --with-logfilebase=/var/log \
-                    --with-piddir=/run/samba \
-                    --with-privatedir=/run/samba \
-                    --with-modulesdir=/usr/lib \
-                    --with-privatelibdir=/usr/lib \
-                    --with-sockets-dir=/run/samba \
-                    --with-configdir=/run/samba \
-                    --with-libiconv=$SYSROOT_PREFIX/usr \
-                    --cross-compile \
-                    --cross-answers=$PKG_BUILD/cache.txt \
-                    --hostcc=gcc \
-                    --enable-fhs \
-                    --without-dmapi \
-                    --disable-glusterfs \
-                    --disable-rpath \
-                    --disable-rpath-install \
-                    --disable-rpath-private-install \
-                    $SMB_AVAHI \
-                    $SMB_AESNI \
-                    --disable-cups \
-                    --disable-iprint \
-                    --disable-gnutls \
-                    --with-relro \
-                    --with-sendfile-support \
-                    --without-acl-support \
-                    --without-ads \
-                    --without-ad-dc \
-                    --without-automount \
-                    --without-cluster-support \
-                    --without-dnsupdate \
-                    --without-fam \
-                    --without-gettext \
-                    --without-gpgme \
-                    --without-iconv \
-                    --without-ldap \
-                    --without-libarchive \
-                    --without-pam \
-                    --without-pie \
-                    --without-regedit \
-                    --without-systemd \
-                    --without-utmp \
-                    --without-winbind \
-                    --enable-auto-reconfigure \
-                    --bundled-libraries='ALL,!asn1_compile,!compile_et,!zlib' \
-                    --without-quotas \
-                    --with-syslog  \
-                    --without-json-audit \
-                    --without-ldb-lmdb \
-                    --nopyc --nopyo"
+  PKG_CONFIGURE_OPTS="--prefix=/usr \
+                      --sysconfdir=/etc \
+                      --localstatedir=/var \
+                      --with-lockdir=/var/lock \
+                      --with-logfilebase=/var/log \
+                      --with-piddir=/run/samba \
+                      --with-privatedir=/run/samba \
+                      --with-modulesdir=/usr/lib \
+                      --with-privatelibdir=/usr/lib \
+                      --with-sockets-dir=/run/samba \
+                      --with-configdir=/run/samba \
+                      --with-libiconv=$SYSROOT_PREFIX/usr \
+                      --cross-compile \
+                      --cross-answers=$PKG_BUILD/cache.txt \
+                      --hostcc=gcc \
+                      --enable-fhs \
+                      --without-dmapi \
+                      --disable-glusterfs \
+                      --disable-rpath \
+                      --disable-rpath-install \
+                      --disable-rpath-private-install \
+                      $SMB_AVAHI \
+                      $SMB_AESNI \
+                      --disable-cups \
+                      --disable-iprint \
+                      --disable-gnutls \
+                      --with-relro \
+                      --with-sendfile-support \
+                      --without-acl-support \
+                      --without-ads \
+                      --without-ad-dc \
+                      --without-automount \
+                      --without-cluster-support \
+                      --without-dnsupdate \
+                      --without-fam \
+                      --without-gettext \
+                      --without-gpgme \
+                      --without-iconv \
+                      --without-ldap \
+                      --without-libarchive \
+                      --without-pam \
+                      --without-pie \
+                      --without-regedit \
+                      --without-systemd \
+                      --without-utmp \
+                      --without-winbind \
+                      --enable-auto-reconfigure \
+                      --bundled-libraries='ALL,!asn1_compile,!compile_et,!zlib' \
+                      --without-quotas \
+                      --with-syslog  \
+                      --without-json-audit \
+                      --without-ldb-lmdb \
+                      --nopyc --nopyo"
 
-PKG_SAMBA_TARGET="smbclient,client/smbclient,smbtree,testparm"
+  PKG_SAMBA_TARGET="smbclient,client/smbclient,smbtree,testparm"
 
-[ "$SAMBA_SERVER" = "yes" ] && PKG_SAMBA_TARGET+=",smbd/smbd,nmbd,smbpasswd"
+  [ "$SAMBA_SERVER" = "yes" ] && PKG_SAMBA_TARGET+=",smbd/smbd,nmbd,smbpasswd"
+}
 
 pre_configure_target() {
 # samba uses its own build directory