From e7bc1df0099eebe76c634715bc90d10b2258ed48 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 30 Nov 2011 12:07:52 +0000 Subject: Update to 0.9.11, provided by Timothy Lee Roden in PR 45670: 0.9.10 -> 0.9.11 general: - Now using CMake as the default build system. For now, autotools based build and "custom" build systems are still supported. - New Cocoa port - Added a dynamic recompiling SH2 core for x86 and ARM - New SCSP implementation - Major update of the software renderer from the yabause-rr team - Added an option to allow to execute from the cache - Improvements to the OpenGL renderer carbon port: - Improvements gtk port: - Added command line option to enable/disable frame skipping / limiting. - Added frame skipping/limiting configuration in settings. - Added --autoload command line option - Vdp2 layers can be toggled from the Vdp2 debug window qt port: - Added command line support --- emulators/yabause/Makefile | 20 +++++++++++++------- emulators/yabause/distinfo | 9 ++++----- emulators/yabause/options.mk | 31 +++++++++++++++++++++++++++++++ emulators/yabause/patches/patch-aa | 26 -------------------------- 4 files changed, 48 insertions(+), 38 deletions(-) create mode 100644 emulators/yabause/options.mk delete mode 100644 emulators/yabause/patches/patch-aa (limited to 'emulators/yabause') diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile index 7b1791dd033..8db753593d3 100644 --- a/emulators/yabause/Makefile +++ b/emulators/yabause/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2011/11/01 06:01:11 sbd Exp $ +# $NetBSD: Makefile,v 1.14 2011/11/30 12:07:52 wiz Exp $ -DISTNAME= yabause-0.9.10 -PKGREVISION= 6 +DISTNAME= yabause-0.9.11 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yabause/} @@ -12,12 +11,19 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_CMAKE= yes USE_TOOLS+= pkg-config +USE_LANGUAGES+= c c++ +SUBST_CLASSES+= pkgmandir +SUBST_STAGE.pkgmandir= pre-configure +SUBST_FILES.pkgmandir= src/gtk/CMakeLists.txt src/qt/CMakeLists.txt +SUBST_SED.pkgmandir= -e "s,share/man,${PKGMANDIR}," +SUBST_MESSAGE.pkgmandir= Fixing hardcoded manual paths. + +.include "options.mk" + +.include "../../graphics/glut/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0nb4 -.include "../../graphics/gtkglext/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/yabause/distinfo b/emulators/yabause/distinfo index a579ede4bb5..ae711d59d71 100644 --- a/emulators/yabause/distinfo +++ b/emulators/yabause/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/09/12 14:06:47 wiz Exp $ +$NetBSD: distinfo,v 1.4 2011/11/30 12:07:52 wiz Exp $ -SHA1 (yabause-0.9.10.tar.gz) = 9fcdc11a1ebfb7161f4fb3b0cc0d646080403e8c -RMD160 (yabause-0.9.10.tar.gz) = 1dc3ebfe57ad3abd5cdc21c626ec12584373bf89 -Size (yabause-0.9.10.tar.gz) = 1376089 bytes -SHA1 (patch-aa) = d98c26c8c754e2b22c608a32964ff90329256179 +SHA1 (yabause-0.9.11.tar.gz) = cf47695ff1d2321d6ead0b2a872c3ca1922860a2 +RMD160 (yabause-0.9.11.tar.gz) = 5c8021345a88dce4b668a00fbe465ca87a0a217f +Size (yabause-0.9.11.tar.gz) = 1881959 bytes diff --git a/emulators/yabause/options.mk b/emulators/yabause/options.mk new file mode 100644 index 00000000000..42408f295d6 --- /dev/null +++ b/emulators/yabause/options.mk @@ -0,0 +1,31 @@ +# $NetBSD: options.mk,v 1.1 2011/11/30 12:07:52 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.yabause +PKG_SUPPORTED_OPTIONS= gtk openal qt +PKG_SUGGESTED_OPTIONS= gtk + +.include "../../mk/bsd.options.mk" + +#.if !empty(PKG_OPTIONS:Mdoxygen) +#BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen +#.endif + +.if !empty(PKG_OPTIONS:Mgtk) +CONFIGURE_ENV+= YAB_PORTS=gtk +CMAKE_ARGS+= -DYAB_PORTS=gtk +CMAKE_ARGS+= -DGTK2_GDKCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.gtk2}/lib/gtk-2.0/include +CMAKE_ARGS+= -DGTK2_GLIB_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0 +CMAKE_ARGS+= -DGTK2_GLIBCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include +BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0nb4 +.include "../../graphics/gtkglext/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mopenal) +.include "../../audio/openal/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mqt) +CONFIGURE_ENV+= YAB_PORTS=qt +CMAKE_ARGS+= -DYAB_PORTS=qt +.include "../../x11/qt4-tools/buildlink3.mk" +.endif diff --git a/emulators/yabause/patches/patch-aa b/emulators/yabause/patches/patch-aa deleted file mode 100644 index 5b5b40c0ded..00000000000 --- a/emulators/yabause/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/09/12 14:06:47 wiz Exp $ - ---- src/gtk/Makefile.in.orig 2009-05-31 21:06:27.000000000 +0000 -+++ src/gtk/Makefile.in -@@ -963,18 +963,10 @@ uninstall-am: uninstall-ApplicationsDATA - - install-data-hook: - @for f in "$(DESTDIR)$(Applicationsdir)/yabause.desktop" ; do \ -- fext=`echo $$f | sed 's,.\+\(\.[^.]\+\)$$,\1,'` ; \ -- fbase=`basename "$$f" $$fext` ; \ -- fdir=`dirname "$$f"` ; \ -- fdest="$$fdir"/`echo "$$fbase" | sed '$(transform)'`$$fext ; \ -- if test \( -e "$$f" \) -a \( ! "$$f" = "$$fdest" \) ; then \ -- echo " mv $$f $$fdest" ; \ -- mv "$$f" "$$fdest" ; \ -- fi ; \ - nn=`echo yabause | sed '$(transform)'` ; \ -- ftmp=/tmp/$$RANDOM ; \ -- sed "s/Exec=yabause/Exec=$$nn/" $$fdest > $$ftmp ; \ -- mv $$ftmp $$fdest ; \ -+ ftmp=$$f.$$$$ ; \ -+ sed "s/Exec=yabause/Exec=$$nn/" $$f > $$ftmp ; \ -+ mv $$ftmp $$f ; \ - done - - uninstall-hook: -- cgit v1.2.3