From 7d9e9b4ba8348f70814e417108099a50e55382d5 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:28 +0000 Subject: [PATCH 01/18] 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 8b1c87a98aa..e93cb284123 100644 --- a/common/shlibs +++ b/common/shlibs @@ -974,7 +974,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 cac87c67125e282c0dcd06d6f6aefb1c1af0d25d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:28 +0000 Subject: [PATCH 02/18] 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 ada925bf75f64c9805f8da6dea79bc13e0f90266 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:29 +0000 Subject: [PATCH 03/18] 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 d5faa8a9e5b06c58a70740f6808c0966292494fb Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:29 +0000 Subject: [PATCH 04/18] SDL_mixer: rebuild against fluidsynth-2.1.0 --- 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..db87ae1829d 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 d5c6485cb3388401d2ced350d9af2483978d785f Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:29 +0000 Subject: [PATCH 05/18] SDL2_mixer: rebuild against fluidsynth-2.1.0 --- srcpkgs/SDL2_mixer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/SDL2_mixer/template b/srcpkgs/SDL2_mixer/template index 80d654951b9..324db64a73e 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=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="SDL2-devel libvorbis-devel libmikmod-devel libflac-devel From 290cad47bb4a1a2a867a5ba357aece47990a7f87 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 1 Jan 2020 22:27:23 +0000 Subject: [PATCH 06/18] scummvm: fix SDL dependencies and includes --- srcpkgs/scummvm/patches/sdl-header.patch | 36 ++++++++++++++++++++++++ srcpkgs/scummvm/template | 6 ++-- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/scummvm/patches/sdl-header.patch diff --git a/srcpkgs/scummvm/patches/sdl-header.patch b/srcpkgs/scummvm/patches/sdl-header.patch new file mode 100644 index 00000000000..588862d3c76 --- /dev/null +++ b/srcpkgs/scummvm/patches/sdl-header.patch @@ -0,0 +1,36 @@ +diff -u backends/platform/sdl/sdl-sys.h backends/platform/sdl/sdl-sys.h +--- backends/platform/sdl/sdl-sys.h 2019-10-04 21:41:29.000000000 +0000 ++++ backends/platform/sdl/sdl-sys.h 2020-01-01 22:13:24.034946909 +0000 +@@ -141,13 +141,13 @@ + #if defined(__SYMBIAN32__) + #include + #else +-#include ++#include + #endif + + // Ignore warnings from system headers pulled by SDL + #pragma warning(push) + #pragma warning(disable:4121) // alignment of a member was sensitive to packing +-#include ++#include + #pragma warning(pop) + + // Restore the forbidden exceptions from the hack above +diff -u backends/platform/sdl/sdl.cpp backends/platform/sdl/sdl.cpp +--- backends/platform/sdl/sdl.cpp 2019-10-04 21:41:29.000000000 +0000 ++++ backends/platform/sdl/sdl.cpp 2020-01-01 22:13:35.726989837 +0000 +@@ -58,11 +58,11 @@ + #endif + + #ifdef USE_SDL_NET +-#include ++#include + #endif + + #if SDL_VERSION_ATLEAST(2, 0, 0) +-#include ++#include + #endif + + OSystem_SDL::OSystem_SDL() diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index 70e5a912720..83697e606c7 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -5,11 +5,11 @@ revision=1 build_style=configure configure_args="--prefix=/usr --enable-release-mode --with-sdl-prefix=${XBPS_CROSS_BASE}/usr" -hostmakedepends="pkg-config nasm" +hostmakedepends="pkg-config nasm git" makedepends="zlib-devel libpng-devel SDL2-devel libmad-devel faad2-devel fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel - freetype-devel libjpeg-turbo-devel libcurl-devel SDL2_net-devel - libmpeg2-devel liba52-devel" + freetype-devel libjpeg-turbo-devel libcurl-devel SDL-devel SDL_net-devel + SDL2_net-devel libmpeg2-devel liba52-devel" short_desc="Free implementation of LucasArts' SCUMM interpreter" maintainer="John " license="GPL-2.0-or-later" From dcee92b04139cb24f8b3627ed9685db95b7afdf1 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 07/18] scummvm: rebuild against fluidsynth-2.1.0 --- srcpkgs/scummvm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index 83697e606c7..b01f899a2e9 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 09a084aa5f5b9b267dca435e66ee7f9fda265b57 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 08/18] residualvm: rebuild against fluidsynth-2.1.0 --- srcpkgs/residualvm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 42c3fcf7c32829c3d85d234b88e064e027a02d78 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 09/18] 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 df64a33f73008b26e614d20cc7b91f9dec659b06 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 10/18] 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 d76810fa8991da08b24ec9b8673fb2d2869e7f1e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:30 +0000 Subject: [PATCH 11/18] 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 ab71f5d4c89e675d417ebab167a32109348a30e2 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 12/18] 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 6ae3de3548c..6df09fb2a9a 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 12ee42fcbcc2b0d2e541b604cb32c7941a4f2bc0 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 13/18] 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 cbf4d4cd441da891061a547fffa3bf15ad0a04cf Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 14/18] 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 8e7bdcd50639ec593c09478434ba0503cf1660d1 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 15/18] 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 e25549ffe6922687994e8a1d57ad1445df3404fb Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:49 +0000 Subject: [PATCH 16/18] 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 7dcd2d263a7ff9d5bf572bd6e6fc47186c102257 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:06:31 +0000 Subject: [PATCH 17/18] 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 d4d36a4923d..d651d804a85 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 c2c041022254cf831506ada0e7097e5afa0e68a4 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 30 Dec 2019 05:07:02 +0000 Subject: [PATCH 18/18] 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"