From 53bc2489170d22d52a88840374851a0ca13933cf Mon Sep 17 00:00:00 2001 From: duhow Date: Thu, 11 Jan 2024 15:38:36 +0100 Subject: [PATCH 1/6] WIP new gcc --- packages/gcc/package.mk | 2 +- packages/glibc/package.mk | 2 +- packages/toolchain/package.mk | 23 ++++++++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/gcc/package.mk b/packages/gcc/package.mk index 3b7fca5..fbe5d60 100644 --- a/packages/gcc/package.mk +++ b/packages/gcc/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="GCC" -PACKAGE_VERSION="7.4.0" +PACKAGE_VERSION="13.2.0" PACKAGE_SRC="https://ftp.gnu.org/gnu/gcc/gcc-${PACKAGE_VERSION}/gcc-${PACKAGE_VERSION}.tar.xz" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/glibc/package.mk b/packages/glibc/package.mk index 584ca60..f762d58 100644 --- a/packages/glibc/package.mk +++ b/packages/glibc/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="GNU C Library" -PACKAGE_VERSION="2.27" +PACKAGE_VERSION="2.38" [ "${BUILD_MODEL}" = "S12" ] && PACKAGE_VERSION="2.19" diff --git a/packages/toolchain/package.mk b/packages/toolchain/package.mk index 9f08825..8756979 100644 --- a/packages/toolchain/package.mk +++ b/packages/toolchain/package.mk @@ -1,25 +1,30 @@ PACKAGE_NAME="GNU Toolchain for the A-profile Architecture" -PACKAGE_VERSION="7.4.1-2019.02" -PACKAGE_SUBVERSION="7.4-2019.02" -BUILD_TARGET="arm-linux-gnueabihf" +PACKAGE_VERSION="13.2.rel1" # 2023.11 +#PACKAGE_SUBVERSION="7.4-2019.02" +BUILD_TARGET="arm-none-linux-gnueabihf" if [ "${BUILD_ARCH}" = "aarch64" ] || [ "${MODEL}" = "S12" ]; then BUILD_TARGET="aarch64-linux-gnu" -fi - -PACKAGE_SRC="https://releases.linaro.org/components/toolchain/binaries/${PACKAGE_SUBVERSION}/${BUILD_TARGET}/gcc-linaro-${PACKAGE_VERSION}-x86_64_${BUILD_TARGET}.tar.xz" - -if [ "${HOST_ARCH}" = "aarch64" ]; then PACKAGE_VERSION="10.2-2020.11" PACKAGE_SRC="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PACKAGE_VERSION}/binrel/gcc-arm-${PACKAGE_VERSION}-aarch64-arm-none-linux-gnueabihf.tar.xz" fi +#PACKAGE_SRC="https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/arm-linux-gnueabihf/gcc-linaro-7.4.1-2019.02-x86_64_arm-linux-gnueabihf.tar.xz" +#PACKAGE_SRC="https://releases.linaro.org/components/toolchain/binaries/${PACKAGE_SUBVERSION}/${BUILD_TARGET}/gcc-linaro-${PACKAGE_VERSION}-x86_64_${BUILD_TARGET}.tar.xz" +PACKAGE_SRC="https://developer.arm.com/-/media/Files/downloads/gnu/${PACKAGE_VERSION}/binrel/arm-gnu-toolchain-${PACKAGE_VERSION}-x86_64-${BUILD_TARGET}.tar.xz" +# ?rev=adb0c0238c934aeeaa12c09609c5e6fc&hash=68DA67DE12CBAD82A0FA4B75247E866155C93053 on_exit_build() { TOOLCHAIN_DIR=$(pwd) case ${BUILD_ARCH} in - "armv7") + "arm") + BUILD_TARGET="arm-none-linux-gnueabihf" + BUILD_LDFLAGS="-L${STAGING_DIR}/${INSTALL_PREFIX}/lib -Wl,--rpath-link=${STAGING_DIR}/${INSTALL_PREFIX}/lib -Wl,--rpath-link=${STAGING_DIR}/${INSTALL_PREFIX}/lib/pulseaudio -Wl,--rpath-link=${STAGING_DIR}/${INSTALL_PREFIX}/lib/private -Wl,--rpath-link=${TOOLCHAIN_DIR}/${BUILD_TARGET}/libc/lib -Wl,--rpath=${INSTALL_PREFIX}/${BUILD_TARGET}/lib -Wl,--rpath=${INSTALL_PREFIX}/lib -Wl,--dynamic-linker=${INSTALL_PREFIX}/${BUILD_TARGET}/lib/ld-linux-armhf.so.3" + ;; + "armv7") LIBPATH="lib" + BUILD_TARGET="arm-none-linux-gnueabihf" + # using GCC-10 [[ "${HOST_ARCH}" = "aarch64" ]] && BUILD_TARGET="arm-none-linux-gnueabihf" From 3a709aeb7901459daf644f8029a6fee04f0e1707 Mon Sep 17 00:00:00 2001 From: duhow Date: Thu, 11 Jan 2024 16:23:54 +0100 Subject: [PATCH 2/6] update glib --- packages/glib/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/glib/package.mk b/packages/glib/package.mk index b0a6a12..9ab43d9 100644 --- a/packages/glib/package.mk +++ b/packages/glib/package.mk @@ -1,12 +1,12 @@ PACKAGE_NAME="GLib" -PACKAGE_VERSION="2.68.2" +PACKAGE_VERSION="2.73.0" PACKAGE_SRC="https://github.com/GNOME/glib/archive/refs/tags/${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="libffi zlib" PACKAGE_USE_SEPARATE_BUILD_DIR="true" configure_package() { PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \ - meson --cross-file ${TOOLCHAIN_MESON} ${PACKAGE_SRC_DIR} \ + meson setup --cross-file ${TOOLCHAIN_MESON} ${PACKAGE_SRC_DIR} \ _build \ --prefix=${INSTALL_PREFIX} -Dlibmount=disabled -Dinstalled_tests=false } From 7ff470f2c1f1a4cc9b0f37922f4a9da02fc8f7e8 Mon Sep 17 00:00:00 2001 From: duhow Date: Thu, 11 Jan 2024 17:45:03 +0100 Subject: [PATCH 3/6] update ALSA packages --- packages/alsa-firmware/package.mk | 2 +- packages/alsa-lib/package.mk | 16 ++++++++++++++-- packages/alsa-plugins/package.mk | 2 +- packages/alsa-utils/package.mk | 9 +++++++-- packages/alsa/package.mk | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/packages/alsa-firmware/package.mk b/packages/alsa-firmware/package.mk index 6d67d6a..9fd3e2e 100644 --- a/packages/alsa-firmware/package.mk +++ b/packages/alsa-firmware/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Advanced Linux Sound Architecture - firmware" -PACKAGE_VERSION="1.2.4" +PACKAGE_VERSION="1.2.10" PACKAGE_SRC="https://www.alsa-project.org/files/pub/firmware/alsa-firmware-${PACKAGE_VERSION}.tar.bz2" configure_package() { diff --git a/packages/alsa-lib/package.mk b/packages/alsa-lib/package.mk index f3ae3a6..32d714a 100644 --- a/packages/alsa-lib/package.mk +++ b/packages/alsa-lib/package.mk @@ -1,15 +1,27 @@ PACKAGE_NAME="Advanced Linux Sound Architecture" -PACKAGE_VERSION="1.2.4" +PACKAGE_VERSION="1.2.10" PACKAGE_SRC="https://www.alsa-project.org/files/pub/lib/alsa-lib-${PACKAGE_VERSION}.tar.bz2" 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} + 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} \ + --with-sysroot=${STAGING_DIR} \ + --enable-shared=yes --enable-static=no --with-pic } make_package() { make -j${MAKE_JOBS} } +preinstall_package() { + echo_warning "dirty patching libatopology.la to fix build" + sed -i 's! =/usr/lib/libasound.la!!' ${PACKAGE_SRC_DIR}/src/topology/.libs/libatopology.lai +} + install_package() { make DESTDIR=${STAGING_DIR} install } diff --git a/packages/alsa-plugins/package.mk b/packages/alsa-plugins/package.mk index 108d4a6..34bb820 100644 --- a/packages/alsa-plugins/package.mk +++ b/packages/alsa-plugins/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="Advanced Linux Sound Architecture - Plugins" -PACKAGE_VERSION="1.2.2" +PACKAGE_VERSION="1.2.7.1" PACKAGE_SRC="https://www.alsa-project.org/files/pub/plugins/alsa-plugins-${PACKAGE_VERSION}.tar.bz2" PACKAGE_DEPENDS="alsa-lib" diff --git a/packages/alsa-utils/package.mk b/packages/alsa-utils/package.mk index 6ad527f..b0a0ba0 100644 --- a/packages/alsa-utils/package.mk +++ b/packages/alsa-utils/package.mk @@ -1,10 +1,15 @@ PACKAGE_NAME="Advanced Linux Sound Architecture - Utils" -PACKAGE_VERSION="1.2.4" +PACKAGE_VERSION="1.2.10" PACKAGE_SRC="https://www.alsa-project.org/files/pub/utils/alsa-utils-${PACKAGE_VERSION}.tar.bz2" PACKAGE_DEPENDS="ncurses" 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} + CC="${BUILD_CC} -fPIC" 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} \ + --with-sysroot=${STAGING_DIR} } make_package() { diff --git a/packages/alsa/package.mk b/packages/alsa/package.mk index c1cfbc0..25faa8d 100644 --- a/packages/alsa/package.mk +++ b/packages/alsa/package.mk @@ -1,3 +1,3 @@ PACKAGE_NAME="Advanced Linux Sound Architecture" -PACKAGE_VERSION="1.2.4" +PACKAGE_VERSION="1.2.10" PACKAGE_DEPENDS="glibc gcc alsa-lib alsa-utils alsa-plugins" From b040739ec5d369165e6750e1531385096d1463b2 Mon Sep 17 00:00:00 2001 From: duhow Date: Fri, 12 Jan 2024 14:17:39 +0100 Subject: [PATCH 4/6] fix more packages --- packages/espeak-ng/package.mk | 4 ++-- packages/gdbm/package.mk | 2 +- packages/mpd/package.mk | 2 +- packages/snapcast/package.mk | 4 ++-- packages/snapcast/patches/cstdint.patch | 10 ++++++++++ packages/upmpdcli/patches/remove-statx.patch | 11 +++++++++++ 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 packages/snapcast/patches/cstdint.patch create mode 100644 packages/upmpdcli/patches/remove-statx.patch diff --git a/packages/espeak-ng/package.mk b/packages/espeak-ng/package.mk index 4e048db..ab01cb1 100644 --- a/packages/espeak-ng/package.mk +++ b/packages/espeak-ng/package.mk @@ -1,6 +1,6 @@ PACKAGE_NAME="espeak-ng" -PACKAGE_VERSION="1.50" -PACKAGE_SRC="https://github.com/espeak-ng/espeak-ng/releases/download/${PACKAGE_VERSION}/espeak-ng-${PACKAGE_VERSION}.tgz" +PACKAGE_VERSION="1.51" +PACKAGE_SRC="https://github.com/espeak-ng/espeak-ng/archive/refs/tags/${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="base glibc" LANGUAGES_TO_INSTALL="es en ca" diff --git a/packages/gdbm/package.mk b/packages/gdbm/package.mk index b2a33ce..50fae9f 100644 --- a/packages/gdbm/package.mk +++ b/packages/gdbm/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="GNU dbm" -PACKAGE_VERSION="1.18.1" +PACKAGE_VERSION="1.23" PACKAGE_SRC="https://ftp.gnu.org/gnu/gdbm/gdbm-${PACKAGE_VERSION}.tar.gz" configure_package() { diff --git a/packages/mpd/package.mk b/packages/mpd/package.mk index 91b4f77..791634b 100644 --- a/packages/mpd/package.mk +++ b/packages/mpd/package.mk @@ -1,5 +1,5 @@ PACKAGE_NAME="MPD" -PACKAGE_VERSION="0.22.10" +PACKAGE_VERSION="0.23.15" PACKAGE_DEPENDS="curl alsa-lib flac opus libvorbis libogg faad2 libsndfile lame libid3tag soxr libao libshout chromaprint boost avahi libnfs yajl pcre sqlite3 sndio libupnp ffmpeg zziplib bzip2 libmpdclient" PACKAGE_SRC="https://github.com/MusicPlayerDaemon/MPD/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz" PACKAGE_USE_SEPARATE_BUILD_DIR="true" diff --git a/packages/snapcast/package.mk b/packages/snapcast/package.mk index 9a02db1..4a96b6c 100644 --- a/packages/snapcast/package.mk +++ b/packages/snapcast/package.mk @@ -1,8 +1,8 @@ PACKAGE_NAME="Snapcast" -PACKAGE_VERSION="0.25.0" +PACKAGE_VERSION="0.27.0" PACKAGE_SRC="https://github.com/badaix/snapcast/archive/v${PACKAGE_VERSION}.tar.gz" PACKAGE_DEPENDS="alsa libvorbis opus flac soxr avahi expat" -BOOST_VERSION="1.76.0" +BOOST_VERSION="1.84.0" BOOST="boost_${BOOST_VERSION//./_}" BUILD_TARGETS="server client" diff --git a/packages/snapcast/patches/cstdint.patch b/packages/snapcast/patches/cstdint.patch new file mode 100644 index 0000000..c5920df --- /dev/null +++ b/packages/snapcast/patches/cstdint.patch @@ -0,0 +1,10 @@ +--- a/common/sample_format.hpp 2024-01-12 14:11:35.041836115 +0100 ++++ b/common/sample_format.hpp 2024-01-12 14:11:50.401846387 +0100 +@@ -20,6 +20,7 @@ + #define SAMPLE_FORMAT_H + + #include ++#include + + + /** diff --git a/packages/upmpdcli/patches/remove-statx.patch b/packages/upmpdcli/patches/remove-statx.patch new file mode 100644 index 0000000..1111a41 --- /dev/null +++ b/packages/upmpdcli/patches/remove-statx.patch @@ -0,0 +1,11 @@ +--- a/src/pathut.cpp 2023-09-11 14:58:07.000000000 +0200 ++++ b/src/pathut.cpp 2024-01-11 18:29:45.347142294 +0100 +@@ -1103,7 +1103,7 @@ + #endif + } + +-#if defined(STATX_TYPE) ++#if !defined(STATX_TYPE) + + #include + From caa4cd1a5d242b05468aa459ac7f36bf82035815 Mon Sep 17 00:00:00 2001 From: duhow Date: Fri, 12 Jan 2024 14:48:53 +0100 Subject: [PATCH 5/6] cleanup new arch files --- packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.sh b/packages.sh index 03eda4f..8d6063d 100755 --- a/packages.sh +++ b/packages.sh @@ -481,7 +481,7 @@ staging_to_target() { # cleanup unused data cd ${STAGING_TO_TARGET_DIR} - for name in libexec/gcc lib/gcc lib/cmake include man arm-linux-gnueabihf; do + for name in libexec/gcc lib/gcc lib/cmake include man arm-linux-gnueabihf arm-none-linux-gnueabihf; do echo "rm usr/${name}" rm -rf usr/${name} done @@ -497,7 +497,7 @@ staging_to_target() { # delete unused compilers in target dir cd ${STAGING_TO_TARGET_DIR}/usr/bin - rm gcov* gcc* g++ cpp c++ arm-linux-gnueabihf-* + rm gcov* gcc* g++ cpp c++ arm-linux-gnueabihf-* arm-none-linux-gnueabihf-* lto-dump # remove .la and .pc files echo "cd ${STAGING_TO_TARGET_DIR}/${INSTALL_PREFIX}" From 9612753b321d963bfbf57e149469e6e657d0188f Mon Sep 17 00:00:00 2001 From: duhow Date: Sat, 13 Jan 2024 11:45:51 +0100 Subject: [PATCH 6/6] fix pycopy package --- packages/pycopy/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pycopy/package.mk b/packages/pycopy/package.mk index b7e89ef..69a2585 100644 --- a/packages/pycopy/package.mk +++ b/packages/pycopy/package.mk @@ -68,7 +68,7 @@ make_package() { install_package() { make DESTDIR=${STAGING_DIR} PREFIX=${STAGING_DIR}/usr install V=1 \ CROSS_COMPILE=${BUILD_TARGET}- CC="${BUILD_CC}" \ - CFLAGS_EXTRA="${BUILD_CFLAGS}" LDFLAGS_EXTRA="${BUILD_LDFLAGS}" + CFLAGS_EXTRA="${BUILD_CFLAGS} -Wno-error=enum-int-mismatch" LDFLAGS_EXTRA="${BUILD_LDFLAGS}" } postinstall_package() {