Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2831 from alihanozturk/master

Browse Source 
glibmm:fix url jack-audio-connection-kit:add patch
This commit is contained in:
Alihan Öztürk
2017-02-17 10:17:00 +02:00
committed by GitHub
parent 71122dd31c 5e73f0f649
commit 6f892f76ec
4 changed files with 102 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/gnome2/glibmm/pspec.xml
+2 -2
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>C++ interface for glib2</Summary>
<Description>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.</Description>
<Archive sha1sum="21ed63712e1bf84163768d4b909af80e4373e298" type="tarxz">mirrors://gnome/glibmm/2.44/glibmm-2.50.0.tar.xz</Archive>
<Archive sha1sum="21ed63712e1bf84163768d4b909af80e4373e298" type="tarxz">mirrors://gnome/glibmm/2.50/glibmm-2.50.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>libsigc++-devel</Dependency>
<Dependency>glib2-devel</Dependency>
@@ -55,7 +55,7 @@
<Update release="3">
<Date>2017-02-17</Date>
<Version>2.50.0</Version>
<Comment>Version Bump</Comment>
<Comment>Version Bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
multimedia/sound/jack-audio-connection-kit/files/gcc6.patch
+62
View File
@@ -0,0 +1,62 @@
From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001
From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
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 <stdlib.h>
#include <stdio.h>
+#include <stdint.h>
#include <math.h>
#include <unistd.h>
#include <jack/jack.h>
@@ -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
+// --------------------------------------------------------------------------------
multimedia/sound/jack-audio-connection-kit/files/jack1compat.diff
+33
View File
@@ -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)
multimedia/sound/jack-audio-connection-kit/pspec.xml
+5 -2
View File
@@ -14,7 +14,6 @@
<Summary>A low-latency audio server</Summary>
<Description>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.</Description>
<Archive sha1sum="0f648b8b03537991c095591a43d7eb21f0f29000" type="targz">https://github.com/jackaudio/jack2/archive/v1.9.10.tar.gz</Archive>
<BuildDependencies>
<Dependency>libsamplerate-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
@@ -28,6 +27,10 @@
<Dependency>libsndfile-devel</Dependency>
<Dependency>readline-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gcc6.patch</Patch>
<Patch level="1">jack1compat.diff</Patch>
</Patches>
</Source>
<Package>
@@ -85,7 +88,7 @@
<Update release="3">
<Date>2017-02-17</Date>
<Version>1.9.10</Version>
<Comment>Rebuild</Comment>
<Comment>Rebuild for new toolchain add patch.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>