On Mon, Mar 22, 2010 at 12:43:36AM +0000, Jacob Meuser wrote:
> On Sun, Mar 21, 2010 at 08:29:12PM +0000, Federico G. Schwindt wrote:
> > On Sun, Mar 21, 2010 at 10:31:34AM +0000, Jacob Meuser wrote:
> > > On Fri, Jan 15, 2010 at 03:08:01AM +0000, Jacob Meuser wrote:
> > > > is there any reason to not enable SDL sound always and get rid of the
> > > > flavor?  reading the commit messages leads me to believe sound doesn't
> > > > work in the non-flavored package.
> > > 
> > > no replies, so I guess there's no reason not to use SDL by default
> > > and disable audio(4)?
> > 
> >   if audio works fine with sdl, i don't see any reason not to.
> > 
> > > ok?
> > 
> >   untested but looks correct. one comment below:
> 
> I haven't tested it either, but, why would the SDL flavor exist if it
> doesn't work, and why would the commit messages say native audio
> doesn't work?

so, has anyone tested this yet?

> reading the SDL and audio(4) backends, I'm pretty sure SDL will not
> only work on more hardware, but is more "correct".  the audio(4)
> backend doesn't check what format is actually being used, but the
> SDL one does (and SDL does conversions, and since SDL already uses
> sndio(7), it can support pretty much everything via aucat).

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/uae/Makefile,v
retrieving revision 1.17
diff -N -u -p Makefile
--- Makefile    10 Aug 2009 06:31:09 -0000      1.17
+++ Makefile    21 Mar 2010 10:26:26 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=       UAE amiga emulator
 DISTNAME=      uae-0.8.25
-PKGNAME=       ${DISTNAME}p4
+PKGNAME=       ${DISTNAME}p5
 CATEGORIES=    emulators x11
 
 HOMEPAGE=      http://uae.coresystems.de/
@@ -22,19 +22,14 @@ WANTLIB=    ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi X
 MASTER_SITES=  ftp://ftp.coresystems.de/pub/uae/sources/develop/
 
 MODULES=       devel/gettext
-LIB_DEPENDS+=  gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS+=  gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
+               SDL::devel/sdl
 
 USE_X11=               Yes
 CONFIGURE_STYLE=       gnu
-CONFIGURE_ARGS+=       --enable-dga --enable-vidmode
-
-FLAVORS=       sdl
-FLAVOR?=
-
-.if ${FLAVOR:L:Msdl}
-CONFIGURE_ARGS+=       --with-sdl-sound
-LIB_DEPENDS+=          SDL::devel/sdl
-.endif
+CONFIGURE_ARGS+=       --enable-dga --enable-vidmode \
+                       --with-sdl-sound
+CONFIGURE_ENV=         ac_cv_header_sys_audioio_h=no
 
 NO_REGRESS=    Yes
 
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/emulators/uae/pkg/DESCR,v
retrieving revision 1.3
diff -N -u -p pkg/DESCR
--- pkg/DESCR   8 Oct 2007 18:49:54 -0000       1.3
+++ pkg/DESCR   21 Mar 2010 10:26:26 -0000
@@ -4,7 +4,3 @@ to do this. The hardware of an Amiga is emulated accur
 software is tricked into thinking it is running on the real thing, with
 your computer's display, keyboard, harddisk and mouse taking the parts of
 their emulated counterparts.
-
-Available flavors:
-
-       sdl: use SDL for sound and low-level functions
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/uae/pkg/PLIST,v
retrieving revision 1.3
diff -N -u -p pkg/PLIST
--- pkg/PLIST   15 Sep 2004 00:42:04 -0000      1.3
+++ pkg/PLIST   21 Mar 2010 10:26:26 -0000
@@ -1,6 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:42:04 espie Exp $
-bin/readdisk
-bin/uae
+...@pkgpath emulators/uae,sdl
+...@pkgpath emulators/uae
+...@bin bin/readdisk
+...@bin bin/uae
 share/uae/
 share/uae/COMPATIBILITY
 share/uae/CREDITS

Reply via email to