On Tue, Nov 27, 2012 at 10:50:18PM +0100, Jonathan Armani wrote: > > Switch BasiliskII from esd to sdl, makes the audio works for Ryan > Freeman who also spoted that I forgot to regen WANTLIB. > > Comment / Ok ?
looks good. OK rfreeman@ -ryan > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/emulators/BasiliskII/Makefile,v > retrieving revision 1.29 > diff -u -p -u -p -r1.29 Makefile > --- Makefile 19 Aug 2012 22:30:37 -0000 1.29 > +++ Makefile 24 Nov 2012 08:28:46 -0000 > @@ -4,7 +4,7 @@ COMMENT= open source 68k Macintosh emul > > DISTNAME= BasiliskII_src_01052006 > PKGNAME= BasiliskII-1.0 > -REVISION= 4 > +REVISION= 5 > CATEGORIES= emulators > > HOMEPAGE= http://basilisk.cebix.net/ > @@ -20,25 +20,25 @@ MODULES= devel/gettext > MASTER_SITES= http://distfiles.nl/ > EXTRACT_SUFX= .tar.bz2 > > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi > +WANTLIB += SDL Xcomposite Xcursor Xdamage Xext Xfixes Xi > WANTLIB += Xinerama Xrandr Xrender Xxf86dga Xxf86vm atk-1.0 c > -WANTLIB += cairo esd expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 > -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 > -WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 > -WANTLIB += pthread sndio stdc++ z > +WANTLIB += cairo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 > +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread stdc++ z > +WANTLIB += GL X11 pixman-1 png pthread-stubs xcb xcb-render xcb-shm > > -LIB_DEPENDS= audio/esound \ > +LIB_DEPENDS= devel/sdl \ > x11/gtk+2 > > USE_GMAKE= Yes > USE_GROFF = Yes > > -AUTOCONF_VERSION= 2.59 > -CONFIGURE_STYLE= autoconf > - > WRKDIST= ${WRKDIR}/BasiliskII-1.0 > WRKSRC= ${WRKDIR}/BasiliskII-1.0/src/Unix > - > +CONFIGURE_STYLE= gnu > +CONFIGURE_ARGS= --enable-sdl-audio \ > + --with-esd=no \ > + --disable-fbdev-dga > NO_REGRESS= Yes > > post-install: > Index: patches/patch-src_Unix_configure_ac > =================================================================== > RCS file: > /cvs/ports/emulators/BasiliskII/patches/patch-src_Unix_configure_ac,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-src_Unix_configure_ac > --- patches/patch-src_Unix_configure_ac 25 Mar 2010 08:10:56 -0000 > 1.1 > +++ patches/patch-src_Unix_configure_ac 24 Nov 2012 08:28:46 -0000 > @@ -1,33 +0,0 @@ > -$OpenBSD: patch-src_Unix_configure_ac,v 1.1 2010/03/25 08:10:56 jasper Exp $ > ---- src/Unix/configure.ac.orig Thu Mar 25 08:53:10 2010 > -+++ src/Unix/configure.ac Thu Mar 25 08:54:55 2010 > -@@ -194,14 +194,23 @@ if [[ "x$WANT_SDL" = "xno" ]]; then > - fi > - > - dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL. > -+dnl For OpenBSD we should use -pthread > - HAVE_PTHREADS=yes > --AC_CHECK_LIB(pthread, pthread_create, , [ > -- AC_CHECK_LIB(c_r, pthread_create, , [ > -- AC_CHECK_LIB(PTL, pthread_create, , [ > -- HAVE_PTHREADS=no > -+case `uname` in > -+ OpenBSD*) > -+ LIBS="$LIBS -pthread" > -+ ;; > -+ *) > -+ AC_CHECK_LIB(pthread, pthread_create, , [ > -+ AC_CHECK_LIB(c_r, pthread_create, , [ > -+ AC_CHECK_LIB(PTL, pthread_create, , [ > -+ HAVE_PTHREADS=no > -+ ]) > -+ ]) > - ]) > -- ]) > --]) > -+ ;; > -+esac > -+ > - if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then > - AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.]) > - fi >
