From b27954ef563355e00b88b0bb6397f1bfebbfbfdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gir=C3=B3n?= Date: Mon, 8 Jan 2024 16:14:43 +0100 Subject: [PATCH] package update dependencies (#56) * update boost package source from SourceForge * opusfile: fix DEPS_CFLAGS include path --- packages.sh | 29 ++++++++++++++++++++++++----- packages/bluez/package.mk | 2 +- packages/boost/package.mk | 5 +++-- packages/cjson/package.mk | 2 +- packages/faad2/package.mk | 15 +++++++++------ packages/flac/package.mk | 2 +- packages/fluidsynth/package.mk | 2 +- packages/json-c/package.mk | 2 +- packages/libcue/package.mk | 13 +++++++++---- packages/libical/package.mk | 2 +- packages/libmpdclient/package.mk | 2 +- packages/libnl/package.mk | 2 +- packages/libnpupnp/package.mk | 2 +- packages/libsidplayfp/package.mk | 2 +- packages/libsndfile/package.mk | 2 +- packages/libsodium/package.mk | 2 +- packages/libupnp/package.mk | 2 +- packages/libupnpp/package.mk | 2 +- packages/libxml/package.mk | 2 +- packages/mosquitto/package.mk | 2 +- packages/mpc/package.mk | 2 +- packages/nghttp2/package.mk | 2 +- packages/opusfile/package.mk | 15 ++++++++++----- packages/shairport-sync/package.mk | 2 +- packages/snapcast/package.mk | 18 ++++++++++++------ packages/upmpdcli/package.mk | 6 +++--- 26 files changed, 89 insertions(+), 50 deletions(-) diff --git a/packages.sh b/packages.sh index 3dea813..d9c6976 100755 --- a/packages.sh +++ b/packages.sh @@ -161,17 +161,36 @@ prepare_clean_dir() { fi } +get_src_filename() { + local src_filename=$(basename "${PACKAGE_SRC}") + # if last part is "download", return previous folder. + # used for Sourceforge + if [[ "${src_filename}" = 'download' ]]; then + echo "${PACKAGE_SRC}" | awk -F/ '{print $(NF-1)}' + else + echo ${src_filename} + fi +} + +download_file() { + local filename="$1" + local download_dir="$2" + local url="$3" + + wget --no-check-certificate --tries=5 --retry-connrefused --waitretry=5 \ + --trust-server-names --progress=bar:force:noscroll \ + -O ${filename} -P "${download_dir}" "${url}" +} + download_package_src() { if [[ ! -z "${PACKAGE_SRC}" ]]; then - local src_filename=$(basename "${PACKAGE_SRC}") + local src_filename=`get_src_filename` if [[ ! -z "${src_filename}" ]]; then if [[ -e "${PACKAGE_SRC_DOWNLOAD_DIR}/${src_filename}" ]] && [[ "`stat -c %s ${PACKAGE_SRC_DOWNLOAD_DIR}/${src_filename}`" -gt 1024 ]]; then echo "Using cached download" else echo "Downloading package source..." - wget --no-check-certificate --tries=5 --retry-connrefused --waitretry=5 \ - --progress=bar:force:noscroll \ - -O ${src_filename} -P ${PACKAGE_SRC_DOWNLOAD_DIR} "${PACKAGE_SRC}" + download_file "${src_filename}" "${PACKAGE_SRC_DOWNLOAD_DIR}" "${PACKAGE_SRC}" fi else echo_error "Error: Invalid package source specified!" @@ -182,7 +201,7 @@ download_package_src() { unpack_package_src() { if [[ ! -z "${PACKAGE_SRC}" ]]; then - local src_filename=$(basename "${PACKAGE_SRC}") + local src_filename=`get_src_filename` local src_file="${PACKAGE_SRC_DOWNLOAD_DIR}/${src_filename}" if [[ -e "${src_file}" ]]; then echo "Unpacking ${src_file}..." diff --git a/packages/bluez/package.mk b/packages/bluez/package.mk index 553693a..eddd3fa 100644 --- a/packages/bluez/package.mk +++ b/packages/bluez/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Bluetooth Linux" -PACKAGE_VERSION="5.66" +PACKAGE_VERSION="5.71" PACKAGE_SRC="https://cdn.kernel.org/pub/linux/bluetooth/bluez-${PACKAGE_VERSION}.tar.xz" PACKAGE_DEPENDS="kernel-headers glibc alsa-lib dbus sbc glib libical readline json-c" diff --git a/packages/boost/package.mk b/packages/boost/package.mk index 795b165..ba2f41a 100644 --- a/packages/boost/package.mk +++ b/packages/boost/package.mk @@ -1,6 +1,7 @@ PACKAGE_NAME="Boost C++ libraries" -PACKAGE_VERSION="1.76.0" -PACKAGE_SRC="https://boostorg.jfrog.io/artifactory/main/release/${PACKAGE_VERSION}/source/boost_${PACKAGE_VERSION//./_}.tar.gz" +PACKAGE_VERSION="1.84.0" +#PACKAGE_SRC="https://boostorg.jfrog.io/artifactory/main/release/${PACKAGE_VERSION}/source/boost_${PACKAGE_VERSION//./_}.tar.gz" +PACKAGE_SRC="https://sourceforge.net/projects/boost/files/boost/${PACKAGE_VERSION}/boost_${PACKAGE_VERSION//./_}.tar.gz/download" configure_package() { ./bootstrap.sh diff --git a/packages/cjson/package.mk b/packages/cjson/package.mk index 63a85b7..6988d9b 100644 --- a/packages/cjson/package.mk +++ b/packages/cjson/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="cJSON" -PACKAGE_VERSION="1.7.15" +PACKAGE_VERSION="1.7.17" PACKAGE_SRC="https://github.com/DaveGamble/cJSON/archive/v${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/faad2/package.mk b/packages/faad2/package.mk index 6253176..101cbeb 100644 --- a/packages/faad2/package.mk +++ b/packages/faad2/package.mk @@ -1,13 +1,16 @@ PACKAGE_NAME="FAAD2" -PACKAGE_VERSION="2.10.1" +PACKAGE_VERSION="2.11.1" PACKAGE_SRC="https://github.com/knik0/faad2/archive/${PACKAGE_VERSION}.tar.gz" - -preconfigure_package() { - ./bootstrap -} +PACKAGE_USE_SEPARATE_BUILD_DIR="true" configure_package() { - CC="${BUILD_CC}" CXX="${BUILD_CXX}" CFLAGS="${BUILD_CFLAGS}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" ./configure --prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET} + PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" \ + PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \ + cmake \ + -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ + -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_CMAKE} \ + -DBUILD_SHARED_LIBS=ON \ + ${PACKAGE_SRC_DIR} } make_package() { diff --git a/packages/flac/package.mk b/packages/flac/package.mk index 778ed75..a49da9b 100644 --- a/packages/flac/package.mk +++ b/packages/flac/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Free Lossless Audio Codec" -PACKAGE_VERSION="1.4.2" +PACKAGE_VERSION="1.4.3" PACKAGE_SRC="https://github.com/xiph/flac/archive/master.zip" PACKAGE_DEPENDS="libogg gcc" diff --git a/packages/fluidsynth/package.mk b/packages/fluidsynth/package.mk index 653ee08..ee84285 100644 --- a/packages/fluidsynth/package.mk +++ b/packages/fluidsynth/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="FluidSynth" -PACKAGE_VERSION="2.3.2" +PACKAGE_VERSION="2.3.4" PACKAGE_SRC="https://github.com/FluidSynth/fluidsynth/archive/v${PACKAGE_VERSION}.tar.gz" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/json-c/package.mk b/packages/json-c/package.mk index 38a97da..5b6bc6f 100644 --- a/packages/json-c/package.mk +++ b/packages/json-c/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="json-c" -PACKAGE_VERSION="0.16-20220414" +PACKAGE_VERSION="0.17-20230812" PACKAGE_SRC="https://github.com/json-c/json-c/archive/json-c-${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="gcc" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/libcue/package.mk b/packages/libcue/package.mk index 9387704..bace50c 100644 --- a/packages/libcue/package.mk +++ b/packages/libcue/package.mk @@ -1,10 +1,15 @@ PACKAGE_NAME="CUE Sheet Parser Library" -PACKAGE_VERSION="2.2.1" -PACKAGE_SRC="https://github.com/lipnitsk/libcue/archive/v2.2.1.tar.gz" +PACKAGE_VERSION="2.3.0" +PACKAGE_SRC="https://github.com/lipnitsk/libcue/archive/v${PACKAGE_VERSION}.tar.gz" PACKAGE_USE_SEPARATE_BUILD_DIR="true" configure_package() { - PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" cmake -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_CMAKE} -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} ${PACKAGE_SRC_DIR} + PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" \ + PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \ + cmake \ + -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_CMAKE} \ + -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ + ${PACKAGE_SRC_DIR} } make_package() { @@ -13,4 +18,4 @@ make_package() { install_package() { make DESTDIR=${STAGING_DIR} install -} \ No newline at end of file +} diff --git a/packages/libical/package.mk b/packages/libical/package.mk index 8579f61..0c4b369 100644 --- a/packages/libical/package.mk +++ b/packages/libical/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libical" -PACKAGE_VERSION="3.0.16" +PACKAGE_VERSION="3.0.17" PACKAGE_SRC="https://github.com/libical/libical/releases/download/v${PACKAGE_VERSION}/libical-${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc glib libxml" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/libmpdclient/package.mk b/packages/libmpdclient/package.mk index 72f6002..3226399 100644 --- a/packages/libmpdclient/package.mk +++ b/packages/libmpdclient/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libmpdclient" -PACKAGE_VERSION="2.20" +PACKAGE_VERSION="2.22" PACKAGE_SRC="https://github.com/MusicPlayerDaemon/libmpdclient/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/libnl/package.mk b/packages/libnl/package.mk index 65b308c..5a8a4e9 100644 --- a/packages/libnl/package.mk +++ b/packages/libnl/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libnl" -PACKAGE_VERSION="3.7.0" +PACKAGE_VERSION="3.9.0" PACKAGE_VERSION_TAG="$(echo "${PACKAGE_VERSION}" | tr . _)" PACKAGE_SRC="https://github.com/thom311/libnl/releases/download/libnl${PACKAGE_VERSION_TAG}/libnl-${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="base openssl" diff --git a/packages/libnpupnp/package.mk b/packages/libnpupnp/package.mk index c3c651f..d233316 100644 --- a/packages/libnpupnp/package.mk +++ b/packages/libnpupnp/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libnpupnp" -PACKAGE_VERSION="4.1.4" +PACKAGE_VERSION="6.0.1" PACKAGE_SRC="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc curl libmicrohttpd expat" diff --git a/packages/libsidplayfp/package.mk b/packages/libsidplayfp/package.mk index 14d7700..f9275ab 100644 --- a/packages/libsidplayfp/package.mk +++ b/packages/libsidplayfp/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Libsidplayfp" -PACKAGE_VERSION="2.5.0" +PACKAGE_VERSION="2.5.1" PACKAGE_SRC="https://github.com/libsidplayfp/libsidplayfp/releases/download/v${PACKAGE_VERSION}/libsidplayfp-${PACKAGE_VERSION}.tar.gz" configure_package() { diff --git a/packages/libsndfile/package.mk b/packages/libsndfile/package.mk index 802e65c..e597f5d 100644 --- a/packages/libsndfile/package.mk +++ b/packages/libsndfile/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Libsndfile" -PACKAGE_VERSION="1.2.0" +PACKAGE_VERSION="1.2.2" PACKAGE_SRC="https://github.com/libsndfile/libsndfile/archive/refs/tags/${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="flac libogg libvorbis sqlite3 alsa-lib" diff --git a/packages/libsodium/package.mk b/packages/libsodium/package.mk index 6a6e4eb..6cb6012 100644 --- a/packages/libsodium/package.mk +++ b/packages/libsodium/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libsodium" -PACKAGE_VERSION="1.0.18" +PACKAGE_VERSION="1.0.19" PACKAGE_SRC="https://github.com/jedisct1/libsodium/archive/refs/tags/${PACKAGE_VERSION}.tar.gz" preconfigure_package() { diff --git a/packages/libupnp/package.mk b/packages/libupnp/package.mk index a40879d..97a31ed 100644 --- a/packages/libupnp/package.mk +++ b/packages/libupnp/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Portable UPnP SDK" -PACKAGE_VERSION="1.14.17" +PACKAGE_VERSION="1.14.18" PACKAGE_SRC="https://github.com/pupnp/pupnp/releases/download/release-${PACKAGE_VERSION}/libupnp-${PACKAGE_VERSION}.tar.bz2" configure_package() { diff --git a/packages/libupnpp/package.mk b/packages/libupnpp/package.mk index 9ec859b..f1c2bf8 100644 --- a/packages/libupnpp/package.mk +++ b/packages/libupnpp/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libupnpp" -PACKAGE_VERSION="0.21.0" +PACKAGE_VERSION="0.25.0" PACKAGE_SRC="https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc libupnp libnpupnp curl expat" diff --git a/packages/libxml/package.mk b/packages/libxml/package.mk index 48faefc..e5971f5 100644 --- a/packages/libxml/package.mk +++ b/packages/libxml/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="libxml" -PACKAGE_VERSION="2.11.4" +PACKAGE_VERSION="2.12.3" PACKAGE_SRC="https://github.com/GNOME/libxml2/archive/v${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc zlib" diff --git a/packages/mosquitto/package.mk b/packages/mosquitto/package.mk index f3a0451..4ed8efb 100644 --- a/packages/mosquitto/package.mk +++ b/packages/mosquitto/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="mosquitto" -PACKAGE_VERSION="2.0.15" +PACKAGE_VERSION="2.0.18" PACKAGE_SRC="https://github.com/eclipse/mosquitto/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="base glibc cjson" diff --git a/packages/mpc/package.mk b/packages/mpc/package.mk index 828b332..b869454 100644 --- a/packages/mpc/package.mk +++ b/packages/mpc/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="mpc" -PACKAGE_VERSION="0.34" +PACKAGE_VERSION="0.35" PACKAGE_SRC="https://github.com/MusicPlayerDaemon/mpc/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc libmpdclient" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/nghttp2/package.mk b/packages/nghttp2/package.mk index d53bc05..c480fa5 100644 --- a/packages/nghttp2/package.mk +++ b/packages/nghttp2/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="nghttp2" -PACKAGE_VERSION="1.54.0" +PACKAGE_VERSION="1.58.0" PACKAGE_SRC="https://github.com/nghttp2/nghttp2/releases/download/v${PACKAGE_VERSION}/nghttp2-${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc gcc openssl zlib" diff --git a/packages/opusfile/package.mk b/packages/opusfile/package.mk index bb35209..ca6ee5d 100644 --- a/packages/opusfile/package.mk +++ b/packages/opusfile/package.mk @@ -9,12 +9,17 @@ preconfigure_package() { } configure_package() { + OPUSDIR=${STAGING_DIR}/${INSTALL_PREFIX}/include/opus + CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" \ - CXX="${BUILD_CXX}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" \ - PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \ - ./configure \ - --prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET} \ - --enable-fixed-point --disable-doc --disable-examples + CXX="${BUILD_CXX}" \ + PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" \ + PKG_CONFIG_PATH="${BUILD_PKG_CONFIG_LIBDIR}" \ + DEPS_CFLAGS="-I${OPUSDIR}" \ + ./configure --prefix=${INSTALL_PREFIX} --build=${MACHTYPE} --host=${BUILD_TARGET} \ + --enable-fixed-point \ + --disable-doc \ + --disable-examples } make_package() { diff --git a/packages/shairport-sync/package.mk b/packages/shairport-sync/package.mk index 70a9835..0c2fe5f 100644 --- a/packages/shairport-sync/package.mk +++ b/packages/shairport-sync/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="shairport-sync" -PACKAGE_VERSION="4.2" +PACKAGE_VERSION="4.3.2" PACKAGE_SRC="https://github.com/mikebrady/shairport-sync/archive/${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="glibc openssl avahi alsa-lib popt libconfig soxr alac" diff --git a/packages/snapcast/package.mk b/packages/snapcast/package.mk index bda04cb..9a02db1 100644 --- a/packages/snapcast/package.mk +++ b/packages/snapcast/package.mk @@ -10,17 +10,23 @@ if [ "${BUILD_MODEL}" = "LX01" ]; then BUILD_TARGETS="client" fi -preconfigure_package() { - if [ ! -e "${PACKAGE_SRC_DOWNLOAD_DIR}/${BOOST}.tar.gz" ]; then - echo_info "downloading boost lib" - wget -P ${PACKAGE_SRC_DOWNLOAD_DIR} https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST}.tar.gz +prepare_boost() { + BOOST_PKG="${PACKAGE_SRC_DOWNLOAD_DIR}/../boost/${BOOST}.tar.gz" + BOOST_SRC="https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/${BOOST}.tar.gz/download" + if [ ! -e "${BOOST_PKG}" ]; then + echo_info "downloading boost lib" + download_file "${BOOST_PKG}" "`dirname ${BOOST_PKG}`" "${BOOST_SRC}" fi echo_info "extracting boost lib" - tar xzf ${PACKAGE_SRC_DOWNLOAD_DIR}/${BOOST}.tar.gz -C ${PACKAGE_SRC_DIR} + tar xzf "${BOOST_PKG}" -C "${PACKAGE_SRC_DIR}" +} + +preconfigure_package() { + prepare_boost } make_package() { - ADD_FLAGS="-I${PACKAGE_SRC_DIR} -I${STAGING_DIR}/${INSTALL_PREFIX}/${BUILD_TARGET}/include ${BUILD_CFLAGS} --sysroot=${STAGING_DIR}" + ADD_FLAGS="-I${PACKAGE_SRC_DIR}/${BOOST} -I${STAGING_DIR}/${INSTALL_PREFIX}/${BUILD_TARGET}/include ${BUILD_CFLAGS} --sysroot=${STAGING_DIR}" make -j${MAKE_JOBS} \ CC="${BUILD_CC}" CXX="${BUILD_CXX}" \ diff --git a/packages/upmpdcli/package.mk b/packages/upmpdcli/package.mk index cb710d8..33d02e4 100644 --- a/packages/upmpdcli/package.mk +++ b/packages/upmpdcli/package.mk @@ -1,7 +1,7 @@ PACKAGE_NAME="upmpdcli" -PACKAGE_VERSION="1.7.7" -#PACKAGE_SRC="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${PACKAGE_VERSION}.tar.gz" -PACKAGE_SRC="https://framagit.org/medoc92/upmpdcli/-/archive/upmpdcli-v${PACKAGE_VERSION}/upmpdcli-upmpdcli-v${PACKAGE_VERSION}.tar.gz" +PACKAGE_VERSION="1.8.6" +PACKAGE_SRC="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${PACKAGE_VERSION}.tar.gz" +#PACKAGE_SRC="https://framagit.org/medoc92/upmpdcli/-/archive/upmpdcli-v${PACKAGE_VERSION}/upmpdcli-upmpdcli-v${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="libmpdclient libmicrohttpd jsoncpp libnpupnp libupnpp" # sc2mpd preconfigure_package() {