CVS commit: pkgsrc/emulators/retroarch

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 11 11:56:33 UTC 2019

Modified Files:
        pkgsrc/emulators/retroarch: Makefile distinfo
Added Files:
        pkgsrc/emulators/retroarch/patches: patch-audio_drivers_audioio.c

Log Message:
retroarch: Attempt to improve the portability of the sun audio driver.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/retroarch/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/retroarch/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/retroarch/patches/patch-audio_drivers_audioio.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/retroarch/Makefile
diff -u pkgsrc/emulators/retroarch/Makefile:1.20 pkgsrc/emulators/retroarch/Makefile:1.21
--- pkgsrc/emulators/retroarch/Makefile:1.20    Wed May  8 12:40:05 2019
+++ pkgsrc/emulators/retroarch/Makefile Sat May 11 11:56:33 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2019/05/08 12:40:05 nia Exp $
+# $NetBSD: Makefile,v 1.21 2019/05/11 11:56:33 nia Exp $
 
 PKGNAME=       retroarch-${RETROARCH_VERSION}
 DISTNAME=      RetroArch-${RETROARCH_VERSION}
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/retroarch/distinfo
diff -u pkgsrc/emulators/retroarch/distinfo:1.11 pkgsrc/emulators/retroarch/distinfo:1.12
--- pkgsrc/emulators/retroarch/distinfo:1.11    Wed May  8 12:40:05 2019
+++ pkgsrc/emulators/retroarch/distinfo Sat May 11 11:56:33 2019
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.11 2019/05/08 12:40:05 nia Exp $
+$NetBSD: distinfo,v 1.12 2019/05/11 11:56:33 nia Exp $
 
 SHA1 (RetroArch-1.7.7.tar.xz) = 32288d3cc23319280c80968e9f0446e00f24db19
 RMD160 (RetroArch-1.7.7.tar.xz) = e019c8a6486706e076878adc0510178e5c8d5d81
 SHA512 (RetroArch-1.7.7.tar.xz) = cdb509f12d7b5e7fd71b7d91cb93c43f8c6cb1fb83417f9e23f4edf896db9af1ad07aa99da4467fdac26bbe935da2e9f464a6caf33177ea1f1596f3831ab8312
 Size (RetroArch-1.7.7.tar.xz) = 220787816 bytes
 SHA1 (patch-Makefile) = a4dd20cf34724f79e4cc886c5d7a383a11d2e42d
+SHA1 (patch-audio_drivers_audioio.c) = 50820a7f3fbf7685098efdb794dd4efa485df806
 SHA1 (patch-configuration.c) = 58873db839f8f0ed2e011d4c4c75b00e6293c239
 SHA1 (patch-frontend_drivers_platform__unix.c) = b3e2b8ccf19d72c1c561bbbc1913996e12d88aeb
 SHA1 (patch-qb_config.libs.sh) = 0ec6ab7d49cdcd59c5938276517df1ee0212868e

Added files:

Index: pkgsrc/emulators/retroarch/patches/patch-audio_drivers_audioio.c
diff -u /dev/null pkgsrc/emulators/retroarch/patches/patch-audio_drivers_audioio.c:1.1
--- /dev/null   Sat May 11 11:56:33 2019
+++ pkgsrc/emulators/retroarch/patches/patch-audio_drivers_audioio.c    Sat May 11 11:56:33 2019
@@ -0,0 +1,47 @@
+$NetBSD: patch-audio_drivers_audioio.c,v 1.1 2019/05/11 11:56:33 nia Exp $
+
+Attempt to improve the portability of the Sun audio driver.
+
+--- audio/drivers/audioio.c.orig       2019-05-08 06:06:22.000000000 +0000
++++ audio/drivers/audioio.c
+@@ -47,6 +47,8 @@ static void *audioio_init(const char *de
+ 
+ #ifdef AUMODE_PLAY_ALL
+    info.mode = AUMODE_PLAY_ALL;
++#elif defined(AUMODE_PLAY)
++   info.mode = AUMODE_PLAY;
+ #endif
+    info.play.sample_rate = rate;
+    info.play.channels = 2;
+@@ -104,8 +106,10 @@ static bool audioio_stop(void *data)
+    struct audio_info info;
+    int *fd = (int*)data;
+ 
++#ifdef AUDIO_FLUSH
+    if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
+       return false;
++#endif
+ 
+    if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+       return false;
+@@ -120,8 +124,10 @@ static bool audioio_start(void *data, bo
+    struct audio_info info;
+    int *fd = (int*)data;
+ 
++#ifdef AUDIO_FLUSH
+    if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
+       return false;
++#endif
+ 
+    if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
+       return false;
+@@ -159,7 +165,9 @@ static void audioio_free(void *data)
+ {
+    int *fd = (int*)data;
+ 
++#ifdef AUDIO_FLUSH
+    (void)ioctl(*fd, AUDIO_FLUSH, NULL);
++#endif
+ 
+    close(*fd);
+    free(fd);