diff --git a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk index 63a346ae3a..5d0c561155 100644 --- a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk @@ -9,4 +9,6 @@ PKG_SITE="https://github.com/badaix/aixlog" PKG_URL="https://github.com/badaix/aixlog/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Header-only C++ logging library." -PKG_TOOLCHAIN="manual" +PKG_BUILD_FLAGS="-sysroot" + +PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLE=OFF" diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index 1c888a4346..63b2015e6c 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -10,4 +10,11 @@ PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-$PKG_VERSION.zip" PKG_SOURCE_DIR="asio-asio-$PKG_VERSION" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Asio C++ Library." -PKG_TOOLCHAIN="manual" +PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot" + +PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl" + +post_unpack() { + mv $PKG_BUILD/asio/* $PKG_BUILD +} diff --git a/packages/addons/addon-depends/snapcast-depends/popl/package.mk b/packages/addons/addon-depends/snapcast-depends/popl/package.mk index f8c9700bb7..963fbe82c7 100644 --- a/packages/addons/addon-depends/snapcast-depends/popl/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/popl/package.mk @@ -10,3 +10,9 @@ PKG_URL="https://github.com/badaix/popl/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Header-only C++ program options parser library." PKG_TOOLCHAIN="manual" +PKG_BUILD_FLAGS="-sysroot" + +makeinstall_target() { + mkdir -p $INSTALL/usr/include + cp -p $PKG_BUILD/include/popl.hpp $INSTALL/usr/include +} diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk index d23a6d9786..3684198def 100644 --- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk @@ -10,6 +10,7 @@ PKG_URL="https://github.com/mikebrady/shairport-sync/archive/$PKG_VERSION.tar.gz PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon openssl popt pulseaudio soxr" PKG_LONGDESC="AirPlay audio player." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--with-alsa \ --with-avahi \ @@ -19,8 +20,5 @@ PKG_CONFIGURE_OPTS_TARGET="--with-alsa \ --with-pipe \ --with-soxr \ --with-ssl=openssl \ - --with-stdout" - -makeinstall_target() { - : -} + --with-stdout \ + --without-configfiles" diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk index 486d8a51b5..42fcdd5d11 100644 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk @@ -10,16 +10,18 @@ PKG_URL="https://github.com/badaix/snapcast/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl" PKG_LONGDESC="Synchronous multi-room audio player." PKG_TOOLCHAIN="make" +PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { cd .. rm -rf .$TARGET_NAME CXXFLAGS="$CXXFLAGS -pthread \ - -I$(get_build_dir aixlog)/include \ - -I$(get_build_dir asio)/asio/include \ - -I$(get_build_dir popl)/include" + -I$(get_install_dir aixlog)/usr/include \ + -I$(get_install_dir asio)/usr/include \ + -I$(get_install_dir popl)/usr/include" } makeinstall_target() { - : + mkdir -p $INSTALL/usr/bin + cp -p server/snapserver client/snapclient $INSTALL/usr/bin } diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index c9a4de2027..d959f27ae3 100644 --- a/packages/addons/service/snapclient/package.mk +++ b/packages/addons/service/snapclient/package.mk @@ -19,7 +19,7 @@ PKG_MAINTAINER="Anton Voyl (awiouy)" addon() { mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" - cp "$(get_build_dir snapcast)/client/snapclient" \ + cp "$(get_install_dir snapcast)/usr/bin/snapclient" \ "$ADDON_BUILD/$PKG_ADDON_ID/bin" mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/lib" diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk index 9a3510a1fe..ee6dda1845 100644 --- a/packages/addons/service/snapserver/package.mk +++ b/packages/addons/service/snapserver/package.mk @@ -20,7 +20,7 @@ PKG_MAINTAINER="Anton Voyl (awiouy)" addon() { mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" - cp "$(get_build_dir shairport-sync)/.$TARGET_NAME/shairport-sync" \ - "$(get_build_dir snapcast)/server/snapserver" \ + cp "$(get_install_dir shairport-sync)/usr/bin/shairport-sync" \ + "$(get_install_dir snapcast)/usr/bin/snapserver" \ "$ADDON_BUILD/$PKG_ADDON_ID/bin" }