Re: fix games/warzone2100 on amd64
On Mon, May 23, 2011 at 10:32 PM, Brad wrote: > On 23/05/11 1:07 PM, David Coppa wrote: >> >> On Mon, May 23, 2011 at 6:08 PM, Pascal Stumpf >> wrote: >>> >>> On Mon, May 23, 2011 at 12:03:33PM -0400, Brad wrote: On 23/05/11 5:44 AM, Pascal Stumpf wrote: > > This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound > is > still choppy, but that's a different issue. > > Any more testers? :) Sort the ONLY_FOR_ARCHS line. >>> >>> Sure. >> >> So... Brad, ok for this to go in? > > No. Even with this patch I'm still seeing crashes. Ok. Thanks for testing.
Re: fix games/warzone2100 on amd64
On 23/05/11 1:07 PM, David Coppa wrote: On Mon, May 23, 2011 at 6:08 PM, Pascal Stumpf wrote: On Mon, May 23, 2011 at 12:03:33PM -0400, Brad wrote: On 23/05/11 5:44 AM, Pascal Stumpf wrote: This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is still choppy, but that's a different issue. Any more testers? :) Sort the ONLY_FOR_ARCHS line. Sure. So... Brad, ok for this to go in? No. Even with this patch I'm still seeing crashes. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: fix games/warzone2100 on amd64
- Original message - > On Mon, May 23, 2011 at 6:08 PM, Pascal Stumpf > wrote: > > On Mon, May 23, 2011 at 12:03:33PM -0400, Brad wrote: > > > On 23/05/11 5:44 AM, Pascal Stumpf wrote: > > > > This patch (from FreeBSD) pretty much fixes warzone2100 for me. > > > > Sound is still choppy, but that's a different issue. > > > > > > > > Any more testers? :) > > > > > > Sort the ONLY_FOR_ARCHS line. > > Sure. > > So... Brad, ok for this to go in? I was going to test this but it'll take longer since the R600/R700 diff still hasn't been commited. I'll get back to you in about 2 hrs time when I'm home. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: fix games/warzone2100 on amd64
On Mon, May 23, 2011 at 6:08 PM, Pascal Stumpf wrote: > On Mon, May 23, 2011 at 12:03:33PM -0400, Brad wrote: >> On 23/05/11 5:44 AM, Pascal Stumpf wrote: >> >This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is >> >still choppy, but that's a different issue. >> > >> >Any more testers? :) >> >> Sort the ONLY_FOR_ARCHS line. > Sure. So... Brad, ok for this to go in? Ciao, David
Re: fix games/warzone2100 on amd64
On Mon, May 23, 2011 at 12:03:33PM -0400, Brad wrote:
> On 23/05/11 5:44 AM, Pascal Stumpf wrote:
> >This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is
> >still choppy, but that's a different issue.
> >
> >Any more testers? :)
>
> Sort the ONLY_FOR_ARCHS line.
Sure.
Index: Makefile
===
RCS file: /cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile28 Apr 2011 18:38:04 - 1.15
+++ Makefile23 May 2011 16:06:48 -
@@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2011/04/28 18:38:04 jasper Exp $
-ONLY_FOR_ARCHS=i386
+ONLY_FOR_ARCHS=amd64 i386
COMMENT= 3D realtime strategy on a future earth
DISTNAME= warzone2100-2.3.7
-REVISION= 0
+REVISION= 1
CATEGORIES=games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/games/warzone2100/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 28 Apr 2011 18:38:04 - 1.3
+++ patches/patch-configure_ac 23 May 2011 16:06:48 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2011/04/28 18:38:04 jasper Exp $
configure.ac.orig Fri Jan 21 15:52:00 2011
-+++ configure.ac Sat Jan 29 21:18:41 2011
-@@ -414,7 +411,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
+--- configure.ac.orig Fri Jan 21 21:52:00 2011
configure.ac Mon May 23 10:56:14 2011
+@@ -414,7 +414,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
# Look for PhysicsFS
AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
Index: patches/patch-lib_ivis_opengl_GLee_h
===
RCS file: patches/patch-lib_ivis_opengl_GLee_h
diff -N patches/patch-lib_ivis_opengl_GLee_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_ivis_opengl_GLee_h23 May 2011 16:06:48 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- lib/ivis_opengl/GLee.h.origMon May 23 11:01:36 2011
lib/ivis_opengl/GLee.h Mon May 23 11:02:05 2011
+@@ -817,7 +817,6 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range;
+ #ifndef GLX_ARB_get_proc_address
+ #define GLX_ARB_get_proc_address 1
+
+- typedef void (*__GLXextFuncPtr)(void);
+ extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+ extern void ( * glXGetProcAddressARB (const GLubyte
*procName))(void);
+ typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const
GLubyte *procName);
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
Re: fix games/warzone2100 on amd64
On 23/05/11 5:44 AM, Pascal Stumpf wrote: This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is still choppy, but that's a different issue. Any more testers? :) Sort the ONLY_FOR_ARCHS line. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: fix games/warzone2100 on amd64
On 23/05/11 6:09 AM, Pascal Stumpf wrote: On Mon, May 23, 2011 at 12:04:43PM +0200, David Coppa wrote: On Mon, May 23, 2011 at 11:44 AM, Pascal Stumpf wrote: This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is still choppy, but that's a different issue. Any more testers? :) Where this patch come from? I cannot find it into FreeBSD cvs (ports/games/warzone2100) It's a sed line in the Makefile. Don't expect sanity from their ports tree. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: fix games/warzone2100 on amd64
On Mon, May 23, 2011 at 12:04:43PM +0200, David Coppa wrote:
> On Mon, May 23, 2011 at 11:44 AM, Pascal Stumpf
> wrote:
> > This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is
> > still choppy, but that's a different issue.
> >
> > Any more testers? :)
>
> Where this patch come from? I cannot find it into FreeBSD cvs
> (ports/games/warzone2100)
It's a sed line in the Makefile.
>
> Cheers!
> David
>
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/warzone2100/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -r1.15 Makefile
> > --- Makefile 28 Apr 2011 18:38:04 - 1.15
> > +++ Makefile 23 May 2011 09:41:48 -
> > @@ -1,11 +1,11 @@
> > # $OpenBSD: Makefile,v 1.15 2011/04/28 18:38:04 jasper Exp $
> >
> > -ONLY_FOR_ARCHS= i386
> > +ONLY_FOR_ARCHS= i386 amd64
> >
> > COMMENT= 3D realtime strategy on a future earth
> >
> > DISTNAME= warzone2100-2.3.7
> > -REVISION= 0
> > +REVISION= 1
> > CATEGORIES= games
> > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
> >
> > Index: patches/patch-configure_ac
> > ===
> > RCS file: /cvs/ports/games/warzone2100/patches/patch-configure_ac,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 patch-configure_ac
> > --- patches/patch-configure_ac 28 Apr 2011 18:38:04 - 1.3
> > +++ patches/patch-configure_ac 23 May 2011 09:41:48 -
> > @@ -1,7 +1,7 @@
> > $OpenBSD: patch-configure_ac,v 1.3 2011/04/28 18:38:04 jasper Exp $
> > configure.ac.orig Fri Jan 21 15:52:00 2011
> > -+++ configure.ac Sat Jan 29 21:18:41 2011
> > -@@ -414,7 +411,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
> > +--- configure.ac.orig Fri Jan 21 21:52:00 2011
> > configure.ac Mon May 23 10:56:14 2011
> > +@@ -414,7 +414,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
> >
> > # Look for PhysicsFS
> > AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
> > Index: patches/patch-lib_ivis_opengl_GLee_h
> > ===
> > RCS file: patches/patch-lib_ivis_opengl_GLee_h
> > diff -N patches/patch-lib_ivis_opengl_GLee_h
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-lib_ivis_opengl_GLee_h 23 May 2011 09:41:48 -
> > @@ -0,0 +1,11 @@
> > +$OpenBSD$
> > +--- lib/ivis_opengl/GLee.h.orig Mon May 23 11:01:36 2011
> > lib/ivis_opengl/GLee.h Mon May 23 11:02:05 2011
> > +@@ -817,7 +817,6 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range;
> > + #ifndef GLX_ARB_get_proc_address
> > + #define GLX_ARB_get_proc_address 1
> > +
> > +- typedef void (*__GLXextFuncPtr)(void);
> > + extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
> > + extern void ( * glXGetProcAddressARB (const GLubyte
> > *procName))(void);
> > + typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const
> > GLubyte *procName);
> >
> >
>
>
Re: fix games/warzone2100 on amd64
On Mon, May 23, 2011 at 11:44 AM, Pascal Stumpf wrote:
> This patch (from FreeBSD) pretty much fixes warzone2100 for me. Sound is
> still choppy, but that's a different issue.
>
> Any more testers? :)
Where this patch come from? I cannot find it into FreeBSD cvs
(ports/games/warzone2100)
Cheers!
David
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/warzone2100/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 28 Apr 2011 18:38:04 - 1.15
> +++ Makefile 23 May 2011 09:41:48 -
> @@ -1,11 +1,11 @@
> # $OpenBSD: Makefile,v 1.15 2011/04/28 18:38:04 jasper Exp $
>
> -ONLY_FOR_ARCHS= i386
> +ONLY_FOR_ARCHS= i386 amd64
>
> COMMENT= 3D realtime strategy on a future earth
>
> DISTNAME= warzone2100-2.3.7
> -REVISION= 0
> +REVISION= 1
> CATEGORIES= games
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
>
> Index: patches/patch-configure_ac
> ===
> RCS file: /cvs/ports/games/warzone2100/patches/patch-configure_ac,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-configure_ac
> --- patches/patch-configure_ac 28 Apr 2011 18:38:04 - 1.3
> +++ patches/patch-configure_ac 23 May 2011 09:41:48 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure_ac,v 1.3 2011/04/28 18:38:04 jasper Exp $
> configure.ac.orig Fri Jan 21 15:52:00 2011
> -+++ configure.ac Sat Jan 29 21:18:41 2011
> -@@ -414,7 +411,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
> +--- configure.ac.orig Fri Jan 21 21:52:00 2011
> configure.ac Mon May 23 10:56:14 2011
> +@@ -414,7 +414,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
>
> # Look for PhysicsFS
> AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
> Index: patches/patch-lib_ivis_opengl_GLee_h
> ===
> RCS file: patches/patch-lib_ivis_opengl_GLee_h
> diff -N patches/patch-lib_ivis_opengl_GLee_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_ivis_opengl_GLee_h 23 May 2011 09:41:48 -
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- lib/ivis_opengl/GLee.h.orig Mon May 23 11:01:36 2011
> lib/ivis_opengl/GLee.h Mon May 23 11:02:05 2011
> +@@ -817,7 +817,6 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range;
> + #ifndef GLX_ARB_get_proc_address
> + #define GLX_ARB_get_proc_address 1
> +
> +- typedef void (*__GLXextFuncPtr)(void);
> + extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
> + extern void ( * glXGetProcAddressARB (const GLubyte
> *procName))(void);
> + typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const
> GLubyte *procName);
>
>
