Re: sndio for emulators/snes9x
On Mon, Apr 26, 2010 at 11:47:30AM -0700, Ryan Freeman wrote: On Sun, Apr 25, 2010 at 05:23:47PM +0100, Federico G. Schwindt wrote: [..] any idea? something not 100% up-to-date? Hrmm, weird. Can I have your config.log? Try the diff below instead. The previous one depends on a GCC diff I have in my tree. Sorry. f.- this newest diff allows the package to build, i too suffered from the same issue where it broke and hadn't had time to complain yet ;) packages and installs perfect now as of today's (apr 25) snapshot on i386. the only issue i notice with this update, while very nicely done gtk interface and runs so-so as long as i don't use scaling, well, the XVideo support is a nice way around that :) however, it acts a little strange on my machine. I have to go to fullscreen mode and then back to windowed to be able to use it in windowed mode. not much of an issue to me though, since it's a side effect of having fast fullscreen capabilities ;) is that the emulator slows to a complete crawl if you load a rom image whilst aucat is running as a daemon, it seems to really slow everything down when it goes to start audio. running snes9x-gtk without aucat running works. any clue as to why output with aucat is so bad? cheers, -ryan -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: sndio for emulators/snes9x
On Mon, Apr 26, 2010 at 10:11:33PM +, Jacob Meuser wrote: On Mon, Apr 26, 2010 at 11:47:30AM -0700, Ryan Freeman wrote: On Sun, Apr 25, 2010 at 05:23:47PM +0100, Federico G. Schwindt wrote: [..] any idea? something not 100% up-to-date? Hrmm, weird. Can I have your config.log? Try the diff below instead. The previous one depends on a GCC diff I have in my tree. Sorry. f.- this newest diff allows the package to build, i too suffered from the same issue where it broke and hadn't had time to complain yet ;) packages and installs perfect now as of today's (apr 25) snapshot on i386. the only issue i notice with this update, while very nicely done gtk interface and runs so-so as long as i don't use scaling, is that the emulator slows to a complete crawl if you load a rom image whilst aucat is running as a daemon, it seems to really slow everything down when it goes to start audio. running snes9x-gtk without aucat running works. any clue as to why output with aucat is so bad? cheers, try using a smaller block size with aucat, perhaps -z 512 or so. that did the trick actually, thanks jacob!
Re: sndio for emulators/snes9x
On Sun, Apr 25, 2010 at 05:23:47PM +0100, Federico G. Schwindt wrote: [..] any idea? something not 100% up-to-date? Hrmm, weird. Can I have your config.log? Try the diff below instead. The previous one depends on a GCC diff I have in my tree. Sorry. f.- this newest diff allows the package to build, i too suffered from the same issue where it broke and hadn't had time to complain yet ;) packages and installs perfect now as of today's (apr 25) snapshot on i386. the only issue i notice with this update, while very nicely done gtk interface and runs so-so as long as i don't use scaling, is that the emulator slows to a complete crawl if you load a rom image whilst aucat is running as a daemon, it seems to really slow everything down when it goes to start audio. running snes9x-gtk without aucat running works. any clue as to why output with aucat is so bad? cheers, -ryan
Re: sndio for emulators/snes9x
On Mon, Apr 26, 2010 at 11:47:30AM -0700, Ryan Freeman wrote: On Sun, Apr 25, 2010 at 05:23:47PM +0100, Federico G. Schwindt wrote: [..] any idea? something not 100% up-to-date? Hrmm, weird. Can I have your config.log? Try the diff below instead. The previous one depends on a GCC diff I have in my tree. Sorry. f.- this newest diff allows the package to build, i too suffered from the same issue where it broke and hadn't had time to complain yet ;) packages and installs perfect now as of today's (apr 25) snapshot on i386. the only issue i notice with this update, while very nicely done gtk interface and runs so-so as long as i don't use scaling, is that the emulator slows to a complete crawl if you load a rom image whilst aucat is running as a daemon, it seems to really slow everything down when it goes to start audio. running snes9x-gtk without aucat running works. any clue as to why output with aucat is so bad? cheers, try using a smaller block size with aucat, perhaps -z 512 or so. -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: sndio for emulators/snes9x
On Sun, Apr 25, 2010 at 02:45:37AM +, Jacob Meuser wrote: On Fri, Apr 23, 2010 at 08:24:38AM +0100, Federico G. Schwindt wrote: On Thu, Apr 22, 2010 at 12:55:54AM +0200, Antoine Jacoutot wrote: On Wed, 21 Apr 2010, Federico G. Schwindt wrote: On Mon, Apr 19, 2010 at 06:31:26PM +0100, Federico G. Schwindt wrote: On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote: I enabled using a separate thread for sounds by default. it's possible that the audio block size would be large enough that X events would be blocked for too long and timeout, returning an error. but having the sound handled in a different thread this does not happen. imo, seems to overall work better than when it was using audio(4). please test. Instead of this, please try the update to 1.52 below that includes SDL for audio. Slightly tested with a Super Turrican, Aero Fighters and Addams Family values. Unless I heard any objections I will commit this on Saturday, so if you care please test now. Can you please regen PLIST and add the gtk-update-icon-cache goo. Thank you. Updated below: `/sandbox/portobj/snes9x-1.52/fake-i386/.fake_done' is up to date. === Building package for snes9x-1.52 Create /usr/ports/packages/i386/all/snes9x-1.52.tgz Reading plist... Checksumming...Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/es_VE/LC_MESSAGES/snes9x-gtk.mo does not exist Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo does not exist Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo does not exist Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/s...@latin/LC_MESSAGES/snes9x-gtk.mo does not exist === Cleaning for snes9x-1.52 rm -f /usr/ports/packages/i386/all/snes9x-1.52.tgz /usr/ports/packages/i386/ftp/snes9x-1.52.tgz *** Error code 1 Stop in /home/src/ports/emulators/snes9x (line 1503 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /home/src/ports/emulators/snes9x (line 2044 of /usr/ports/infrastructure/mk/bsd.port.mk). any idea? something not 100% up-to-date? Hrmm, weird. Can I have your config.log? f.-
Re: sndio for emulators/snes9x
[..]
any idea? something not 100% up-to-date?
Hrmm, weird. Can I have your config.log?
Try the diff below instead. The previous one depends on a GCC diff I have
in my tree. Sorry.
f.-
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.10
+++ Makefile25 Apr 2010 16:22:21 -
@@ -1,48 +1,68 @@
# $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
-COMMENT= emulates the Super Nintendo Entertainment System
+COMMENT = emulates the Super Nintendo Entertainment System
-DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
-CATEGORIES=emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME = ${DISTNAME:S/-src//}
+CATEGORIES = emulators games
-HOMEPAGE= http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
# non-commercial
-PERMIT_PACKAGE_CDROM= No
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+ xcb xcb-render xcb-render-util z
-MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
- http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
-LIB_DEPENDS= png::graphics/png
+BUILD_DEPENDS =::textproc/intltool
+RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS = glade-2.0::devel/libglade2 \
+ SDL::devel/sdl \
+ png::graphics/png \
+ xml2::textproc/libxml \
+ gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS= ::devel/nasm
+BUILD_DEPENDS = ::devel/nasm
.endif
-AUTOCONF_VERSION= 2.59
+MODULES = devel/gettext
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+USE_X11 = Yes
+USE_GMAKE =Yes
-NO_REGRESS=Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+--without-portaudio \
+--without-oss \
+--without-alsa \
+--without-pulseaudio \
+--without-opengl
+CONFIGURE_ENV = CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+ LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib \
+ DATADIRNAME=share
-post-configure:
- @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS = Yes
-do-install:
+WRKSRC = ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
- ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} \
+ control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+ ${PREFIX}/share/doc/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} snes9x.conf.default \
+ ${PREFIX}/share/examples/snes9x
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p distinfo
--- distinfo9 Sep 2007 15:17:06 - 1.4
+++ distinfo25 Apr 2010 16:22:21 -
@@ -1,5 +1,5 @@
-MD5 (snes9x-1.51-src.tar.bz2) = oQOMx2H0ADGM3O2WCXL4pw==
-RMD160 (snes9x-1.51-src.tar.bz2) = WBNAWwXxgSJGFPlei6PDCfeeGzY=
-SHA1 (snes9x-1.51-src.tar.bz2) = oN4j+zdkY9J/To/H8RQkvTxZhYU=
-SHA256 (snes9x-1.51-src.tar.bz2) = cMj0H8fx4ABgUSfg9CYePrUscgGbPL+byAYbC4zN9oc=
-SIZE (snes9x-1.51-src.tar.bz2) = 1707256
+MD5 (snes9x-1.52-src.tar.bz2) = gTvToPmXMu4COKLIq0F3JQ==
+RMD160 (snes9x-1.52-src.tar.bz2) = 7H+FBY5FcdiaZaidPwni5A2wy8w=
+SHA1 (snes9x-1.52-src.tar.bz2) = +zlXto/O3oglGFFglKc+xbvtds8=
+SHA256 (snes9x-1.52-src.tar.bz2) = NuCbLaYrkhD+siTP0YMEehUaccHV5fknSdwovUt/8cs=
+SIZE (snes9x-1.52-src.tar.bz2) = 1720137
Index: patches/patch-configure_in
===
RCS file: /cvs/ports/emulators/snes9x/patches/patch-configure_in,v
retrieving revision 1.1
diff -N -u -p patches/patch-configure_in
Re: sndio for emulators/snes9x
On Fri, Apr 23, 2010 at 08:24:38AM +0100, Federico G. Schwindt wrote: On Thu, Apr 22, 2010 at 12:55:54AM +0200, Antoine Jacoutot wrote: On Wed, 21 Apr 2010, Federico G. Schwindt wrote: On Mon, Apr 19, 2010 at 06:31:26PM +0100, Federico G. Schwindt wrote: On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote: I enabled using a separate thread for sounds by default. it's possible that the audio block size would be large enough that X events would be blocked for too long and timeout, returning an error. but having the sound handled in a different thread this does not happen. imo, seems to overall work better than when it was using audio(4). please test. Instead of this, please try the update to 1.52 below that includes SDL for audio. Slightly tested with a Super Turrican, Aero Fighters and Addams Family values. Unless I heard any objections I will commit this on Saturday, so if you care please test now. Can you please regen PLIST and add the gtk-update-icon-cache goo. Thank you. Updated below: `/sandbox/portobj/snes9x-1.52/fake-i386/.fake_done' is up to date. === Building package for snes9x-1.52 Create /usr/ports/packages/i386/all/snes9x-1.52.tgz Reading plist... Checksumming...Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/es_VE/LC_MESSAGES/snes9x-gtk.mo does not exist Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/fr_FR/LC_MESSAGES/snes9x-gtk.mo does not exist Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/pt_BR/LC_MESSAGES/snes9x-gtk.mo does not exist Error in package: /sandbox/portobj/snes9x-1.52/fake-i386/usr/local/share/locale/s...@latin/LC_MESSAGES/snes9x-gtk.mo does not exist === Cleaning for snes9x-1.52 rm -f /usr/ports/packages/i386/all/snes9x-1.52.tgz /usr/ports/packages/i386/ftp/snes9x-1.52.tgz *** Error code 1 Stop in /home/src/ports/emulators/snes9x (line 1503 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /home/src/ports/emulators/snes9x (line 2044 of /usr/ports/infrastructure/mk/bsd.port.mk). any idea? something not 100% up-to-date? -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: sndio for emulators/snes9x
On Thu, Apr 22, 2010 at 12:55:54AM +0200, Antoine Jacoutot wrote:
On Wed, 21 Apr 2010, Federico G. Schwindt wrote:
On Mon, Apr 19, 2010 at 06:31:26PM +0100, Federico G. Schwindt wrote:
On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote:
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
Instead of this, please try the update to 1.52 below that includes SDL
for audio. Slightly tested with a Super Turrican, Aero Fighters and
Addams Family values.
Unless I heard any objections I will commit this on Saturday, so if you
care please test now.
Can you please regen PLIST and add the gtk-update-icon-cache goo.
Thank you.
Updated below:
Index: emulators/snes9x/Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p emulators/snes9x/Makefile
--- emulators/snes9x/Makefile 10 Aug 2009 06:31:09 - 1.10
+++ emulators/snes9x/Makefile 23 Apr 2010 07:23:41 -
@@ -1,48 +1,67 @@
# $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
-COMMENT= emulates the Super Nintendo Entertainment System
+COMMENT = emulates the Super Nintendo Entertainment System
-DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
-CATEGORIES=emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME = ${DISTNAME:S/-src//}
+CATEGORIES = emulators games
-HOMEPAGE= http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
# non-commercial
-PERMIT_PACKAGE_CDROM= No
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+ xcb xcb-render xcb-render-util z
-MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
- http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
-LIB_DEPENDS= png::graphics/png
+BUILD_DEPENDS =::textproc/intltool
+RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS = glade-2.0::devel/libglade2 \
+ SDL::devel/sdl \
+ png::graphics/png \
+ xml2::textproc/libxml \
+ gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS= ::devel/nasm
+BUILD_DEPENDS = ::devel/nasm
.endif
-AUTOCONF_VERSION= 2.59
+MODULES = devel/gettext
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+USE_X11 = Yes
+USE_GMAKE =Yes
-NO_REGRESS=Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+--without-portaudio \
+--without-oss \
+--without-alsa \
+--without-pulseaudio \
+--without-opengl
+CONFIGURE_ENV = CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+ LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-post-configure:
- @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS = Yes
-do-install:
+WRKSRC = ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
- ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} \
+ control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+ ${PREFIX}/share/doc/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} snes9x.conf.default \
+ ${PREFIX}/share/examples/snes9x
.include bsd.port.mk
Index: emulators/snes9x/distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p emulators/snes9x/distinfo
--- emulators/snes9x/distinfo 9 Sep 2007 15:17:06 - 1.4
+++
Re: sndio for emulators/snes9x
On Mon, Apr 19, 2010 at 06:31:26PM +0100, Federico G. Schwindt wrote:
On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote:
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
Instead of this, please try the update to 1.52 below that includes SDL
for audio. Slightly tested with a Super Turrican, Aero Fighters and
Addams Family values.
Unless I heard any objections I will commit this on Saturday, so if you
care please test now.
f.-
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile 10 Aug 2009 06:31:09 - 1.10
+++ Makefile 19 Apr 2010 17:15:48 -
@@ -1,48 +1,67 @@
# $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
-COMMENT= emulates the Super Nintendo Entertainment System
+COMMENT =emulates the Super Nintendo Entertainment System
-DISTNAME=snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
-CATEGORIES= emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME =${DISTNAME:S/-src//}
+CATEGORIES = emulators games
-HOMEPAGE=http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
# non-commercial
-PERMIT_PACKAGE_CDROM=No
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= No
-PERMIT_DISTFILES_FTP=Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB+=X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB =X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+ xcb xcb-render xcb-render-util z
-MASTER_SITES=http://vincent.grigorieff.free.fr/snes9x/ \
- http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX=.tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
-LIB_DEPENDS= png::graphics/png
+BUILD_DEPENDS = ::textproc/intltool
+RUN_DEPENDS =:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS =glade-2.0::devel/libglade2 \
+ SDL::devel/sdl \
+ png::graphics/png \
+ xml2::textproc/libxml \
+ gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS= ::devel/nasm
+BUILD_DEPENDS = ::devel/nasm
.endif
-AUTOCONF_VERSION=2.59
+MODULES =devel/gettext
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+USE_X11 =Yes
+USE_GMAKE = Yes
-NO_REGRESS= Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+ --without-portaudio \
+ --without-oss \
+ --without-alsa \
+ --without-pulseaudio \
+ --without-opengl
+CONFIGURE_ENV = CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+ LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-post-configure:
- @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS = Yes
-do-install:
+WRKSRC = ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
- ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} \
+ control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+ ${PREFIX}/share/doc/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} snes9x.conf.default \
+ ${PREFIX}/share/examples/snes9x
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p distinfo
--- distinfo 9 Sep 2007 15:17:06 - 1.4
+++ distinfo 19 Apr 2010 17:15:48 -
@@ -1,5 +1,5 @@
-MD5 (snes9x-1.51-src.tar.bz2) = oQOMx2H0ADGM3O2WCXL4pw==
-RMD160 (snes9x-1.51-src.tar.bz2) = WBNAWwXxgSJGFPlei6PDCfeeGzY=
-SHA1 (snes9x-1.51-src.tar.bz2) = oN4j+zdkY9J/To/H8RQkvTxZhYU=
-SHA256 (snes9x-1.51-src.tar.bz2) =
Re: sndio for emulators/snes9x
On Wed, 21 Apr 2010, Federico G. Schwindt wrote:
On Mon, Apr 19, 2010 at 06:31:26PM +0100, Federico G. Schwindt wrote:
On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote:
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
Instead of this, please try the update to 1.52 below that includes SDL
for audio. Slightly tested with a Super Turrican, Aero Fighters and
Addams Family values.
Unless I heard any objections I will commit this on Saturday, so if you
care please test now.
Can you please regen PLIST and add the gtk-update-icon-cache goo.
Thank you.
f.-
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.10
+++ Makefile19 Apr 2010 17:15:48 -
@@ -1,48 +1,67 @@
# $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
-COMMENT= emulates the Super Nintendo Entertainment System
+COMMENT = emulates the Super Nintendo Entertainment System
-DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
-CATEGORIES=emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME = ${DISTNAME:S/-src//}
+CATEGORIES = emulators games
-HOMEPAGE= http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
# non-commercial
-PERMIT_PACKAGE_CDROM= No
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+ xcb xcb-render xcb-render-util z
-MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
- http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
-LIB_DEPENDS= png::graphics/png
+BUILD_DEPENDS =::textproc/intltool
+RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS = glade-2.0::devel/libglade2 \
+ SDL::devel/sdl \
+ png::graphics/png \
+ xml2::textproc/libxml \
+ gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS= ::devel/nasm
+BUILD_DEPENDS = ::devel/nasm
.endif
-AUTOCONF_VERSION= 2.59
+MODULES = devel/gettext
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+USE_X11 = Yes
+USE_GMAKE =Yes
-NO_REGRESS=Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+--without-portaudio \
+--without-oss \
+--without-alsa \
+--without-pulseaudio \
+--without-opengl
+CONFIGURE_ENV = CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+ LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-post-configure:
- @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS = Yes
-do-install:
+WRKSRC = ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
- ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} \
+ control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+ ${PREFIX}/share/doc/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} snes9x.conf.default \
+ ${PREFIX}/share/examples/snes9x
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p distinfo
--- distinfo9 Sep 2007 15:17:06 - 1.4
+++ distinfo19 Apr 2010 17:15:48 -
@@ -1,5 +1,5 @@
-MD5
sndio for emulators/snes9x
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.10
+++ Makefile19 Apr 2010 06:22:18 -
@@ -3,7 +3,7 @@
COMMENT= emulates the Super Nintendo Entertainment System
DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
+PKGNAME= ${DISTNAME:S/-src//}p1
CATEGORIES=emulators games
HOMEPAGE= http://www.snes9x.com/
@@ -14,7 +14,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=No
PERMIT_DISTFILES_FTP= Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs sndio \
+ stdc++ xcb z
MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
http://files.ipherswipsite.com/snes9x/
@@ -31,8 +32,8 @@ AUTOCONF_VERSION= 2.59
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng
-DUSE_SNDIO \
+ LIBS=-L${LOCALBASE}/lib -lsndio
NO_REGRESS=Yes
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N -u -p patches/patch-Makefile_in
--- /dev/null 19 Apr 2010 00:22:18 -
+++ patches/patch-Makefile_in 19 Apr 2010 06:22:18 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Thu Jan 14 18:00:24 2010
Makefile.inThu Jan 14 18:00:42 2010
+@@ -133,7 +133,7 @@ endif
+
+ ifdef THREAD_SOUND
+ CPUDEFINES += -DUSE_THREADS
+-EXTRALIBS += -lpthread
++EXTRALIBS += -pthread
+ endif
+
+ ifdef GLIDE
Index: patches/patch-snes9x_cpp
===
RCS file: patches/patch-snes9x_cpp
diff -N -u -p patches/patch-snes9x_cpp
--- /dev/null 19 Apr 2010 00:22:18 -
+++ patches/patch-snes9x_cpp19 Apr 2010 06:22:18 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- snes9x.cpp.origSun Apr 18 22:15:16 2010
snes9x.cpp Sun Apr 18 22:16:04 2010
+@@ -1160,7 +1160,7 @@ void S9xLoadConfigFiles(char **argv, int argc){
+ Settings.InterpolatedSound = TRUE;
+ }
+ #ifdef USE_THREADS
+-Settings.ThreadSound=conf.GetBool(Sound::ThreadSound, false);
++Settings.ThreadSound=conf.GetBool(Sound::ThreadSound, true);
+ #endif
+ if(conf.Exists(Sound::AltDecode)){
+ Settings.AltSampleDecode=conf.GetInt(Sound::AltDecode, 1);
Index: patches/patch-soundux_h
===
RCS file: /cvs/ports/emulators/snes9x/patches/patch-soundux_h,v
retrieving revision 1.1
diff -N -u -p patches/patch-soundux_h
--- patches/patch-soundux_h 9 Sep 2007 15:17:06 - 1.1
+++ patches/patch-soundux_h 19 Apr 2010 06:22:18 -
@@ -1,12 +1,23 @@
$OpenBSD: patch-soundux_h,v 1.1 2007/09/09 15:17:06 fgsch Exp $
soundux.h.orig Thu Sep 6 13:10:15 2007
-+++ soundux.h Thu Sep 6 13:10:30 2007
-@@ -220,7 +220,7 @@ typedef struct {
+--- soundux.h.orig Sat Apr 28 17:51:22 2007
soundux.h Thu Jan 14 12:02:20 2010
+@@ -206,6 +206,9 @@ enum
+ #define ENV_MAX 0x7FF
+ #define ENV_SHIFT 4
+
++#ifdef USE_SNDIO
++#include sndio.h
++#endif
+ #ifdef __sgi
+ #include audio.h
+ #endif /* __sgi */
+@@ -220,6 +223,9 @@ typedef struct {
int stereo;
// stereo or mono
bool8 sixteen_bit;// 16bit or
8bit sample
bool8 encoded;// **
port specific
--#ifdef __sun
-+#if defined(__sun) || defined(__OpenBSD__)
++#ifdef USE_SNDIO
++ struct sio_hdl *hdl; // ** port
specific
++#endif
+ #ifdef __sun
int last_eof;
// ** port specific
#endif
- #ifdef __sgi
Index: patches/patch-unix_unix_cpp
===
RCS file: /cvs/ports/emulators/snes9x/patches/patch-unix_unix_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-unix_unix_cpp
--- patches/patch-unix_unix_cpp 9 Sep 2007 15:17:06 - 1.1
+++ patches/patch-unix_unix_cpp 19 Apr 2010 06:22:18 -
@@ -1,27 +1,19 @@
Re: sndio for emulators/snes9x
On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote:
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
Instead of this, please try the update to 1.52 below that includes SDL
for audio. Slightly tested with a Super Turrican, Aero Fighters and
Addams Family values.
Thanks.
f.-
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.10
+++ Makefile19 Apr 2010 17:15:48 -
@@ -1,48 +1,67 @@
# $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
-COMMENT= emulates the Super Nintendo Entertainment System
+COMMENT = emulates the Super Nintendo Entertainment System
-DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
-CATEGORIES=emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME = ${DISTNAME:S/-src//}
+CATEGORIES = emulators games
-HOMEPAGE= http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
# non-commercial
-PERMIT_PACKAGE_CDROM= No
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+ xcb xcb-render xcb-render-util z
-MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
- http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
-LIB_DEPENDS= png::graphics/png
+BUILD_DEPENDS =::textproc/intltool
+RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS = glade-2.0::devel/libglade2 \
+ SDL::devel/sdl \
+ png::graphics/png \
+ xml2::textproc/libxml \
+ gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS= ::devel/nasm
+BUILD_DEPENDS = ::devel/nasm
.endif
-AUTOCONF_VERSION= 2.59
+MODULES = devel/gettext
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+USE_X11 = Yes
+USE_GMAKE =Yes
-NO_REGRESS=Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+--without-portaudio \
+--without-oss \
+--without-alsa \
+--without-pulseaudio \
+--without-opengl
+CONFIGURE_ENV = CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+ LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-post-configure:
- @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS = Yes
-do-install:
+WRKSRC = ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
- ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} \
+ control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+ ${PREFIX}/share/doc/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} snes9x.conf.default \
+ ${PREFIX}/share/examples/snes9x
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p distinfo
--- distinfo9 Sep 2007 15:17:06 - 1.4
+++ distinfo19 Apr 2010 17:15:48 -
@@ -1,5 +1,5 @@
-MD5 (snes9x-1.51-src.tar.bz2) = oQOMx2H0ADGM3O2WCXL4pw==
-RMD160 (snes9x-1.51-src.tar.bz2) = WBNAWwXxgSJGFPlei6PDCfeeGzY=
-SHA1 (snes9x-1.51-src.tar.bz2) = oN4j+zdkY9J/To/H8RQkvTxZhYU=
-SHA256 (snes9x-1.51-src.tar.bz2) = cMj0H8fx4ABgUSfg9CYePrUscgGbPL+byAYbC4zN9oc=
-SIZE (snes9x-1.51-src.tar.bz2) = 1707256
+MD5 (snes9x-1.52-src.tar.bz2) = gTvToPmXMu4COKLIq0F3JQ==
+RMD160 (snes9x-1.52-src.tar.bz2) = 7H+FBY5FcdiaZaidPwni5A2wy8w=
+SHA1 (snes9x-1.52-src.tar.bz2) =
