diff options
| author | Bart Ribbers <bribbers@disroot.org> | 2019-11-22 18:19:08 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-11-22 18:58:19 +0100 |
| commit | 0cae9e5ab671901a4478e27fe11c5e3df7561759 (patch) | |
| tree | c188e426ea468b801d90d075d64432f3d349adfd | |
| parent | 02eb90c61db3e866021a050d9cf19d945c66c490 (diff) | |
| download | aports-0cae9e5ab671901a4478e27fe11c5e3df7561759.tar.bz2 aports-0cae9e5ab671901a4478e27fe11c5e3df7561759.tar.xz | |
community/snapcast: upgrade to 0.17.0, and switch to CMake
| -rw-r--r-- | community/snapcast/APKBUILD | 34 | ||||
| -rw-r--r-- | community/snapcast/build-fix.patch | 13 | ||||
| -rw-r--r-- | community/snapcast/respect-optimization-level.patch | 19 |
3 files changed, 36 insertions, 30 deletions
diff --git a/community/snapcast/APKBUILD b/community/snapcast/APKBUILD index 7f9d93c697..74d253ae63 100644 --- a/community/snapcast/APKBUILD +++ b/community/snapcast/APKBUILD @@ -1,38 +1,50 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=snapcast -pkgver=0.16.0 +pkgver=0.17.0 pkgrel=0 pkgdesc="Synchronous multi-room audio player" url="https://github.com/badaix/snapcast" -arch="all" +arch="noarch" license="GPL-3.0-or-later" depends="$pkgname-client $pkgname-server" -makedepends="asio-dev bash avahi-dev flac-dev libvorbis-dev alsa-lib-dev aixlog popl" +makedepends="cmake asio-dev avahi-dev flac-dev libvorbis-dev alsa-lib-dev opus-dev" pkgusers="$pkgname" pkggroups="$pkgname audio" install="$pkgname-client.pre-install $pkgname-server.pre-install" -subpackages="$pkgname-doc $pkgname-client $pkgname-server" +subpackages="$pkgname-doc $pkgname-client::all $pkgname-server::all" source="$pkgname-$pkgver.tar.gz::https://github.com/badaix/snapcast/archive/v$pkgver.tar.gz - respect-optimization-level.patch $pkgname-client.initd $pkgname-client.confd $pkgname-server.initd $pkgname-server.confd + + build-fix.patch " +options="!check" # No testsuite build() { + cmake \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_WITH_FLAC=ON \ + -DBUILD_WITH_VORBIS=ON \ + -DBUILD_WITH_OPUS=ON \ + -DBUILD_WITH_AVAHI=ON make } check() { - client/snapclient --help > /dev/null - server/snapserver --help > /dev/null + CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - make DESTDIR="$pkgdir" installclient installserver + DESTDIR="$pkgdir" make install + + mkdir -p "$pkgdir"/usr/share/man/man1 + install client/snapclient.1 "$pkgdir"/usr/share/man/man1/snapclient.1.gz + install server/snapserver.1 "$pkgdir"/usr/share/man/man1/snapserver.1.gz } client() { @@ -63,9 +75,9 @@ server() { "$subpkgdir"/etc/conf.d/"$subpkgname" } -sha512sums="fbffb276ae32a576b225464f586e66a5462e7b9649df2435db30fe8cede8eda971250680950d27ea3f5d243783ac56dc7e3a77858bcc66c0912d3a8092355592 snapcast-0.16.0.tar.gz -9a4d35ffc4146f29ab0eef0fbb4444f50f4bb3fe3b8f30aaef90f8300819523b111f3ab672229dc72854b2d8cefe361caf9c29883983758e5e3f96913f134bc4 respect-optimization-level.patch +sha512sums="5216f08900b0eda5fd6d722c988d4959fb08eb843ac5c282ca55598ad68c17b33d0ecff708a5c03b7bae9aaa48c56679d59a471154eabab6f710248281c9aafa snapcast-0.17.0.tar.gz 833ce6a5fecb023f32df340df98b5cfbecc765735d7133228dd703a6a0c7f2b67ac95aa787ac7119a2eb87e768e5c4deb12738d0b0354db3510d9047f9e9b24f snapcast-client.initd fa353d7974d3a8b3b22ff009b762c7c4ee318f9f83e22762a9ebf550484b9fc3cc4dffd389b6d756630dc035cb86d5c5643541957785f8bbf71fe4915691c337 snapcast-client.confd ff610e08274d317e0df9590de47f3425d23a38528f82b9998de04d73cf2167ddb6aad237ddce9864b6c36fff959afb6a892c554ce40fd3e3d62c1308b022b2bb snapcast-server.initd -48d494143d044a413b414b32cd8be51d4242234b6d7cb03102914a42b1ea6b1913c2c31b223c23c6be316918e731875149a2505daa03165659d0a1be3ca7e75c snapcast-server.confd" +48d494143d044a413b414b32cd8be51d4242234b6d7cb03102914a42b1ea6b1913c2c31b223c23c6be316918e731875149a2505daa03165659d0a1be3ca7e75c snapcast-server.confd +c26c8bfb3f807d835d82414a9a1987a789c936be443ab570490b7f34961f6a59d9389c54b8661c0486fa9f88a2f3a8694c96068b3c2575dc858e86ab6b274d5c build-fix.patch" diff --git a/community/snapcast/build-fix.patch b/community/snapcast/build-fix.patch new file mode 100644 index 0000000000..a7873e5b10 --- /dev/null +++ b/community/snapcast/build-fix.patch @@ -0,0 +1,13 @@ +diff --git a/server/encoder/opus_encoder.hpp b/server/encoder/opus_encoder.hpp +index dcb1c4e..18ad906 100644 +--- a/server/encoder/opus_encoder.hpp ++++ b/server/encoder/opus_encoder.hpp +@@ -40,7 +40,7 @@ protected: + void encode(const SampleFormat& format, const char* data, size_t size); + void initEncoder() override; + ::OpusEncoder* enc_; +- std::vector<u_char> encoded_; ++ std::vector<unsigned char> encoded_; + std::unique_ptr<msg::PcmChunk> remainder_; + size_t remainder_max_size_; + }; diff --git a/community/snapcast/respect-optimization-level.patch b/community/snapcast/respect-optimization-level.patch deleted file mode 100644 index 6289835274..0000000000 --- a/community/snapcast/respect-optimization-level.patch +++ /dev/null @@ -1,19 +0,0 @@ -The value of the DEBUG variable is append to CXXFLAGS, thereby -overwriting the optimization level set in the CXXFLAGS environment -variable (-Os on alpine by default). Since we prefer to use our -optimization level DEBUG needs to be unset. - -diff --git a/client/Makefile b/client/Makefile -index f977eea..26ffd67 100644 ---- a/client/Makefile -+++ b/client/Makefile -@@ -31,7 +31,7 @@ else - endif - - # Simplify building debuggable executables 'make DEBUG=-g STRIP=echo' --DEBUG=-O3 -+DEBUG= - - - CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wextra -Wpedantic -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DVERSION=\"$(VERSION)\" -I. -I.. -I../common - |