On Sun, Mar 20, 2016 at 09:53:23AM +0000, Stuart Henderson wrote: > On 2016/03/18 16:26, Frederic Cambus wrote: > > RCS file: /cvs/ports/audio/libmikmod/Makefile,v > > Looks good but please regenerate against -current.
Here is a new patch, also removing files/drv_sndio.c which is not needed anymore. Index: Makefile =================================================================== RCS file: /cvs/ports/audio/libmikmod/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- Makefile 11 Mar 2016 19:59:12 -0000 1.29 +++ Makefile 20 Mar 2016 15:03:39 -0000 @@ -1,30 +1,27 @@ # $OpenBSD: Makefile,v 1.29 2016/03/11 19:59:12 naddy Exp $ -COMMENT= mikmod sound library +COMMENT = mikmod sound library -DISTNAME= libmikmod-3.3.7 +DISTNAME = libmikmod-3.3.8 SHARED_LIBS += mikmod 4.0 # .3.0 -CATEGORIES= audio devel -REVISION= 0 +CATEGORIES = audio devel -HOMEPAGE= http://mikmod.shlomifish.org/ +MAINTAINER = Frederic Cambus <f...@statdns.com> + +HOMEPAGE = http://mikmod.sourceforge.net/ # LGPLv2.1+ -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_CDROM = Yes WANTLIB += m pthread sndio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mikmod/} +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mikmod/} + +SEPARATE_BUILD = Yes +CONFIGURE_STYLE = gnu -SEPARATE_BUILD= Yes -CONFIGURE_STYLE= gnu -CFLAGS += -DDRV_SNDIO -CONFIGURE_ENV= LIBRARY_LIB="-lsndio" CONFIGURE_ARGS+= --disable-dl \ --disable-oss \ --disable-esd - -post-extract: - cp ${FILESDIR}/drv_sndio.c ${WRKSRC}/drivers .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/libmikmod/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 18 Oct 2014 14:56:28 -0000 1.5 +++ distinfo 20 Mar 2016 15:03:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (libmikmod-3.3.7.tar.gz) = TPQQQKmvmcuWBYAhC6kAwKUZ9zq5e1A8eA6CQoub2aI= -SIZE (libmikmod-3.3.7.tar.gz) = 1226732 +SHA256 (libmikmod-3.3.8.tar.gz) = Ss9mNKR32LlfGLVaPi52BSwUnmkNICSE6LCsdYnPN6I= +SIZE (libmikmod-3.3.8.tar.gz) = 1254702 Index: files/drv_sndio.c =================================================================== RCS file: files/drv_sndio.c diff -N files/drv_sndio.c --- files/drv_sndio.c 13 Jan 2013 09:10:40 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,186 +0,0 @@ -/* - * Copyright (c) 2009 Jacob Meuser <jake...@sdf.lonestar.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "mikmod_internals.h" - -#ifdef DRV_SNDIO - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#include <stdio.h> -#include <stdlib.h> - -#include <sndio.h> - -#define DEFAULT_FRAGSIZE 12 - -static struct sio_hdl *hdl; -static struct sio_par par; -static int fragsize = 1 << DEFAULT_FRAGSIZE; -static SBYTE *audiobuffer = NULL; - -static void Sndio_CommandLine(CHAR *cmdline) -{ - CHAR *ptr; - - if ((ptr = MD_GetAtom("buffer", cmdline, 0))) { - int buf = atoi(ptr); - - if (buf >= 7 && buf <= 17) - fragsize = 1 << buf; - - free(ptr); - } -} - -static BOOL Sndio_IsThere(void) -{ - /* could try sio_open() ? */ - return 1; -} - -static BOOL Sndio_Init(void) -{ - hdl = sio_open(NULL, SIO_PLAY, 0); - if (hdl == NULL) { - _mm_errno = MMERR_OPENING_AUDIO; - return 1; - } - - if (!(audiobuffer = (SBYTE *)MikMod_malloc(fragsize))) - return 1; - - sio_initpar(&par); - par.bits = (md_mode & DMODE_16BITS) ? 16 : 8; - par.pchan = (md_mode & DMODE_STEREO) ? 2 : 1; - par.rate = md_mixfreq; - par.le = SIO_LE_NATIVE; - par.sig = par.bits == 8 ? 0 : 1; - par.appbufsz = 4 * fragsize / SIO_BPS(par.bits) / par.pchan; - - if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { - _mm_errno = MMERR_SUN_INIT; - return 1; - } - - /* Align to what the card gave us */ - md_mixfreq = par.rate; - if (par.bits == 8) - md_mode &= ~(DMODE_16BITS); - else if (par.bits == 16) - md_mode |= DMODE_16BITS; - else { - _mm_errno = MMERR_SUN_INIT; - return 1; - } - if (par.pchan == 1) - md_mode &= ~(DMODE_STEREO); - else if (par.pchan == 2) - md_mode |= DMODE_STEREO; - else { - _mm_errno = MMERR_SUN_INIT; - return 1; - } - - return VC_Init(); -} - -static void Sndio_Exit(void) -{ - VC_Exit(); - MikMod_free(audiobuffer); - if (hdl) { - sio_close(hdl); - hdl = NULL; - } -} - -static void Sndio_Update(void) -{ - int done; - - done = VC_WriteBytes((char *)audiobuffer, fragsize); - sio_write(hdl, audiobuffer, done); -} - -static void Sndio_Pause(void) -{ - int done; - - done = VC_SilenceBytes((char *)audiobuffer, fragsize); - sio_write(hdl, audiobuffer, done); -} - -static BOOL Sndio_PlayStart(void) -{ - if (!sio_start(hdl)) - return 1; - - return VC_PlayStart(); -} - -static void Sndio_PlayStop(void) -{ - VC_PlayStop(); - sio_stop(hdl); -} - -MIKMODAPI MDRIVER drv_sndio = { - NULL, - "Sndio Audio", - "sndio audio driver v1.0", - 0, 255, - "audio", - "buffer:r:7,17,12:Audio buffer log2 size\n", - Sndio_CommandLine, - Sndio_IsThere, - VC_SampleLoad, - VC_SampleUnload, - VC_SampleSpace, - VC_SampleLength, - Sndio_Init, - Sndio_Exit, - NULL, - VC_SetNumVoices, - Sndio_PlayStart, - Sndio_PlayStop, - Sndio_Update, - Sndio_Pause, - VC_VoiceSetVolume, - VC_VoiceGetVolume, - VC_VoiceSetFrequency, - VC_VoiceGetFrequency, - VC_VoiceSetPanning, - VC_VoiceGetPanning, - VC_VoicePlay, - VC_VoiceStop, - VC_VoiceStopped, - VC_VoiceGetPosition, - VC_VoiceRealVolume -}; - -#else - -MISSING(drv_sndio); - -#endif - -/* ex:set ts=4: */ Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 18 Oct 2014 14:56:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2014/10/18 14:56:28 bcallah Exp $ ---- Makefile.in.orig Thu Oct 9 20:26:32 2014 -+++ Makefile.in Thu Oct 9 20:27:37 2014 -@@ -120,7 +120,7 @@ am_libmikmod_la_OBJECTS = dlapi/dl_hpux.lo drivers/drv - drivers/drv_pulseaudio.lo drivers/drv_pipe.lo \ - drivers/drv_psp.lo drivers/drv_raw.lo drivers/drv_sam9407.lo \ - drivers/drv_sb.lo drivers/drv_sdl.lo drivers/drv_sgi.lo \ -- drivers/drv_stdout.lo drivers/drv_sun.lo drivers/drv_ultra.lo \ -+ drivers/drv_stdout.lo drivers/drv_sndio.lo drivers/drv_sun.lo drivers/drv_ultra.lo \ - drivers/drv_wav.lo drivers/drv_win.lo drivers/drv_wss.lo \ - drivers/drv_xaudio2.lo loaders/load_669.lo loaders/load_amf.lo \ - loaders/load_asy.lo loaders/load_dsm.lo loaders/load_far.lo \ -@@ -616,6 +616,8 @@ drivers/drv_sdl.lo: drivers/$(am__dirstamp) \ - drivers/drv_sgi.lo: drivers/$(am__dirstamp) \ - drivers/$(DEPDIR)/$(am__dirstamp) - drivers/drv_stdout.lo: drivers/$(am__dirstamp) \ -+ drivers/$(DEPDIR)/$(am__dirstamp) -+drivers/drv_sndio.lo: drivers/$(am__dirstamp) \ - drivers/$(DEPDIR)/$(am__dirstamp) - drivers/drv_sun.lo: drivers/$(am__dirstamp) \ - drivers/$(DEPDIR)/$(am__dirstamp) Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 18 Oct 2014 14:56:28 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2014/10/18 14:56:28 bcallah Exp $ - -sndio - ---- configure.orig Thu Oct 9 20:22:35 2014 -+++ configure Thu Oct 9 20:23:31 2014 -@@ -15860,7 +15860,7 @@ done - libmikmod_driver_hp=yes - fi - ;; -- netbsd*|openbsd*) -+ netbsd*) - for ac_header in sys/audioio.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default" -@@ -16089,7 +16089,7 @@ done - # otherwise no link library is needed. - oss_library="" - case $host_os in -- netbsd*|openbsd*) -+ netbsd*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 - $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } - if ${ac_cv_lib_ossaudio__oss_ioctl+:} false Index: patches/patch-drivers_Makefile_in =================================================================== RCS file: patches/patch-drivers_Makefile_in diff -N patches/patch-drivers_Makefile_in --- patches/patch-drivers_Makefile_in 18 Oct 2014 14:56:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-drivers_Makefile_in,v 1.1 2014/10/18 14:56:28 bcallah Exp $ ---- drivers/Makefile.in.orig Thu Oct 9 20:28:20 2014 -+++ drivers/Makefile.in Thu Oct 9 20:28:38 2014 -@@ -279,6 +279,7 @@ EXTRA_DIST = CMakeLists.txt \ - drv_sdl.c \ - drv_sgi.c \ - drv_stdout.c \ -+ drv_sndio.c \ - drv_sun.c \ - drv_ultra.c \ - drv_wav.c \ Index: patches/patch-include_mikmod_h =================================================================== RCS file: patches/patch-include_mikmod_h diff -N patches/patch-include_mikmod_h --- patches/patch-include_mikmod_h 18 Oct 2014 14:56:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-include_mikmod_h,v 1.1 2014/10/18 14:56:28 bcallah Exp $ ---- include/mikmod.h.orig Thu Oct 9 20:31:54 2014 -+++ include/mikmod.h Thu Oct 9 20:32:29 2014 -@@ -814,6 +814,7 @@ MIKMODAPI extern struct MDRIVER drv_oss; /* OpenSou - MIKMODAPI extern struct MDRIVER drv_openal; /* OpenAL driver */ - MIKMODAPI extern struct MDRIVER drv_sdl; /* SDL audio driver */ - MIKMODAPI extern struct MDRIVER drv_sgi; /* SGI audio library */ -+MIKMODAPI extern struct MDRIVER drv_sndio; /* sndio, baby! */ - MIKMODAPI extern struct MDRIVER drv_sun; /* Sun/NetBSD/OpenBSD audio device */ - - MIKMODAPI extern struct MDRIVER drv_dart; /* OS/2 Direct Audio RealTime */ Index: patches/patch-playercode_mdreg_c =================================================================== RCS file: patches/patch-playercode_mdreg_c diff -N patches/patch-playercode_mdreg_c --- patches/patch-playercode_mdreg_c 18 Oct 2014 14:56:28 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-playercode_mdreg_c,v 1.3 2014/10/18 14:56:28 bcallah Exp $ ---- playercode/mdreg.c.orig Thu Oct 9 20:28:59 2014 -+++ playercode/mdreg.c Thu Oct 9 20:29:37 2014 -@@ -80,6 +80,9 @@ static void _mm_registeralldrivers(void) - #ifdef DRV_SGI - _mm_registerdriver(&drv_sgi); - #endif -+#ifdef DRV_SNDIO -+ _mm_registerdriver(&drv_sndio); -+#endif - #ifdef DRV_SUN - _mm_registerdriver(&drv_sun); - #endif Index: patches/patch-playercode_mplayer_c =================================================================== RCS file: /cvs/ports/audio/libmikmod/patches/patch-playercode_mplayer_c,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-playercode_mplayer_c --- patches/patch-playercode_mplayer_c 18 Oct 2014 14:56:28 -0000 1.7 +++ patches/patch-playercode_mplayer_c 20 Mar 2016 15:03:39 -0000 @@ -1,9 +1,6 @@ -$OpenBSD: patch-playercode_mplayer_c,v 1.7 2014/10/18 14:56:28 bcallah Exp $ - -Avoid setting envelope cursors to negative values. - ---- playercode/mplayer.c.orig Thu Oct 9 20:29:53 2014 -+++ playercode/mplayer.c Thu Oct 9 20:30:34 2014 +$OpenBSD$ +--- playercode/mplayer.c.orig Mon Apr 27 04:51:00 2015 ++++ playercode/mplayer.c Fri Mar 18 07:39:21 2016 @@ -368,9 +368,9 @@ static SWORD StartEnvelope(ENVPR *t,UBYTE flg,UBYTE pt }
