From 7595f94ea495cc98a2864992411f989343084668 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Fri, 17 Feb 2017 11:04:58 +0300 Subject: [PATCH 1/2] glibmm:fix url --- desktop/gnome2/glibmm/pspec.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/gnome2/glibmm/pspec.xml b/desktop/gnome2/glibmm/pspec.xml index 62621014b2..b00a78b285 100644 --- a/desktop/gnome2/glibmm/pspec.xml +++ b/desktop/gnome2/glibmm/pspec.xml @@ -12,7 +12,7 @@ library C++ interface for glib2 Glibmm is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks and a comprehensive set of widgets that are easily extensible via inheritance. - mirrors://gnome/glibmm/2.44/glibmm-2.50.0.tar.xz + mirrors://gnome/glibmm/2.50/glibmm-2.50.0.tar.xz libsigc++-devel glib2-devel @@ -55,7 +55,7 @@ 2017-02-17 2.50.0 - Version Bump + Version Bump. Pisi Linux Community admin@pisilinux.org From 5e73f0f6497dbddff4f8402689806c94636b8208 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Fri, 17 Feb 2017 11:16:11 +0300 Subject: [PATCH 2/2] jack-audio-connection-kit:add patch --- .../files/gcc6.patch | 62 +++++++++++++++++++ .../files/jack1compat.diff | 33 ++++++++++ .../sound/jack-audio-connection-kit/pspec.xml | 7 ++- 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 multimedia/sound/jack-audio-connection-kit/files/gcc6.patch create mode 100644 multimedia/sound/jack-audio-connection-kit/files/jack1compat.diff diff --git a/multimedia/sound/jack-audio-connection-kit/files/gcc6.patch b/multimedia/sound/jack-audio-connection-kit/files/gcc6.patch new file mode 100644 index 0000000000..ba7778ba5a --- /dev/null +++ b/multimedia/sound/jack-audio-connection-kit/files/gcc6.patch @@ -0,0 +1,62 @@ +From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Sat, 11 Jun 2016 05:35:07 +0200 +Subject: [PATCH] Fix initialization in test/iodelay.cpp + +jack_latency_range_t is + +struct _jack_latency_range { + jack_nframes_t min; + jack_nframes_t max; +}; + +and jack_nframes_t is + +typedef uint32_t jack_nframes_t; + +so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has + + jack_latency_range_t range; + range.min = range.max = 0; + if ((range.min != capture_latency.min) || (range.max != + capture_latency.max)) { + capture_latency = range; + } + +so we must not have {0, 0}, otherwise the condition would never be true. + +Using UINT32_MAX should be equivalent to the previous -1. +--- + tests/iodelay.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp +index e1ba63f..1ef470f 100644 +--- a/tests/iodelay.cpp ++++ b/tests/iodelay.cpp +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -167,8 +168,8 @@ static jack_client_t *jack_handle; + static jack_port_t *jack_capt; + static jack_port_t *jack_play; + +-jack_latency_range_t capture_latency = {-1, -1}; +-jack_latency_range_t playback_latency = {-1, -1}; ++jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; ++jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; + + void + latency_cb (jack_latency_callback_mode_t mode, void *arg) +@@ -266,4 +267,4 @@ int main (int ac, char *av []) + return 0; + } + +-// -------------------------------------------------------------------------------- +\ No newline at end of file ++// -------------------------------------------------------------------------------- diff --git a/multimedia/sound/jack-audio-connection-kit/files/jack1compat.diff b/multimedia/sound/jack-audio-connection-kit/files/jack1compat.diff new file mode 100644 index 0000000000..d14b3e1dca --- /dev/null +++ b/multimedia/sound/jack-audio-connection-kit/files/jack1compat.diff @@ -0,0 +1,33 @@ +diff --git a/common/jack/types.h b/common/jack/types.h +index 094d407..2dccf34 100644 +--- a/common/jack/types.h ++++ b/common/jack/types.h +@@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int + * @param port the port that has been renamed + * @param new_name the new name + * @param arg pointer to a client supplied structure +- * +- * @return zero on success, non-zero on error + */ +-typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); ++typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); + + /** + * Prototype for the client supplied function that is called +diff --git a/tests/test.cpp b/tests/test.cpp +index 750d152..8a8a811 100644 +--- a/tests/test.cpp ++++ b/tests/test.cpp +@@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg) + client_register--; + } + +-int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) ++void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) + { + Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name); + port_rename_clbk = 1; +- return 0; + } + + int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg) diff --git a/multimedia/sound/jack-audio-connection-kit/pspec.xml b/multimedia/sound/jack-audio-connection-kit/pspec.xml index 9c4657dece..b2b0e7d913 100644 --- a/multimedia/sound/jack-audio-connection-kit/pspec.xml +++ b/multimedia/sound/jack-audio-connection-kit/pspec.xml @@ -14,7 +14,6 @@ A low-latency audio server JACK is a low-latency audio server written for POSIX conformant operating systems. It can connect a number of different applications to an audio device, as well as allowing them to share audio between themselves. https://github.com/jackaudio/jack2/archive/v1.9.10.tar.gz - libsamplerate-devel alsa-lib-devel @@ -28,6 +27,10 @@ libsndfile-devel readline-devel + + gcc6.patch + jack1compat.diff + @@ -85,7 +88,7 @@ 2017-02-17 1.9.10 - Rebuild + Rebuild for new toolchain add patch. Pisi Linux Community admin@pisilinux.org