From e3f5587257def8112c1c8c45caf30dca3d971c13 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:28 +0000 Subject: [PATCH 01/19] fluidsynth: update to 2.1.0 --- common/shlibs | 2 +- srcpkgs/fluidsynth/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 23d0a6a3c8e..0f1fd14dbf1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1007,7 +1007,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1 libfftw3f_threads.so.3 libfftw-3.3_1 libfftw3f.so.3 libfftw-3.3_1 libfftw3f_omp.so.3 libfftw-3.3.5_1 -libfluidsynth.so.1 libfluidsynth-1.1.5_1 +libfluidsynth.so.2 libfluidsynth-2.0.6_1 liblo.so.7 liblo-0.26_1 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1 librubberband.so.2 librubberband-1.6.0_1 diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template index 19046b824af..c0a3e06c5a1 100644 --- a/srcpkgs/fluidsynth/template +++ b/srcpkgs/fluidsynth/template @@ -1,18 +1,18 @@ # Template file for 'fluidsynth' pkgname=fluidsynth -version=1.1.11 -revision=2 +version=2.1.0 +revision=1 build_style=cmake configure_args="-DLIB_SUFFIX= -DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2" hostmakedepends="pkg-config" makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel" short_desc="Real-time software synthesizer based on the SoundFont 2 specifications" -maintainer="Orphaned " +maintainer="fosslinux " license="LGPL-2.1-or-later" homepage="http://www.fluidsynth.org/" distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz" -checksum=da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8 +checksum=526addc6d8445035840d3af7282d3ba89567df209d28e183da04a1a877da2da3 libfluidsynth_package() { short_desc+=" - runtime library" From 43e45a37b953eb75841d79bf551a7ac583418042 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:28 +0000 Subject: [PATCH 02/19] gzdoom: rebuild against fluidsynth-2.1.0 --- srcpkgs/gzdoom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index 83935bacf7c..08702e64ec6 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -1,7 +1,7 @@ # Template file for 'gzdoom' pkgname=gzdoom version=4.2.4 -revision=1 +revision=2 _tagdate=2019-07-09 wrksrc="${pkgname}-g${version}" build_style=cmake From 2b25f509c3226fc7f470233853711256cf4e06bd Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:29 +0000 Subject: [PATCH 03/19] audacious-plugins: rebuild against fluidsynth-2.1.0 --- srcpkgs/audacious-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index a50d65e7819..dc26ad1e39a 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,7 +1,7 @@ # Template file for 'audacious-plugins' pkgname=audacious-plugins version=3.10.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="$(vopt_enable gtk) $(vopt_enable qt)" hostmakedepends="pkg-config" From 82eee43bac882eb05a94de8bd6cd1bc736c1d4df Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 20 Jan 2020 01:50:32 +0000 Subject: [PATCH 04/19] SDL_mixer: zlib license --- srcpkgs/SDL_mixer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template index 14c9815b4f6..ba059a9fd63 100644 --- a/srcpkgs/SDL_mixer/template +++ b/srcpkgs/SDL_mixer/template @@ -10,7 +10,7 @@ makedepends="SDL-devel libvorbis-devel libmikmod-devel libflac-devel smpeg-devel depends="libvorbis libmikmod smpeg libflac" short_desc="Multi-channel audio mixer library" maintainer="Orphaned " -license="BSD" +license="Zlib" homepage="http://www.libsdl.org/projects/SDL_mixer/" distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz" checksum=1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a From 2a697458ea114d4cd454a02c4c0d47d5cd0a1984 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:29 +0000 Subject: [PATCH 05/19] SDL_mixer: rebuild against fluidsynth-2.1.0 --- srcpkgs/SDL2_mixer/template | 2 +- srcpkgs/SDL_mixer/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template index 06a28928419..a5c0e512ba4 100644 --- a/srcpkgs/SDL2_mixer/template +++ b/srcpkgs/SDL2_mixer/template @@ -1,7 +1,7 @@ # Template file for 'SDL2_mixer' pkgname=SDL2_mixer version=2.0.4 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template index ba059a9fd63..db9cff5fdbd 100644 --- a/srcpkgs/SDL_mixer/template +++ b/srcpkgs/SDL_mixer/template @@ -1,7 +1,7 @@ # Template file for 'SDL_mixer' pkgname=SDL_mixer version=1.2.12 -revision=13 +revision=14 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" From 504bac39728ba83559d7e2342a893b7e663805f5 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 06/19] scummvm: rebuild and patch against fluidsynth-2.1.0 --- srcpkgs/scummvm/patches/fluidsynth-2.1.patch | 29 ++++++++++++++++++++ srcpkgs/scummvm/template | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.1.patch diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.1.patch b/srcpkgs/scummvm/patches/fluidsynth-2.1.patch new file mode 100644 index 00000000000..a319352f38d --- /dev/null +++ b/srcpkgs/scummvm/patches/fluidsynth-2.1.patch @@ -0,0 +1,29 @@ +--- audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000 ++++ audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000 +@@ -20,10 +20,16 @@ + * + */ + +-#include "common/scummsys.h" ++#include "config.h" + + #ifdef USE_FLUIDSYNTH + ++// Fluidsynth v2.1+ uses printf in one of it's headers, ++// include/fluidsynth/log.h around line 82 so need to include this ++// prior scummsys.h inclusion and thus forbidden.h ++#include ++ ++#include "common/scummsys.h" + #include "common/config-manager.h" + #include "common/error.h" + #include "common/system.h" +@@ -35,8 +41,6 @@ + #include "backends/platform/ios7/ios7_common.h" + #endif + +-#include +- + class MidiDriver_FluidSynth : public MidiDriver_Emulated { + private: + MidiChannel_MPU401 _midiChannels[16]; diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index 70e5a912720..b02bbe0cfd4 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -1,7 +1,7 @@ # Template file for 'scummvm' pkgname=scummvm version=2.1.0 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --enable-release-mode --with-sdl-prefix=${XBPS_CROSS_BASE}/usr" From de47c11010d32f0b4a3bf6d08ccde4cae550afcb Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 07/19] residualvm: rebuild and patch against fluidsynth-2.1.0 --- .../residualvm/patches/fluidsynth-2.1.patch | 29 +++++++++++++++++++ srcpkgs/residualvm/template | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/residualvm/patches/fluidsynth-2.1.patch diff --git a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch new file mode 100644 index 00000000000..a319352f38d --- /dev/null +++ b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch @@ -0,0 +1,29 @@ +--- audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000 ++++ audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000 +@@ -20,10 +20,16 @@ + * + */ + +-#include "common/scummsys.h" ++#include "config.h" + + #ifdef USE_FLUIDSYNTH + ++// Fluidsynth v2.1+ uses printf in one of it's headers, ++// include/fluidsynth/log.h around line 82 so need to include this ++// prior scummsys.h inclusion and thus forbidden.h ++#include ++ ++#include "common/scummsys.h" + #include "common/config-manager.h" + #include "common/error.h" + #include "common/system.h" +@@ -35,8 +41,6 @@ + #include "backends/platform/ios7/ios7_common.h" + #endif + +-#include +- + class MidiDriver_FluidSynth : public MidiDriver_Emulated { + private: + MidiChannel_MPU401 _midiChannels[16]; diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template index 556a3d48750..583d2a489ec 100644 --- a/srcpkgs/residualvm/template +++ b/srcpkgs/residualvm/template @@ -1,7 +1,7 @@ # Template file for 'residualvm' pkgname=residualvm version=0.3.1 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr --enable-all-engines --enable-release --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)" From 4481014d572a1f81e05367f23af1d09836015088 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 08/19] qsynth: rebuild against fluidsynth-2.1.0 --- srcpkgs/qsynth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template index cf870fa6696..0663ca8f219 100644 --- a/srcpkgs/qsynth/template +++ b/srcpkgs/qsynth/template @@ -1,7 +1,7 @@ # Template file for 'qsynth' pkgname=qsynth version=0.6.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake hostmakedepends="pkg-config qt5-tools" From 00fb154b0b36650debbe9da168867ef4d2111049 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 09/19] prboom-plus: rebuild against fluidsynth-2.1.0 --- srcpkgs/prboom-plus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template index 07dd2c5ebe6..8b8c71c9199 100644 --- a/srcpkgs/prboom-plus/template +++ b/srcpkgs/prboom-plus/template @@ -1,7 +1,7 @@ # Template file for 'prboom-plus' pkgname=prboom-plus version=2.5.1.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-cpu-opt --disable-dogs" hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel From 19b93bf7eaa7ee1bd9df222dbd0aa71e67a12c25 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 10/19] lmms: rebuild against fluidsynth-2.1.0 --- srcpkgs/lmms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index f11605aff13..9a92c66fe18 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,7 +1,7 @@ # Template file for 'lmms' pkgname=lmms version=1.2.1 -revision=1 +revision=2 archs="~armv6*" build_style=cmake configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF" From 7eaea228f6aa816c0af4f15d16913b86d2bc6d3c Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 11/19] gst-plugins-bad1: rebuild against fluidsynth-2.1.0 --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index fc1142b5537..794eb9c223c 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 version=1.16.2 -revision=2 +revision=3 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson From 9ae22df9eaaf5eadd3ad017916985242f84479b0 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 12/19] csound: rebuild against fluidsynth-2.1.0 --- srcpkgs/csound/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template index 558c9a1240a..e174adb0b9a 100644 --- a/srcpkgs/csound/template +++ b/srcpkgs/csound/template @@ -1,7 +1,7 @@ # Template file for 'csound' pkgname=csound version=6.13.0 -revision=1 +revision=2 build_style=cmake configure_args=" -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1 From b6075950e221bcae4f9ad09c781dc861f900c1c2 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 13/19] calf: rebuild against fluidsynth-2.1.0 --- srcpkgs/calf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template index 18398fd936d..8826ba7711d 100644 --- a/srcpkgs/calf/template +++ b/srcpkgs/calf/template @@ -1,7 +1,7 @@ # Template file for 'calf' pkgname=calf version=0.90.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-experimental" hostmakedepends="automake libtool pkg-config" From 7ec16ee41860f9230b98bbdf54eff59d1d9546d3 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 14/19] SLADE: rebuild against fluidsynth-2.1.0 --- srcpkgs/SLADE/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index 07f6efa7a8c..245462391a5 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -1,7 +1,7 @@ # Template file for 'SLADE' pkgname=SLADE version=3.1.8 -revision=1 +revision=2 build_style=cmake configure_args="-DCL_WX_CONFIG=wx-config-gtk3" hostmakedepends="pkg-config p7zip" From b5d2755b90cf6ce2f8b15ee8d08a559acfb139fd Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:49 +0000 Subject: [PATCH 15/19] Carla: add patch for GCC 9 --- srcpkgs/Carla/patches/remove-memory-include.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/Carla/patches/remove-memory-include.patch diff --git a/srcpkgs/Carla/patches/remove-memory-include.patch b/srcpkgs/Carla/patches/remove-memory-include.patch new file mode 100644 index 00000000000..e2a303d922b --- /dev/null +++ b/srcpkgs/Carla/patches/remove-memory-include.patch @@ -0,0 +1,10 @@ +--- source/bridges-ui/Makefile 2019-03-22 04:32:17.000000000 +1100 ++++ source/bridges-ui/Makefile 2019-12-30 14:09:50.801149275 +1100 +@@ -223,6 +223,7 @@ + -@mkdir -p $(OBJDIR) + @echo "Generating CarlaBridgeToolkitQt5.moc" + @$(MOC_QT5) $< -DMOC_PARSING -o $@ ++ @sed -i "/#include /d" $@ + + $(OBJDIR)/resources.qt5.cpp: ../../resources/resources-theme.qrc + -@mkdir -p $(OBJDIR) From 9b0e75cd51a39e53a845111d68df0ccc6a904257 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 20 Jan 2020 01:49:57 +0000 Subject: [PATCH 16/19] Carla: lint; pycompile_module is autodetected --- srcpkgs/Carla/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index d4d36a4923d..0eaf7920424 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -6,7 +6,6 @@ archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile make_build_args="DEFAULT_QT=5" make_install_args="DEFAULT_QT=5" -pycompile_module="carla_utils.py carla_backend.py" pycompile_dirs="usr/share/carla" hostmakedepends="pkg-config python3" makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel From bcca70937df8f314a7bb69ed121699c784a86825 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 17/19] Carla: rebuild against fluidsynth-2.1.0 --- srcpkgs/Carla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 0eaf7920424..a8da48d804d 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla version=2.0.0 -revision=2 +revision=3 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile make_build_args="DEFAULT_QT=5" From 7a3876602bffed5a14fe7453324fb39171a17f16 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:07:02 +0000 Subject: [PATCH 18/19] tuxguitar: rebuild againast fluidsynth-2.1.0 --- srcpkgs/tuxguitar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 428ca30abca..d2c3f261930 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -1,7 +1,7 @@ # Template file for 'tuxguitar' pkgname=tuxguitar version=1.5.3 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" From 8e2eda4bdccfc4828126d771e1fea61adfcf6a61 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 21 Jan 2020 21:47:03 +0000 Subject: [PATCH 19/19] audacious-plugins: add missing gettext dependency for cross --- srcpkgs/audacious-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index dc26ad1e39a..99e54414b38 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -4,7 +4,7 @@ version=3.10.1 revision=5 build_style=gnu-configure configure_args="$(vopt_enable gtk) $(vopt_enable qt)" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gettext" makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel lame-devel libvorbis-devel libflac-devel mpg123-devel faad2-devel ffmpeg-devel libmodplug-devel fluidsynth-devel libcdio-paranoia-devel wavpack-devel libnotify-devel