diff options
Diffstat (limited to 'audio/mpg123/patches')
| -rw-r--r-- | audio/mpg123/patches/patch-aa | 8 | ||||
| -rw-r--r-- | audio/mpg123/patches/patch-ad | 26 | ||||
| -rw-r--r-- | audio/mpg123/patches/patch-af | 20 |
3 files changed, 26 insertions, 28 deletions
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index fb949117332..de4769397ba 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.30 2014/05/20 19:59:09 adam Exp $ +$NetBSD: patch-aa,v 1.31 2016/12/18 22:58:34 adam Exp $ ---- configure.orig 2014-03-08 12:12:59.000000000 +0000 +Handle modules by pkgsrc. + +--- configure.orig 2016-09-26 21:21:39.000000000 +0000 +++ configure -@@ -16363,7 +16363,7 @@ fi +@@ -17124,7 +17124,7 @@ fi # The full list of supported modules to check, first come, first serve. diff --git a/audio/mpg123/patches/patch-ad b/audio/mpg123/patches/patch-ad index fb3a8dde864..5f303075839 100644 --- a/audio/mpg123/patches/patch-ad +++ b/audio/mpg123/patches/patch-ad @@ -1,24 +1,24 @@ -$NetBSD: patch-ad,v 1.5 2014/11/20 13:07:12 mef Exp $ +$NetBSD: patch-ad,v 1.6 2016/12/18 22:58:34 adam Exp $ Let device portable over environment ---- src/output/oss.c.orig 2009-12-05 21:26:23.000000000 +0100 -+++ src/output/oss.c 2010-02-06 20:09:39.000000000 +0100 -@@ -167,7 +167,7 @@ - if(!ao) return -1; - - if(!ao->device) { -- ao->device = "/dev/dsp"; -+ ao->device = DEVOSSAUDIO; +--- src/libout123/modules/oss.c.orig 2016-09-26 21:20:25.000000000 +0000 ++++ src/libout123/modules/oss.c +@@ -159,7 +159,7 @@ static int open_oss(out123_handle *ao) + + dev = ao->device; + if(!dev) { +- dev = "/dev/dsp"; ++ dev = DEVOSSAUDIO; usingdefdev = 1; } -@@ -176,7 +176,7 @@ +@@ -168,7 +168,7 @@ static int open_oss(out123_handle *ao) if(ao->fn < 0) { if(usingdefdev) { -- ao->device = "/dev/sound/dsp"; -+ ao->device = DEVOSSSOUND; - ao->fn = open(ao->device,O_WRONLY); +- dev = "/dev/sound/dsp"; ++ dev = DEVOSSSOUND; + ao->fn = open(dev,O_WRONLY); if(ao->fn < 0) { if(!AOQUIET) error("Can't open default sound device!"); diff --git a/audio/mpg123/patches/patch-af b/audio/mpg123/patches/patch-af index eed3fc7ba0b..b442f0e5d1c 100644 --- a/audio/mpg123/patches/patch-af +++ b/audio/mpg123/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2010/03/14 14:19:19 martin Exp $ +$NetBSD: patch-af,v 1.3 2016/12/18 22:58:34 adam Exp $ ---- src/xfermem.c.orig 2009-12-05 21:26:24.000000000 +0100 -+++ src/xfermem.c 2010-02-06 20:14:14.000000000 +0100 -@@ -37,6 +37,13 @@ +--- src/libout123/xfermem.c.orig 2016-09-26 21:20:25.000000000 +0000 ++++ src/libout123/xfermem.c +@@ -36,6 +36,13 @@ void xfermem_init (txfermem **xf, size_t #ifdef HAVE_MMAP # ifdef MAP_ANON @@ -16,18 +16,14 @@ $NetBSD: patch-af,v 1.2 2010/03/14 14:19:19 martin Exp $ if ((*xf = (txfermem *) mmap(0, regsize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0)) == (txfermem *) -1) { perror ("mmap()"); -@@ -92,7 +99,13 @@ - if(!xf) - return; - #ifdef HAVE_MMAP -- munmap ((caddr_t) xf, xf->size + xf->metasize + sizeof(txfermem)); -+ munmap ((void *) xf, xf->size + xf->metasize + sizeof(txfermem)); -+ +@@ -93,6 +100,10 @@ void xfermem_done (txfermem *xf) + Casting to (void*) should silence compilers in case of funny + prototype for munmap(). */ + munmap ( (void*)xf, xf->size + xf->metasize + sizeof(txfermem)); +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000) + if(madvise((void *)xf, (xf->size + xf->metasize), MADV_FREE) < 0) + fprintf(stderr,"madvise failed, continuing anyways..\n"); +#endif -+ #else if (shmdt((void *) xf) == -1) { perror ("shmdt()"); |