From d8689a7e0a97efe460582a04f23df4e480d4fc5a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 01/17] scripts/create_addon: build broken addons - they're placeholders, not actually broken --- scripts/create_addon | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index 2388dab05f..7e2a7096e5 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -95,8 +95,6 @@ get_addons() { # Return 0 if package is a suitable addon, 1 otherwise verify_addon() { - [ "${PKG_ADDON_TYPE}" = "xbmc.broken" ] && return 1 - if [ -n "${PKG_ARCH}" ]; then listcontains "${PKG_ARCH}" "!${TARGET_ARCH}" && return 1 listcontains "${PKG_ARCH}" "${TARGET_ARCH}" || listcontains "${PKG_ARCH}" "any" || return 1 From d71fbfaec7d5fbfb9314e4d25f617621b468718b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 02/17] scripts/build: cosmetic --- scripts/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index 3317a1dfe3..c123a5b8b9 100755 --- a/scripts/build +++ b/scripts/build @@ -429,7 +429,7 @@ for i in $(find $SYSROOT_PREFIX/usr/lib/ -name "*.la" 2>/dev/null); do sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $i done -[ "${PKG_NEED_UNLOCK}" = "yes" ] && release_exclusive_lock "${PKG_NAME}:${TARGET}" "build" || true +[ "${PKG_NEED_UNLOCK}" = "yes" ] && release_exclusive_lock "${PKG_NAME}:${TARGET}" "build" if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then if [ -d $INSTALL ]; then From 255a8cdeff44f07e50a10d4d0e4a5c496f31fa57 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 03/17] flex: needs yacc command, provided by bison --- packages/devel/flex/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk index ff61eba96b..707b104c23 100644 --- a/packages/devel/flex/package.mk +++ b/packages/devel/flex/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9" PKG_LICENSE="GPL" PKG_SITE="http://flex.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_HOST="ccache:host m4:host autotools:host" +PKG_DEPENDS_HOST="ccache:host m4:host autotools:host bison:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text." PKG_TOOLCHAIN="autotools" From cf573b1272c40bf81419911f015b9ef318e96a3c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 04/17] tools/dashboard: follow latest build if not locked to P/D/A --- tools/dashboard | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/tools/dashboard b/tools/dashboard index 3e78450e97..efb1250948 100755 --- a/tools/dashboard +++ b/tools/dashboard @@ -3,17 +3,35 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) -. config/options "" +cd "$(readlink -f "$(dirname "$0")")/.." + +if [ -n "${PROJECT}" -a "$1" != "auto" ]; then + . config/options "" +fi + +_find_latest_tcdir() { + if [ -n "${THREAD_CONTROL}" ]; then + echo "${THREAD_CONTROL}" + else + ls -1tdr "${PWD}"/build.*/.threads 2>/dev/null | tail -1 + fi +} while [ : ]; do echo "Waiting for build to start..." + while [ : ]; do - pid="$(cat "${THREAD_CONTROL}/pid" 2>/dev/null || true)" - [ -n "${pid}" ] && ps -p ${pid} &>/dev/null && break + tcdir="$(_find_latest_tcdir)" + + if [ -n "${tcdir}" ]; then + pid="$(cat "${tcdir}/pid" 2>/dev/null || true)" + [ -n "${pid}" ] && ps -p ${pid} &>/dev/null && break + fi + sleep 1.0 done - tail -Fn+0 --pid=${pid} ${THREAD_CONTROL}/status 2>/dev/null + tail -Fn+0 --pid=${pid} "${tcdir}/status" 2>/dev/null echo done From 90958e9472fe99c5e2e9fbff7e3ca76b6a92e115 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 05/17] scripts/create_addon: use correct name in usage etc. --- scripts/create_addon | 10 +++++----- scripts/create_addon_st | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index 7e2a7096e5..26e16223c0 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -9,7 +9,7 @@ usage() { cat - >&2 < ./script/create_addon_mt all + > ./script/create_addon all build audio encoders and decoders, only - > ./script/create_addon_mt audioencoder.* audiodecoder.* + > ./script/create_addon audioencoder.* audiodecoder.* build all, but not binary - > ./script/create_addon_mt all -binary + > ./script/create_addon all -binary EOF exit ${1:-0} } @@ -88,7 +88,7 @@ get_addons() { if [ ${count} -eq 0 -a -n "${filter}" ]; then echo "$(print_color CLR_ERROR "ERROR: no addons matched for filter ${filter}")" >&2 - echo "For more information type: ./scripts/create_addon_mt --help" >&2 + echo "For more information type: ./scripts/create_addon --help" >&2 die fi } diff --git a/scripts/create_addon_st b/scripts/create_addon_st index f2e75d6505..921e135600 100755 --- a/scripts/create_addon_st +++ b/scripts/create_addon_st @@ -10,10 +10,10 @@ usage() { cat - >&2 < ./script/create_addon all + > ./script/create_addon_st all build audio encoders and decoders, only - > ./script/create_addon audioencoder.* audiodecoder.* + > ./script/create_addon_st audioencoder.* audiodecoder.* build all, but not binary - > ./script/create_addon all -binary + > ./script/create_addon_st all -binary EOUSAGE exit ${1:0} @@ -94,7 +94,7 @@ function find_addons() { # abort when nothing found and not embedded if [ $? -ne 0 ]; then echo "$(print_color CLR_ERROR "ERROR: '$1' matches nothing...")" >&$SILENT_OUT - echo "for more informations type: ./scripts/create_addon --help" >&$SILENT_OUT + echo "for more informations type: ./scripts/create_addon_st --help" >&$SILENT_OUT die fi fi From 88420e232be244ab98953ca8d98b1beee80fadd4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 06/17] tools/pkgcheck: add "ignored depends assign" warning --- packages/readme.md | 1 + tools/pkgcheck | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/readme.md b/packages/readme.md index f141c19d57..3553a7023e 100644 --- a/packages/readme.md +++ b/packages/readme.md @@ -246,6 +246,7 @@ Issue | Level | Meaning | | bad func - missing brace | FAIL | Opening brace (`{`) for function definition should be on same line as the function def, ie. `pre_configure_target() {` | | intertwined vars & funcs | WARN | Variable assignments and logic is intertwined with functions - this is cosmetic, but variables and logic should be specified before all functions | | unknown function | WARN | Could be a misspelled function, ie. `per_configure_target() {` which might fail silently.| +| ignored depends assign | WARN | Values assigned to `PKG_DEPENDS_*` outside of the global section or `configure_package()` will be ignored. | ## Add a new package to the Image diff --git a/tools/pkgcheck b/tools/pkgcheck index 53e4b661ad..cab6a6af58 100755 --- a/tools/pkgcheck +++ b/tools/pkgcheck @@ -21,14 +21,20 @@ log() { [ ${lc} -eq 0 ] && flc="---" || flc="$(printf "%03d" ${lc})" [[ ${filename} =~ packages/addons/addon-depends ]] && colw=80 || colw=50 - printf "[%s]: %3s: %-*s: %-25s: %s\n" "${txcolour}${level}${TXRESET}" "${flc}" ${colw} "${filename}" "${msg}" "${data}" + printf "[%s] %3s: %-*s: %-25s: %s\n" "${txcolour}${level}${TXRESET}" "${flc}" ${colw} "${filename}" "${msg}" "${data}" } process_line() { - local filename="$1" lc="$2" line="$3" inassign="$4" infunc="$5" + local filename="$1" lc="$2" line="$3" inassign="$4" funcname="$5" local var matches assignallowed=Y - [ "${infunc}" = "Y" ] && return 0 + if [ -n "${funcname}" -a "${funcname}" != "configure_package" -a "${inassign}" = "Y" ]; then + if [[ ${line} =~ PKG_DEPENDS_.*= ]]; then + log "${filename}" ${lc} "WARN" "ignored depends assign" "${funcname}() => ${line//[[:space:]]*PKG_DEPENDS_/PKG_DEPENDS_}" + fi + fi + + [ -n "${funcname}" ] && return 0 rightside="${line#*=}" @@ -104,7 +110,7 @@ check_func_name() { process_pkg() { local filename="$1" - local lc=0 isassign=N isfunc=N fc=0 intertwined=N + local lc=0 isassign=N funcname= fc=0 intertwined=N while IFS= read -r line; do lc=$((lc + 1)) @@ -116,22 +122,22 @@ process_pkg() { fi if [[ "${line}" =~ \(\)[[:space:]]*\{ ]]; then - isfunc=Y + funcname="${line//(*/}" fc=$((fc+1)) check_func_name "${filename}" "${lc}" "${line}" fi - if [ "${intertwined}" = "N" -a "${isfunc}" = "N" -a ${fc} -ge 1 ]; then + if [ "${intertwined}" = "N" -a -z "${funcname}" -a ${fc} -ge 1 ]; then log "${filename}" ${lc} "WARN" "intertwined vars & funcs" "${line}" intertwined=Y fi [[ "${line}" =~ ^[[:space:]]*PKG_.*=\" ]] && isassign=Y - process_line "$1" "${lc}" "${line}" "${isassign}" "${isfunc}" + process_line "$1" "${lc}" "${line}" "${isassign}" "${funcname}" [[ "${line}" =~ (\"$|\"[[:space:]]*$|\"[[:space:]]*#.*$) ]] && isassign=N - [[ "${line}" =~ (^}|^[[:space:]]*}) ]] && isfunc=N + [[ "${line}" =~ (^}|^[[:space:]]*}) ]] && funcname= done < "${filename}" # Duplicate function check From 7ed6710a190464761f86f558380fc27132f7b69a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 07/17] libvpx: fix ignored dependency --- .../addons/addon-depends/ffmpegx-depends/libvpx/package.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk index 00cfe65f38..0994f00bb9 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk @@ -10,6 +10,10 @@ PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="WebM VP8/VP9 Codec" +if [ "$TARGET_ARCH" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" nasm:host" +fi + configure_target() { case $ARCH in @@ -20,7 +24,6 @@ configure_target() { PKG_TARGET_NAME_LIBVPX="armv7-linux-gcc" ;; x86_64) - PKG_DEPENDS_TARGET+=" nasm:host" PKG_TARGET_NAME_LIBVPX="x86_64-linux-gcc" ;; esac From ab67ec7ccc94b82e768743d1c325ac27e98317fb Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 08/17] scripts/unpack: fix issue unpacking libhybris --- scripts/unpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/unpack b/scripts/unpack index fd7bbf1da0..1fc760aefc 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -68,7 +68,7 @@ if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then fi _pkg_build="$(basename "${PKG_BUILD}")" - [ -d "${PKG_UNPACK_DIR}/${_pkg_build}"* ] && mv "${PKG_UNPACK_DIR}/${_pkg_build}"* "${PKG_BUILD}" + [ -z "${PKG_SOURCE_DIR}" -a -d "${PKG_UNPACK_DIR}/${_pkg_build}"* ] && mv "${PKG_UNPACK_DIR}/${_pkg_build}"* "${PKG_BUILD}" if [ ! -d "${PKG_BUILD}" ]; then if [ -n "${PKG_SOURCE_DIR}" ]; then From 85da96229f238c31d6ae018cb03d1eff5692de6b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 09/17] config/multithreaded: install embedded addons too during addon build --- config/multithread | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/multithread b/config/multithread index 2ffa4c6dda..1c14ddfc70 100644 --- a/config/multithread +++ b/config/multithread @@ -53,7 +53,7 @@ export -f json_worker package_worker() { local slot=$1 job=$2 jobs=$3 args="$4" local task pkgname result status - local addon istarget + local addon istarget isaddon export MTJOBID=${slot} MTMAXJOBS=${jobs} @@ -67,7 +67,9 @@ package_worker() { [[ ${pkgname} =~ :target$ || "${pkgname//:/}" = "${pkgname}" ]] && istarget="yes" || istarget="no" - if [ "${MTADDONBUILD}" = "yes" -a "${PKG_IS_ADDON}" = "yes" -a "${istarget}" = "yes" ]; then + [[ "${MTADDONBUILD}" = "yes" && ( "${PKG_IS_ADDON}" = "yes" || "${PKG_IS_ADDON}" = "embedded" ) ]] && isaddon="yes" || isaddon="no" + + if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then if [ ${result} -eq 0 ]; then ( pkg_lock "${pkgname}" "packadd" From 812739f7d68121682fde6e756b8ebcf92872b56d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 10/17] slice: fix slice addon build --- packages/addons/service/slice/package.mk | 6 ++++++ packages/tools/led_tools/package.mk | 3 ++- packages/tools/slice-addon/package.mk | 24 ------------------------ 3 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 packages/tools/slice-addon/package.mk diff --git a/packages/addons/service/slice/package.mk b/packages/addons/service/slice/package.mk index f70f73173b..4ee9d331e4 100644 --- a/packages/addons/service/slice/package.mk +++ b/packages/addons/service/slice/package.mk @@ -19,6 +19,12 @@ PKG_ADDON_NAME="Slice" PKG_ADDON_PROJECTS="Slice Slice3" PKG_ADDON_TYPE="xbmc.service" +makeinstall_target() { + PKG_ADDON_INSTALL_DIR="${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME}" + mkdir -p "${PKG_ADDON_INSTALL_DIR}" + install_addon_files "${PKG_ADDON_INSTALL_DIR}" +} + addon() { : } diff --git a/packages/tools/led_tools/package.mk b/packages/tools/led_tools/package.mk index 838eaa827f..dfcf597683 100644 --- a/packages/tools/led_tools/package.mk +++ b/packages/tools/led_tools/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2014 Gordon Hollingworth (gordon@fiveninjas.com) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="led_tools" PKG_VERSION="0.1" @@ -7,7 +8,7 @@ PKG_SHA256="0484b4a2da9d586accef87ba7dd18595baae1d602c1b1bd9e0a8565ab50419a2" PKG_LICENSE="GPL" PKG_SITE="http://www.fiveninjas.com" PKG_URL="http://updates.fiveninjas.com/src/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain zlib libpng slice-addon" +PKG_DEPENDS_TARGET="toolchain zlib libpng slice" PKG_DEPENDS_HOST="toolchain" PKG_LONGDESC="LED tools, these are a set of tools to control the LEDs on Slice" diff --git a/packages/tools/slice-addon/package.mk b/packages/tools/slice-addon/package.mk deleted file mode 100644 index b96a7c16ac..0000000000 --- a/packages/tools/slice-addon/package.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="slice-addon" -PKG_VERSION="1.0" -PKG_REV="101" -PKG_LICENSE="GPL" -PKG_SITE="" -PKG_URL="" -PKG_DEPENDS_TARGET="" -PKG_LONGDESC="Controls the LED lights on the Slice box using Kodi actions" -PKG_TOOLCHAIN="manual" - -make_target() { -( - cd $ROOT - scripts/create_addon slice -) -} - -makeinstall_target() { - mkdir -p $INSTALL/usr/share/kodi/addons - cp -R $BUILD/$ADDONS/slice/service.slice $INSTALL/usr/share/kodi/addons -} From 78d97cc12be45ba68a42779a1bbf87806ad946d0 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 11/17] slice-firmware: fix dependency --- packages/linux-firmware/slice-firmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/slice-firmware/package.mk b/packages/linux-firmware/slice-firmware/package.mk index ae5f97c686..17a6ff5715 100644 --- a/packages/linux-firmware/slice-firmware/package.mk +++ b/packages/linux-firmware/slice-firmware/package.mk @@ -8,7 +8,7 @@ PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/FiveNinjas/slice-firmware" PKG_URL="https://github.com/libreelec/slice-firmware/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain dtc:host" +PKG_DEPENDS_TARGET="toolchain dtc:host linux" PKG_LONGDESC="BCM270x firmware related stuff for Slice" PKG_TOOLCHAIN="manual" From a8d6e99f82a2e31a6e3313718308f427d7ffc2ab Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 12/17] scripts/create_addon: output diagnostic when filter not matching --- scripts/create_addon | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/create_addon b/scripts/create_addon index 26e16223c0..fe5f771f28 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -69,6 +69,7 @@ get_addons() { [ ${exited} -eq 1 ] && continue validpkg="no" + VERIFY_FAIL= # Should only build embedded addons when they are explictly specified in the addon list if [ "${PKG_IS_ADDON}" = "embedded" ]; then if [ -n "${filter}" ]; then @@ -81,6 +82,8 @@ get_addons() { if [ "${validpkg}" = "yes" ]; then echo "${PKG_NAME}" count=$((count + 1)) + elif [ -n "${VERIFY_FAIL}" -a -n "${filter}" ]; then + echo "$(print_color CLR_ERROR "${PKG_NAME}"): ${VERIFY_FAIL}" >&2 fi done @@ -96,6 +99,7 @@ get_addons() { # Return 0 if package is a suitable addon, 1 otherwise verify_addon() { if [ -n "${PKG_ARCH}" ]; then + VERIFY_FAIL="Incompatible arch: \"${TARGET_ARCH}\" not in [ ${PKG_ARCH} ]" listcontains "${PKG_ARCH}" "!${TARGET_ARCH}" && return 1 listcontains "${PKG_ARCH}" "${TARGET_ARCH}" || listcontains "${PKG_ARCH}" "any" || return 1 fi @@ -103,6 +107,8 @@ verify_addon() { if [ -n "${PKG_ADDON_PROJECTS}" ]; then [ "${DEVICE}" = "RPi" ] && _DEVICE="RPi1" || _DEVICE="${DEVICE}" + VERIFY_FAIL="Incompatible project or device: \"${_DEVICE:-${PROJECT}}\" not in [ ${PKG_ADDON_PROJECTS} ]" + if listcontains "${PKG_ADDON_PROJECTS}" "!${_DEVICE:-$PROJECT}" || listcontains "${PKG_ADDON_PROJECTS}" "!${PROJECT}"; then return 1 From 9af18cf35e74fccf0756f37a368831d49681e1d4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 13/17] scripts/image: restore original licence/copyright and resolve debate --- scripts/image | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/image b/scripts/image index de595fe5a4..70830e2050 100755 --- a/scripts/image +++ b/scripts/image @@ -1,7 +1,8 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST From fd66be981d3d03f72c57d9ea58ca85dacb2d143e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 14/17] mpd: fix dependency --- packages/addons/service/mpd/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 9dac581ce7..a8af8da753 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -11,7 +11,7 @@ PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" PKG_URL="http://www.musicpd.org/download/mpd/${PKG_VERSION%.*}/mpd-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libiconv libid3tag \ - libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl" + libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl libgcrypt" PKG_SECTION="service.multimedia" PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server" PKG_LONGDESC="Music Player Daemon ($PKG_VERSION) is a flexible and powerful server-side application for playing music" From 29e7605ab7547dcde0c36e5605c0f17d72b88db9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 15/17] aom: fix dependency --- packages/multimedia/aom/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk index 641c2222cd..129979ba2b 100644 --- a/packages/multimedia/aom/package.mk +++ b/packages/multimedia/aom/package.mk @@ -16,6 +16,10 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_CCACHE=1 \ -DENABLE_TESTS=0 \ -DENABLE_TOOLS=0" +if [ "$TARGET_ARCH" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" nasm:host" +fi + if ! target_has_feature neon; then PKG_CMAKE_OPTS_TARGET+=" -DENABLE_NEON=0 -DENABLE_NEON_ASM=0" fi From 48eee9e68aaaceeab0f3186cbed5d80657257a3a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 16/17] nmap: fix dependency --- .../addons/addon-depends/network-tools-depends/nmap/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk index 6e436524da..b38eb03c4b 100644 --- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18" PKG_LICENSE="GPL" PKG_SITE="http://nmap.org/" PKG_URL="http://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain" +PKG_DEPENDS_TARGET="toolchain openssl" PKG_LONGDESC="Free Security Scanned for Network." PKG_CONFIGURE_OPTS_TARGET="--enable-static \ From da79708b57779acc60ac06f1c6fbfd3f1cc784ea Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH 17/17] libtool: fix dependency --- packages/devel/libtool/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/devel/libtool/package.mk b/packages/devel/libtool/package.mk index a0b667ed2d..d8b0b1ccc1 100644 --- a/packages/devel/libtool/package.mk +++ b/packages/devel/libtool/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libtool" PKG_VERSION="2.4.6" @@ -7,7 +8,7 @@ PKG_SHA256="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libtool/" PKG_URL="http://ftpmirror.gnu.org/libtool/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host" +PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A generic library support script." PKG_TOOLCHAIN="autotools"