Date: Thu, 20 Jan 2011 14:00:26 GMT From: Rusty Nejdl <rnejdl@ringofsaturn.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/150883: Ports games/openastromenace won't compile on 64 bit Message-ID: <201101201400.p0KE0Q8R067370@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/150883; it has been noted by GNATS.
From: Rusty Nejdl <rnejdl@ringofsaturn.com>
To: Anonymous <swell.k@gmail.com>
Cc: <bug-followup@FreeBSD.org>
Subject: Re: ports/150883: Ports games/openastromenace won't compile on 64 bit
Date: Thu, 20 Jan 2011 07:59:58 -0600
--=_85a4008d76698921234f2841c0cf2496
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=UTF-8
On Thu, 20 Jan 2011 00:38:43 +0300, Anonymous wrote:
> Can you
try below diff? It should also fix build with gcc45.
>
> --- a.diff
begins here ---
> Index: games/openastromenace/Makefile
>
===================================================================
>
RCS file: /a/.cvsup/ports/games/openastromenace/Makefile,v
> retrieving
revision 1.10
> diff -u -p -r1.10 Makefile
> ---
games/openastromenace/Makefile 6 Jun 2010 20:43:48 -0000 1.10
> +++
games/openastromenace/Makefile 19 Jan 2011 21:24:51 -0000
> @@ -7,7 +7,7
@@
>
> PORTNAME= openastromenace
> PORTVERSION= 1.2.0
> -PORTREVISION=
9
> +PORTREVISION= 10
> CATEGORIES= games
> MASTER_SITES= SF
>
DISTFILES= openamenace-src-${PORTVERSION}${EXTRACT_SUFX}
> @@ -44,6
+44,10 @@ LANGPACK= ru
> IGNORE= cannot be build without/with multiple
language packs. Please rerun 'make config' and select single language
pack
> .endif
>
> +.if !defined(WITHOUT_NOUVEAU)
> +CFLAGS+=
-DOLD_MESA
> +.endif
> +
> post-patch:
> ${REINPLACE_CMD} -e
's|/usr/local/share/openastromenace|${DATADIR}|'
>
${WRKSRC}/AstroMenaceSource/Main.cpp
> Index:
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
>
===================================================================
>
RCS file:
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
> diff
-N games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
> ---
/dev/null 1 Jan 1970 00:00:00 -0000
> +++
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h 19 Jan
2011 21:19:09 -0000
> @@ -0,0 +1,17 @@
> +---
AstroMenaceSource/Core/Base.h~
> ++++ AstroMenaceSource/Core/Base.h
>
+@@ -46,10 +46,14 @@
> + #include // Header File For The OpenGL32
Library
> + #include // Header File For The GLu32 Library
> + #else
> ++
#ifdef OLD_MESA
> + #define __glext_h_ // Don't let gl.h include
glext.h
> ++ #endif
> + #include // Header File For The OpenGL32
Library
> + #include // Header File For The GLu32 Library
> ++ #ifdef
OLD_MESA
> + #undef __glext_h_
> ++ #endif
> + #endif
> +
> + #include
// rand, ...
> Index:
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
>
===================================================================
>
RCS file:
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
>
diff -N
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
>
--- /dev/null 1 Jan 1970 00:00:00 -0000
> +++
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
19 Jan 2011 21:23:21 -0000
> @@ -0,0 +1,10 @@
> +---
AstroMenaceSource/Core/VirtualFileSystem/VFS.h~
> ++++
AstroMenaceSource/Core/VirtualFileSystem/VFS.h
> +@@ -34,6 +34,7 @@
> +
#define VFS_H
> +
> +
> ++#include
> + #include "../Base.h"
> +
> +
> --- a.diff ends here ---
This patch applied cleanly but didn't work:
[tethys]:/usr/ports/games/openastromenace>[tethys]:/usr/ports> sudo
patch -p0 < ~/astromenace.diff
Hmm... Looks like a unified diff to
me...
The text leading up to this
was:
--------------------------
|Index:
games/openastromenace/Makefile
|===================================================================
|RCS
file: /a/.cvsup/ports/games/openastromenace/Makefile,v
|retrieving
revision 1.10
|diff -u -p -r1.10 Makefile
|---
games/openastromenace/Makefile 6 Jun 2010 20:43:48 -0000 1.10
|+++
games/openastromenace/Makefile 19 Jan 2011 21:24:51
-0000
--------------------------
Patching file
games/openastromenace/Makefile using Plan A...
Hunk #1 succeeded at
7.
Hunk #2 succeeded at 44.
Hmm... The next patch looks like a unified
diff to me...The text leading up to this
was:
--------------------------
|Index:
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
|===================================================================
|RCS
file:
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
|diff -N
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
|---
/dev/null 1 Jan 1970 00:00:00 -0000
|+++
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h 19 Jan
2011 21:19:09 -0000
--------------------------
(Creating file
games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h...)
Patching
file games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like
a unified diff to me...The text leading up to this
was:
--------------------------
|Index:
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
|===================================================================
|RCS
file:
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
|diff
-N
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
|---
/dev/null 1 Jan 1970 00:00:00 -0000
|+++
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
19 Jan 2011 21:23:21 -0000
--------------------------
(Creating file
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h...)
Patching
file
games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h
using Plan A...
Hunk #1 succeeded at 1.done
[tethys]:/usr/ports> sudo
make patch
===> Vulnerability check disabled, database not found===>
License check disabled, port has not defined LICENSE
===> Found saved
configuration for openastromenace-1.2.0_6
===> Extracting for
openastromenace-1.2.0_10
=> SHA256 Checksum OK for
openamenace-src-1.2.0.tar.bz2.
=> SHA256 Checksum OK for
oamenace-data-1.2.0.tar.bz2.
=> SHA256 Checksum OK for
oamenace-lang-en-1.2.0.tar.bz2.
===> Patching for
openastromenace-1.2.0_10
===> Applying FreeBSD patches for
openastromenace-1.2.0_10
1 out of 1 hunks failed--saving rejects to
AstroMenaceSource/Core/Base.h.rej=> Patch
patch-AstroMenaceSource-Core-Base.h failed to apply cleanly.
*** Error
code 1
Stop in /usr/ports/games/openastromenace.
*** Error code 1
Stop
in /usr/ports/games/openastromenace.
Exit 1
Rusty Nejdl
--=_85a4008d76698921234f2841c0cf2496
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html; charset=UTF-8
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
<html><body>
<p>On Thu, 20 Jan 2011 00:38:43 +0300, Anonymous wrote:</p>
<blockquote type=3D"cite" style=3D"padding-left:5px; border-left:#1010ff 2p=
x solid; margin-left:5px; width:100%"><!-- html ignored --><!-- head ignore=
d --><!-- meta ignored -->
<pre>Can you try below diff? It should also fix build with gcc45.
--- a.diff begins here ---
Index: games/openastromenace/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /a/.cvsup/ports/games/openastromenace/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- games/openastromenace/Makefile 6 Jun 2010 20:43:48 -0000 1.10
+++ games/openastromenace/Makefile 19 Jan 2011 21:24:51 -0000
@@ -7,7 +7,7 @@
=20
PORTNAME=3D openastromenace
PORTVERSION=3D 1.2.0
-PORTREVISION=3D 9
+PORTREVISION=3D 10
CATEGORIES=3D games
MASTER_SITES=3D SF
DISTFILES=3D openamenace-src-${PORTVERSION}${EXTRACT_SUFX} \
@@ -44,6 +44,10 @@ LANGPACK=3D ru
IGNORE=3D cannot be build without/with multiple language packs. Please re=
run 'make config' and select single language pack
.endif
=20
+.if !defined(WITHOUT_NOUVEAU)
+CFLAGS+=3D -DOLD_MESA
+.endif
+
post-patch:
${REINPLACE_CMD} -e 's|/usr/local/share/openastromenace|${DATADIR}|' \
${WRKSRC}/AstroMenaceSource/Main.cpp
Index: games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
diff -N games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/openastromenace/files/patch-AstroMenaceSource-Core-Base.h 19 Jan =
2011 21:19:09 -0000
@@ -0,0 +1,17 @@
+--- AstroMenaceSource/Core/Base.h~
++++ AstroMenaceSource/Core/Base.h
+@@ -46,10 +46,14 @@
+ #include // Header File For The OpenGL32 Library
+ #include // Header File For The GLu32 Library
+ #else
++ #ifdef OLD_MESA
+ #define __glext_h_ // Don't let gl.h include glext.h
++ #endif
+ #include // Header File For The OpenGL32 Library
+ #include // Header File For The GLu32 Library
++ #ifdef OLD_MESA
+ #undef __glext_h_
++ #endif
+ #endif
+=20
+ #include // rand, ...
Index: games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFile=
System-VFS.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualF=
ileSystem-VFS.h
diff -N games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFil=
eSystem-VFS.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSys=
tem-VFS.h 19 Jan 2011 21:23:21 -0000
@@ -0,0 +1,10 @@
+--- AstroMenaceSource/Core/VirtualFileSystem/VFS.h~
++++ AstroMenaceSource/Core/VirtualFileSystem/VFS.h
+@@ -34,6 +34,7 @@
+ #define VFS_H
+=20
+=20
++#include=20
+ #include "../Base.h"
+=20
+=20
--- a.diff ends here ---
</pre>
</blockquote>
<p>This patch applied cleanly but didn't work:</p>
<p> </p>
<p>[tethys]:/usr/ports/games/openastromenace>[tethys]:/usr/ports> sud=
o patch -p0 < ~/astromenace.diff<br />Hmm... Looks like a unified =
diff to me...<br />The text leading up to this was:<br />------------------=
--------<br />|Index: games/openastromenace/Makefile<br />|=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br />|RCS file: /a/.cvsup/ports/games/=
openastromenace/Makefile,v<br />|retrieving revision 1.10<br />|diff -u -p =
-r1.10 Makefile<br />|--- games/openastromenace/Makefile 6 Ju=
n 2010 20:43:48 -0000 1.10<br />|+++ games/openastrome=
nace/Makefile 19 Jan 2011 21:24:51 -0000<br />---------------=
-----------<br />Patching file games/openastromenace/Makefile using Plan A=
=2E..<br />Hunk #1 succeeded at 7.<br />Hunk #2 succeeded at 44.<br />Hmm=
=2E.. The next patch looks like a unified diff to me...The text leadi=
ng up to this was:<br />--------------------------<br />|Index: games/opena=
stromenace/files/patch-AstroMenaceSource-Core-Base.h<br />|=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br />|RCS file: games/openastromenace/=
files/patch-AstroMenaceSource-Core-Base.h<br />|diff -N games/openastromena=
ce/files/patch-AstroMenaceSource-Core-Base.h<br />|--- /dev/null 1 Ja=
n 1970 00:00:00 -0000<br />|+++ games/openastromenace/files/patch-AstroMena=
ceSource-Core-Base.h 19 Jan 2011 21:19:09 -0000<br />---------=
-----------------<br />(Creating file games/openastromenace/files/patch-Ast=
roMenaceSource-Core-Base.h...)<br />Patching file games/openastromenace/fil=
es/patch-AstroMenaceSource-Core-Base.h using Plan A...<br />Hunk #1 succeed=
ed at 1.<br />Hmm... The next patch looks like a unified diff to me=
=2E..The text leading up to this was:<br />--------------------------<br />=
|Index: games/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFil=
eSystem-VFS.h<br />|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<br=
/>|RCS file: games/openastromenace/files/patch-AstroMenaceSource-Core-Virt=
ualFileSystem-VFS.h<br />|diff -N games/openastromenace/files/patch-AstroMe=
naceSource-Core-VirtualFileSystem-VFS.h<br />|--- /dev/null 1 Jan 197=
0 00:00:00 -0000<br />|+++ games/openastromenace/files/patch-AstroMenaceSou=
rce-Core-VirtualFileSystem-VFS.h 19 Jan 2011 21:23:21 -0000<br />---=
-----------------------<br />(Creating file games/openastromenace/files/pat=
ch-AstroMenaceSource-Core-VirtualFileSystem-VFS.h...)<br />Patching file ga=
mes/openastromenace/files/patch-AstroMenaceSource-Core-VirtualFileSystem-VF=
S.h using Plan A...<br />Hunk #1 succeeded at 1.done</p>
<p><br />[tethys]:/usr/ports> sudo make patch<br />=3D=3D=3D> V=
ulnerability check disabled, database not found=3D=3D=3D> License =
check disabled, port has not defined LICENSE<br />=3D=3D=3D> Found=
saved configuration for openastromenace-1.2.0_6<br />=3D=3D=3D> E=
xtracting for openastromenace-1.2.0_10<br />=3D> SHA256 Checksum OK for =
openamenace-src-1.2.0.tar.bz2.<br />=3D> SHA256 Checksum OK for oamenace=
-data-1.2.0.tar.bz2.<br />=3D> SHA256 Checksum OK for oamenace-lang-en-1=
=2E2.0.tar.bz2.<br />=3D=3D=3D> Patching for openastromenace-1.2=
=2E0_10<br />=3D=3D=3D> Applying FreeBSD patches for openastromena=
ce-1.2.0_10<br />1 out of 1 hunks failed--saving rejects to AstroMenaceSour=
ce/Core/Base.h.rej=3D> Patch patch-AstroMenaceSource-Core-Base.h failed =
to apply cleanly.<br />*** Error code 1</p>
<p>Stop in /usr/ports/games/openastromenace.<br />*** Error code 1<br />Sto=
p in /usr/ports/games/openastromenace.<br />Exit 1</p>
<p> </p>
<p>Rusty Nejdl</p>
</body></html>
--=_85a4008d76698921234f2841c0cf2496--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101201400.p0KE0Q8R067370>