George Rawlinson pushed to branch main at Arch Linux / Packaging / Packages / furnace
Commits: 0339b9dd by George Rawlinson at 2023-09-09T01:10:09+00:00 upgpkg: 0.6pre11-1 * New upstream release. * Removed upstreamed fixes. - - - - - 2 changed files: - PKGBUILD - − ftbfs-fmt-10.patch Changes: ===================================== PKGBUILD ===================================== @@ -1,8 +1,8 @@ # Maintainer: George Rawlinson <[email protected]> pkgname=furnace -pkgver=0.6pre7 -pkgrel=3 +pkgver=0.6pre11 +pkgrel=1 pkgdesc='A multi-system chiptune tracker compatible with DefleMask modules' arch=('x86_64') url='https://github.com/tildearrow/furnace' @@ -19,6 +19,7 @@ depends=( 'fftw' 'zlib' 'libglvnd' + 'portaudio' ) makedepends=( 'git' @@ -26,15 +27,13 @@ makedepends=( 'jack' ) optdepends=('jack: JACK audio support') -_commit='68f517eb04d1d4198120dfd2b66fa9792ba2590a' +_commit='bbc524c07a90c9f8b50069caabef5262e2bdc438' source=( "$pkgname::git+$url#commit=$_commit" 'github.com-superctr-adpcm::git+https://github.com/superctr/adpcm' - 'ftbfs-fmt-10.patch' ) b2sums=('SKIP' - 'SKIP' - '7cc16658d7e4330b43fd97b6c2e695f42de02890c34ce4bb8ffcfa317a42ddf7882137533f2b3b68b969a2d3f55a588df73e2cbb2978bd014412d209a9a313c5') + 'SKIP') pkgver() { cd "$pkgname" @@ -47,18 +46,8 @@ prepare() { # prepare git submodules git submodule init extern/adpcm - git config submodule.extern/adpcm.url "$srcdir/github.com-superctr-adpcm" - git -c protocol.file.allow=always submodule update - - # FTBFS due to fmt-10 - # https://bugs.archlinux.org/task/79243 - # https://github.com/tildearrow/furnace/issues/1294 - patch -p1 -i "$srcdir/ftbfs-fmt-10.patch" - git cherry-pick --no-commit \ - 9d567d8cca6b4a40d61446d7d84839d78d036252 \ - 05d101e42e8c327bf83d51688a6c2d9527970e44 } build() { @@ -67,12 +56,13 @@ build() { -B build \ -D CMAKE_INSTALL_PREFIX=/usr \ -D BUILD_GUI=ON \ - -D SYSTEM_RTMIDI=ON \ + -D SYSTEM_FFTW=ON \ -D SYSTEM_FMT=ON \ - -D SYSTEM_ZLIB=ON \ -D SYSTEM_LIBSNDFILE=ON \ + -D SYSTEM_PORTAUDIO=ON \ + -D SYSTEM_RTMIDI=ON \ + -D SYSTEM_ZLIB=ON \ -D SYSTEM_SDL2=ON \ - -D SYSTEM_FFTW=ON \ -D WITH_JACK=ON cmake --build build ===================================== ftbfs-fmt-10.patch deleted ===================================== @@ -1,22 +0,0 @@ ---- a/src/engine/sample.cpp -+++ b/src/engine/sample.cpp -@@ -207,7 +207,7 @@ DivDataErrors DivSample::readSampleData(SafeReader& reader, short version) { - - // render data - if (depth!=DIV_SAMPLE_DEPTH_8BIT && depth!=DIV_SAMPLE_DEPTH_16BIT) { -- logW("sample depth is wrong! (%d)",depth); -+ logW("sample depth is wrong! (%d)",(int)depth); - depth=DIV_SAMPLE_DEPTH_16BIT; - } - samples=(double)samples/samplePitchesSD[pitch]; ---- a/src/engine/zsmOps.cpp -+++ b/src/engine/zsmOps.cpp -@@ -52,7 +52,7 @@ SafeWriter* DivEngine::saveZSM(unsigned int zsmrate, bool loop) { - break; - default: - IGNORED++; -- logD("Ignoring chip %d systemID %d",i,song.system[i]); -+ logD("Ignoring chip %d systemID %d",i,(int)song.system[i]); - break; - } - } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/furnace/-/commit/0339b9dda7ebdb8a26fe593840047a2d8f629c4e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/furnace/-/commit/0339b9dda7ebdb8a26fe593840047a2d8f629c4e You're receiving this email because of your account on gitlab.archlinux.org.
