Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jan 2004 23:54:39 +0100
From:      "Miguel Mendez" <flynn@energyhq.es.eu.org>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Cc:        refugee@vt.edu
Subject:    ports/62137: Fix build of emulators/xmess and bring xmame up to date
Message-ID:  <1075503279.0@scienide.energyhq.es.eu.org>
Resent-Message-ID: <200401302310.i0UNAHU6054033@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         62137
>Category:       ports
>Synopsis:       Fix build of emulators/xmess and bring xmame up to date
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 30 15:10:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        DragonFly 1.0-CURRENT i386
>Organization:
The $699 Linux distro 
>Environment:


System: DragonFly scienide.energyhq.es.eu.org 1.0-CURRENT DragonFly 1.0-CURRENT #0: Fri J i386


>Description:


xmame, when built for the mess target, tries to use its own png routines,
namely, png.[ch], which conflict with libpng. These patches fix the problem
and also bring xmame up to 0.78.1, the latest version available. I've also
added another patch to fix a problem with stdint.h
NOTE: Both patches are needed for xmess to build correctly.
CC'ing xmame maintainer for aproval.


>How-To-Repeat:





>Fix:


--- xmame.diff begins here ---
diff -ruN xmame.old/Makefile xmame/Makefile
--- xmame.old/Makefile	Mon Jan 12 13:14:49 2004
+++ xmame/Makefile	Fri Jan 30 21:56:52 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	xmame
-PORTVERSION?=	0.77.1
+PORTVERSION?=	0.78.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://x.mame.net/download/:xmame \
 		http://www.sys2064.com/files/util/:history \
@@ -24,7 +24,6 @@
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-MAKEFILE=	makefile.unix
 
 MAN6=		x${MAMEMESS}.6
 
@@ -79,18 +78,13 @@
 		xmame-gdoc.html \
 		xmame.css
 XMAMEDOCS=
-XMESSDOCS=	mess/cgafont.txt \
-		mess/compilewin.html \
-		mess/credits.htm \
-		mess/credits.txt \
+XMESSDOCS=	mess/credits.htm \
 		mess/faq.htm \
 		mess/imgtool.txt \
-		mess/messhelp.txt \
 		mess/messnew.txt \
-		mess/messold.txt \
 		mess/messroms.txt \
 		mess/sysinfo.dat \
-		mess/windows.txt
+
 PINMAMEDOCS=	pinmame/simulation.txt \
 		pinmame/whatsnew.txt \
 		pinmame/pinmame.txt \
@@ -280,6 +274,15 @@
 		-e "s@^SDL_CONFIG.*@SDL_CONFIG = ${SDL_CONFIG}@g" \
 		-e "s@^GLLIBS += .*@GLLIBS += ${PTHREAD_LIBS}@g" \
 			${WRKSRC}/makefile.unix
+
+# png.h conflicts with libpng.
+.for file in mess/artworkx.c mess/artworkx.h src/artwork.c \
+	src/common.c src/png.c src/unix/video-drivers/glexport.c
+
+	${REINPLACE_CMD} -e "s@\"png.h\"@\"mame_png.h\"@g" ${WRKSRC}/${file}
+
+.endfor
+	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
diff -ruN xmame.old/distinfo xmame/distinfo
--- xmame.old/distinfo	Mon Jan 12 13:14:49 2004
+++ xmame/distinfo	Fri Jan 30 19:49:07 2004
@@ -1,4 +1,4 @@
-MD5 (xmame/xmame-0.77.1.tar.bz2) = 744fdbac27c08cf13ca979a4b4985041
+MD5 (xmame/xmame-0.78.1.tar.bz2) = e92c61e0040114db3a83b7dbb7fc9449
 MD5 (xmame/uhsdat795.zip) = c30956e15cd8218f558f41013a47f22e
 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12
 MD5 (xmame/cheat.zip) = fab0ea562a8dcfd1ce4f3a1d5acc6101
diff -ruN xmame.old/pkg-plist xmame/pkg-plist
--- xmame.old/pkg-plist	Sat Dec 20 00:25:11 2003
+++ xmame/pkg-plist	Fri Jan 30 21:58:07 2004
@@ -30,18 +30,12 @@
 %%MAMEONLY%%%%DATFILES%%share/xmame/hiscore.dat
 %%MAMEONLY%%%%DATFILES%%share/xmame/history.dat
 %%MAMEONLY%%%%DATFILES%%share/xmame/cheat.dat
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/cgafont.txt
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/compilewin.html
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/credits.htm
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/credits.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/faq.htm
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/imgtool.txt
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messhelp.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messnew.txt
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messold.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/sysinfo.dat
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/windows.txt
 %%MESSONLY%%share/xmess/history.dat
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt
--- xmame.diff ends here ---

--- xmess.diff begins here ---
diff -ruN xmess.old/Makefile xmess/Makefile
--- xmess.old/Makefile	Mon Jan 12 13:15:21 2004
+++ xmess/Makefile	Fri Jan 30 20:44:38 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmess
-PORTVERSION=	0.77.1
+PORTVERSION=	0.78.1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 emulator for game consoles
diff -ruN xmess.old/files/patch-aa xmess/files/patch-aa
--- xmess.old/files/patch-aa	Thu Jan  1 01:00:00 1970
+++ xmess/files/patch-aa	Fri Jan 30 21:46:11 2004
@@ -0,0 +1,14 @@
+--- src/sha1.h.orig	Fri Jan 30 21:43:41 2004
++++ src/sha1.h	Fri Jan 30 21:45:58 2004
+@@ -26,10 +26,7 @@
+ #ifndef NETTLE_SHA1_H_INCLUDED
+ #define NETTLE_SHA1_H_INCLUDED
+ 
+-#ifndef _STDINT_H
+-typedef unsigned int uint32_t;
+-typedef unsigned char uint8_t;
+-#endif
++#include <stdint.h>
+ 
+ #define SHA1_DIGEST_SIZE 20
+ #define SHA1_DATA_SIZE 64
--- xmess.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1075503279.0>