CVS commit: pkgsrc/emulators/qemu

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jun 11 10:13:06 UTC 2022

Modified Files:
        pkgsrc/emulators/qemu: distinfo
        pkgsrc/emulators/qemu/patches: patch-audio_jackaudio.c

Log Message:
qemu: correct pthread_setname_np invocation on macOS

>From kflu in PR NetBSD/pkgsrc#107.

Note that I did not test a macOS build due to a lack of access to a Mac.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/qemu/patches/patch-audio_jackaudio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.191 pkgsrc/emulators/qemu/distinfo:1.192
--- pkgsrc/emulators/qemu/distinfo:1.191        Thu May 19 16:10:15 2022
+++ pkgsrc/emulators/qemu/distinfo      Sat Jun 11 10:13:05 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.191 2022/05/19 16:10:15 ryoon Exp $
+$NetBSD: distinfo,v 1.192 2022/06/11 10:13:05 bsiegert Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -6,7 +6,7 @@ Size (palcode-clipper-qemu-5.2.0nb8) = 1
 BLAKE2s (qemu-7.0.0.tar.xz) = 1d0df58230a436f476df87a7b315ab381743a24837314978f687986d4d0f2a16
 SHA512 (qemu-7.0.0.tar.xz) = 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
 Size (qemu-7.0.0.tar.xz) = 125117636 bytes
-SHA1 (patch-audio_jackaudio.c) = 0c9e2bea94857007938e16285b721d1495fcb8e1
+SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
 SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
 SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853

Index: pkgsrc/emulators/qemu/patches/patch-audio_jackaudio.c
diff -u pkgsrc/emulators/qemu/patches/patch-audio_jackaudio.c:1.1 pkgsrc/emulators/qemu/patches/patch-audio_jackaudio.c:1.2
--- pkgsrc/emulators/qemu/patches/patch-audio_jackaudio.c:1.1   Mon Dec 27 10:12:57 2021
+++ pkgsrc/emulators/qemu/patches/patch-audio_jackaudio.c       Sat Jun 11 10:13:06 2022
@@ -1,15 +1,17 @@
-$NetBSD: patch-audio_jackaudio.c,v 1.1 2021/12/27 10:12:57 nia Exp $
+$NetBSD: patch-audio_jackaudio.c,v 1.2 2022/06/11 10:13:06 bsiegert Exp $
 
-Teach it about NetBSD's pthread_setname_np.
+Teach it about NetBSD's and macOS' pthread_setname_np.
 
 --- audio/jackaudio.c.orig     2021-12-14 20:42:02.000000000 +0000
 +++ audio/jackaudio.c
-@@ -631,7 +631,11 @@ static int qjack_thread_creator(jack_nat
+@@ -631,7 +631,13 @@ static int qjack_thread_creator(jack_nat
      }
  
      /* set the name of the thread */
 +#ifdef __NetBSD__
 +    pthread_setname_np(*thread, "%s", (void *)"jack-client");
++#elif __APPLE__
++    pthread_setname_np("jack-client");
 +#else
      pthread_setname_np(*thread, "jack-client");
 +#endif