cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable "register" variable name.

Browse Source 
Cherry pick fix from:
ab27e5a59f

ok jca@
This commit is contained in:
sdk 2021-12-29 20:08:33 +00:00
parent 21f0f7e854
commit 44aa936bdd
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/jack/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2019/07/12 20:43:34 sthen Exp $
# $OpenBSD: Makefile,v 1.46 2021/12/29 20:08:33 sdk Exp $
COMMENT = low latency sound server
@ -6,7 +6,7 @@ V = 0.125.0
DISTNAME = jack-audio-connection-kit-${V}
PKGNAME = jack-${V}
CATEGORIES = audio
REVISION = 2
REVISION = 3
SHARED_LIBS += jack 2.0 # 0.28
SHARED_LIBS += jackserver 2.0 # 0.28

26
audio/jack/patches/patch-jack_types_h Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-jack_types_h,v 1.3 2021/12/29 20:08:33 sdk Exp $
Disable "register" variable name
Picked from: https://github.com/jackaudio/headers/commit/ab27e5a59fe5294cf09d50ffa2414d1542cf245e
Index: jack/types.h
--- jack/types.h.orig
+++ jack/types.h
@@ -386,7 +386,7 @@ typedef int (*JackSampleRateCallback)(jack_nframes_t
* @param register non-zero if the port is being registered,
* zero if the port is being unregistered
*/
-typedef void (*JackPortRegistrationCallback)(jack_port_id_t port, int register, void *arg);
+typedef void (*JackPortRegistrationCallback)(jack_port_id_t port, int /* register */, void *arg);
/**
* Prototype for the client supplied function that is called
@@ -408,7 +408,7 @@ typedef void (*JackPortRenameCallback)(jack_port_id_t
* zero if the client is being unregistered
* @param arg pointer to a client supplied data
*/
-typedef void (*JackClientRegistrationCallback)(const char* name, int register, void *arg);
+typedef void (*JackClientRegistrationCallback)(const char* name, int /* register */, void *arg);
/**
* Prototype for the client supplied function that is called