Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] fluidsynth: update to 2.0.6
@ 2019-09-12  8:37 voidlinux-github
  2019-09-12 11:09 ` voidlinux-github
                   ` (38 more replies)
  0 siblings, 39 replies; 40+ messages in thread
From: voidlinux-github @ 2019-09-12  8:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 5739 bytes --]

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages fluidsynth-2.0.6
https://github.com/void-linux/void-packages/pull/14416

[WIP] fluidsynth: update to 2.0.6
updated to 2.0.6. bumped shlibs.

Appropriate packages have been revbumped.

There is one issue: tuxguitar fails to build (tuxguitar-fluidsynth specifically):

```
compile-native:
     [exec] gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe    -I/usr/lib/jvm/openjdk/include -I/usr/lib/jvm/openjdk/include/linux -m64 -fPIC -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringProperty':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:259:4: warning: implicit declaration of function 'fluid_settings_getstr'; did you mean 'fluid_settings_setstr'? [-Wimplicit-function-declaration]
     [exec]   259 |    fluid_settings_getstr(handle->settings,(char *)jkey, &value );
     [exec]       |    ^~~~~~~~~~~~~~~~~~~~~
     [exec]       |    fluid_settings_setstr
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getDoublePropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:277:19: error: too few arguments to function 'fluid_settings_getnum_default'
     [exec]   277 |    double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
     [exec]       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:135:5: note: declared here
     [exec]   135 | int fluid_settings_getnum_default(fluid_settings_t *settings, const char *name, double *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getIntegerPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:294:16: error: too few arguments to function 'fluid_settings_getint_default'
     [exec]   294 |    int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
     [exec]       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:148:5: note: declared here
     [exec]   148 | int fluid_settings_getint_default(fluid_settings_t *settings, const char *name, int *val);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getStringPropertyDefault':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:311:18: error: too few arguments to function 'fluid_settings_getstr_default'
     [exec]   311 |    char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
     [exec]       |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:123:5: note: declared here
     [exec]   123 | int fluid_settings_getstr_default(fluid_settings_t *settings, const char *name, char **def);
     [exec]       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c: In function 'Java_org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth_getPropertyOptions':
     [exec] org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:376:71: warning: passing argument 4 of 'fluid_settings_foreach_option' from incompatible pointer type [-Wincompatible-pointer-types]
     [exec]   376 |   fluid_settings_foreach_option(handle->settings, (char *)jkey, data, fluid_settings_foreach_option_callback );
     [exec]       |                                                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     [exec]       |                                                                       |
     [exec]       |                                                                       void (*)(void *, char *, char *)
     [exec] In file included from /usr/include/fluidsynth.h:96,
     [exec]                  from org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c:4:
     [exec] /usr/include/fluidsynth/settings.h:165:68: note: expected 'fluid_settings_foreach_option_t' {aka 'void (*)(void *, const char *, const char *)'} but argument is of type 'void (*)(void *, char *, char *)'
     [exec]   165 |                                    fluid_settings_foreach_option_t func);
     [exec]       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
     [exec] make: *** [GNUmakefile:14: org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o] Error 1
```

Not sure how to proceed.

A patch file from https://github.com/void-linux/void-packages/pull/14416.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fluidsynth-2.0.6-14416.patch --]
[-- Type: text/x-diff, Size: 9864 bytes --]

From 65b5fc36cf1e445a8a55e2da9f79ed598ca33f6f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 12 Sep 2019 18:32:05 +1000
Subject: [PATCH] fluidsynth: update to 2.0.6

---
 common/shlibs                      |  2 +-
 etc/defaults.conf                  |  2 +-
 etc/repos-remote-x86_64.conf       |  4 ++--
 etc/repos-remote.conf              | 12 ++++++------
 srcpkgs/Carla/template             |  2 +-
 srcpkgs/SLADE/template             |  2 +-
 srcpkgs/audacious-plugins/template |  2 +-
 srcpkgs/calf/template              |  2 +-
 srcpkgs/csound/template            |  2 +-
 srcpkgs/fluidsynth/template        |  8 ++++----
 srcpkgs/gst-plugins-bad1/template  |  2 +-
 srcpkgs/lmms/template              |  2 +-
 srcpkgs/prboom-plus/template       |  2 +-
 srcpkgs/qsynth/template            |  2 +-
 srcpkgs/residualvm/template        |  2 +-
 srcpkgs/scummvm/template           |  2 +-
 srcpkgs/tuxguitar/template         |  2 +-
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 75693119f70..c6f6606edec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -969,7 +969,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/etc/defaults.conf b/etc/defaults.conf
index 8e74759ad7b..d44d7ccff0f 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -17,7 +17,7 @@
 # [OPTIONAL]
 # Enable optional arguments to xbps-install for the host system.
 # Currently used in the binary-bootstrap bootstrap-update targets.
-XBPS_INSTALL_ARGS="--repository=https://alpha.de.repo.voidlinux.org/current --repository=https://alpha.de.repo.voidlinux.org/current/musl --repository=https://alpha.de.repo.voidlinux.org/current/aarch64"
+XBPS_INSTALL_ARGS="--repository=https://alpha.de.repo.voidlinux.org/voidlinux/current --repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/musl --repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/aarch64"
 
 # [OPTIONAL]
 # Native Compilation/Preprocessor flags for C and C++. Additional settings
diff --git a/etc/repos-remote-x86_64.conf b/etc/repos-remote-x86_64.conf
index fcc7b822f0f..6056ed0207a 100644
--- a/etc/repos-remote-x86_64.conf
+++ b/etc/repos-remote-x86_64.conf
@@ -1,3 +1,3 @@
 # Remote repositories
-repository=https://alpha.de.repo.voidlinux.org/current/multilib
-repository=https://alpha.de.repo.voidlinux.org/current/multilib/nonfree
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/multilib
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/multilib/nonfree
diff --git a/etc/repos-remote.conf b/etc/repos-remote.conf
index ec534bab0e7..7874e77deb0 100644
--- a/etc/repos-remote.conf
+++ b/etc/repos-remote.conf
@@ -1,13 +1,13 @@
 # Remote repositories
-repository=https://alpha.de.repo.voidlinux.org/current/musl
-repository=https://alpha.de.repo.voidlinux.org/current/musl/nonfree
-repository=https://alpha.de.repo.voidlinux.org/current
-repository=https://alpha.de.repo.voidlinux.org/current/nonfree
-repository=https://alpha.de.repo.voidlinux.org/current/aarch64
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/musl
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/musl/nonfree
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/nonfree
+repository=https://alpha.de.repo.voidlinux.org/voidlinux/current/aarch64
 
 # Additional mirrors
 #
 # http://mirror.clarkson.edu/voidlinux/current/		US
 # http://www.gtlib.gatech.edu/pub/VoidLinux/current/	US
 # https://lug.utdallas.edu/mirror/void/			US
-# http://mirror.aarnet.edu.au/pub/voidlinux/current/	AU
+# http://alpha.de.repo.voidlinux.org/voidlinux/current/	AU
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"
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index d3ce292f6d6..cccfad2981b 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.6
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config p7zip"
 makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d97bf72f30e..335d113114e 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=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel
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"
diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b0f8833e286..516b3cead7b 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
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 19046b824af..89c45527c35 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.0.6
+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 <orphan@voidlinux.org>"
+maintainer="fosslinux <fosslinux@aussies.space>"
 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=e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 476d0c11bbc..726d7b85a77 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.0
-revision=4
+revision=5
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index e4fa1c03b1e..45a21b0b9a6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0
-revision=1
+revision=2
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
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
diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index b607e283983..1cbb1b26438 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools"
 makedepends="qt5-x11extras-devel jack-devel fluidsynth-devel"
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)"
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index c24ae51929e..316ba58b709 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-plugins --enable-all-engines"
 hostmakedepends="pkg-config nasm"
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 27ba7a7b28a..5df6328b455 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

^ permalink raw reply	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2020-04-24 23:29 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12  8:37 [PR PATCH] [WIP] fluidsynth: update to 2.0.6 voidlinux-github
2019-09-12 11:09 ` voidlinux-github
2019-09-12 20:30 ` voidlinux-github
2019-09-13  7:15 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-13  7:15 ` voidlinux-github
2019-09-13  7:16 ` voidlinux-github
2019-09-13  7:16 ` voidlinux-github
2019-09-13  7:17 ` voidlinux-github
2019-09-21 15:05 ` voidlinux-github
2019-10-14  5:38 ` voidlinux-github
2019-12-29 13:19 ` voidlinux-github
2019-12-29 21:30 ` voidlinux-github
2019-12-29 22:12 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-01 21:46 ` voidlinux-github
2020-01-01 21:50 ` voidlinux-github
2020-01-01 22:11 ` voidlinux-github
2020-01-01 22:26 ` voidlinux-github
2020-01-01 22:27 ` voidlinux-github
2020-01-01 22:28 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-01 22:28 ` voidlinux-github
2020-01-02  3:55 ` [PR PATCH] [Updated] [WIP] fluidsynth: update to 2.1.0 voidlinux-github
2020-01-02  6:38 ` voidlinux-github
2020-01-02  7:01 ` voidlinux-github
2020-01-02  7:01 ` voidlinux-github
2020-01-02  7:17 ` voidlinux-github
2020-01-02  7:17 ` voidlinux-github
2020-01-02  7:17 ` voidlinux-github
2020-01-02  9:37 ` voidlinux-github
2020-01-02  9:37 ` voidlinux-github
2020-01-02 10:59 ` voidlinux-github
2020-01-03 21:57 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-03 22:05 ` voidlinux-github
2020-01-12 17:05 ` voidlinux-github
2020-01-20  0:42 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-20  1:42 ` voidlinux-github
2020-01-20  1:52 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-27  3:47 ` voidlinux-github
2020-03-23  5:47 ` fosslinux
2020-04-24 23:29 ` fosslinux
2020-04-24 23:29 ` [PR PATCH] [Closed]: " fosslinux

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).