Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package update dependencies #56

Merged
merged 6 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand All @@ -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}..."
Expand Down
2 changes: 1 addition & 1 deletion packages/bluez/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
5 changes: 3 additions & 2 deletions packages/boost/package.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/cjson/package.mk
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
15 changes: 9 additions & 6 deletions packages/faad2/package.mk
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/flac/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/fluidsynth/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/json-c/package.mk
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
13 changes: 9 additions & 4 deletions packages/libcue/package.mk
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -13,4 +18,4 @@ make_package() {

install_package() {
make DESTDIR=${STAGING_DIR} install
}
}
2 changes: 1 addition & 1 deletion packages/libical/package.mk
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/libmpdclient/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/libnl/package.mk
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/libnpupnp/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/libsidplayfp/package.mk
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/libsndfile/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/libsodium/package.mk
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/libupnp/package.mk
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/libupnpp/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/libxml/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/mosquitto/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion packages/mpc/package.mk
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/nghttp2/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
15 changes: 10 additions & 5 deletions packages/opusfile/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/shairport-sync/package.mk
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
18 changes: 12 additions & 6 deletions packages/snapcast/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
6 changes: 3 additions & 3 deletions packages/upmpdcli/package.mk
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down