Index: head/games/super_methane_brothers/Makefile =================================================================== --- head/games/super_methane_brothers/Makefile (revision 446692) +++ head/games/super_methane_brothers/Makefile (revision 446693) @@ -1,49 +1,49 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ PORTNAME= super_methane_brothers PORTVERSION= 1.5.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/methane/Methane%20Stable/Methane%20V${PORTVERSION} DISTNAME= methane-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Port of the Amiga platform game of the same name LICENSE= GPLv2 LIB_DEPENDS= libclan23Core.so:devel/clanlib USES= execinfo gmake pkgconfig tar:tgz MAKE_ENV= METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LIBS}" MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lexecinfo DATADIR= ${PREFIX}/share/methane PORTDOCS= * PORTDATA= * PLIST_FILES= bin/methane OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ 's|-2.2|-2.3|g ; \ s|FLAGS =|FLAGS +=| ; \ s|LIBS =|LIBS +=| ; \ s|g++|$${CXX}| ; \ s|gcc|$${CXX}|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/methane ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC}/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKDIR}/${DISTNAME}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: head/games/super_methane_brothers/files/patch-sources__methane.cpp =================================================================== --- head/games/super_methane_brothers/files/patch-sources__methane.cpp (revision 446692) +++ head/games/super_methane_brothers/files/patch-sources__methane.cpp (nonexistent) @@ -1,24 +0,0 @@ ---- sources/methane.cpp.orig 2011-12-11 14:18:38.301132904 +0100 -+++ sources/methane.cpp 2011-12-11 14:15:32.669126965 +0100 -@@ -105,15 +105,15 @@ - return 0; - } - -- CL_AutoPtr setup_sound; -- CL_AutoPtr sound_output; -- CL_AutoPtr setup_mikmod; -+ CL_UniquePtr setup_sound; -+ CL_UniquePtr sound_output; -+ CL_UniquePtr setup_mikmod; - - if (GLOBAL_SoundEnable) - { -- setup_sound = new CL_SetupSound; -- sound_output = new CL_SoundOutput(44100); -- setup_mikmod = new CL_SetupMikMod; -+ setup_sound = cl_move(CL_UniquePtr(new CL_SetupSound)); -+ sound_output = cl_move(CL_UniquePtr(new CL_SoundOutput(44100))); -+ setup_mikmod = cl_move(CL_UniquePtr(new CL_SetupMikMod)); - } - - // Set the video mode Property changes on: head/games/super_methane_brothers/files/patch-sources__methane.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/super_methane_brothers/files/patch-sources_methane.cpp =================================================================== --- head/games/super_methane_brothers/files/patch-sources_methane.cpp (nonexistent) +++ head/games/super_methane_brothers/files/patch-sources_methane.cpp (revision 446693) @@ -0,0 +1,99 @@ +--- sources/methane.cpp.orig 2011-04-05 07:08:02 UTC ++++ sources/methane.cpp +@@ -12,10 +12,17 @@ + //------------------------------------------------------------------------------ + // Methane brothers main source file + //------------------------------------------------------------------------------ ++ ++#if !defined(__i386__) && !defined(__x86_64__) ++#define CL_DISABLE_SSE2 ++#endif ++ + #include + #include + #include ++#ifndef CL_DISABLE_SSE2 + #include ++#endif + #include + #include + #include +@@ -54,10 +61,14 @@ class SuperMethaneBrothers (public) + { + CL_SetupGL target_opengl2; + CL_SetupGL1 target_opengl1; ++#ifndef CL_DISABLE_SSE2 + CL_SetupSWRender target_swrender; + + // Since SWRender is compatible and fast - Use that as the default setting options + target_swrender.set_current(); ++#else ++ target_opengl2.set_current(); ++#endif + + if (get_options()) + { +@@ -69,9 +80,11 @@ class SuperMethaneBrothers (public) + case (opengl1): + target_opengl1.set_current(); + break; ++#ifndef CL_DISABLE_SSE2 + case (swrender): + target_swrender.set_current(); + break; ++#endif + } + } + else +@@ -80,15 +93,15 @@ class SuperMethaneBrothers (public) + return 0; + } + +- CL_AutoPtr setup_sound; +- CL_AutoPtr sound_output; +- CL_AutoPtr setup_mikmod; ++ CL_UniquePtr setup_sound; ++ CL_UniquePtr sound_output; ++ CL_UniquePtr setup_mikmod; + + if (GLOBAL_SoundEnable) + { +- setup_sound = new CL_SetupSound; +- sound_output = new CL_SoundOutput(44100); +- setup_mikmod = new CL_SetupMikMod; ++ setup_sound = cl_move(CL_UniquePtr(new CL_SetupSound)); ++ sound_output = cl_move(CL_UniquePtr(new CL_SoundOutput(44100))); ++ setup_mikmod = cl_move(CL_UniquePtr(new CL_SetupMikMod)); + } + + // Set the video mode +@@ -302,11 +315,13 @@ class SuperMethaneBrothers (public) + LastKey = 0; + GLOBAL_RenderTarget = opengl1; + } ++#ifndef CL_DISABLE_SSE2 + if ( (LastKey == 'r') || (LastKey == 'R') ) + { + LastKey = 0; + GLOBAL_RenderTarget = swrender; + } ++#endif + + gc.clear(CL_Colorf(0.0f,0.0f,0.2f)); + +@@ -330,6 +345,7 @@ class SuperMethaneBrothers (public) + { + options_font.draw_text(gc, 10, ypos, "OpenGL V1 - Disabled. Press 'E' to select"); + } ++#ifndef CL_DISABLE_SSE2 + ypos += 50; + if (GLOBAL_RenderTarget == swrender) + { +@@ -339,6 +355,7 @@ class SuperMethaneBrothers (public) + { + options_font.draw_text(gc, 10, ypos, "Software Renderer - Disabled. Press 'R' to select"); + } ++#endif + ypos += 100; + if (GLOBAL_SoundEnable) + { Property changes on: head/games/super_methane_brothers/files/patch-sources_methane.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property