svn commit: r339966 - in head/emulators: . x49gp x49gp/files

[Juergen Lock]

On Thu, Jan 16, 2014 at 07:31:03PM +0000, Shaun Amott wrote:
> Author: shaun
> Date: Thu Jan 16 19:31:03 2014
> New Revision: 339966
> URL: http://svnweb.freebsd.org/changeset/ports/339966
> QAT: https://qat.redports.org/buildarchive/r339966/
> 
> Log:
>   Add x49gp - a HP49G+/50G graphics calculator emulator.
> 
> Added:
> [...]

This looked interesting but it didn't build as is, I got it to work
on 10.0-RC5/amd64 with the following patch:

- Pass CC to MAKE_ARGS and configure (needed for gcc46 on 10+).
- Add -lz -lm to X49GP_LIBS (needed for new ld on 10+).
- Copy hp50g-hack.png to hp50g.png for amd64 in startup script.

 Thanx! :)
	Juergen

Index: emulators/x49gp/Makefile
===================================================================
--- emulators/x49gp/Makefile	(revision 339973)
+++ emulators/x49gp/Makefile	(working copy)
@@ -15,6 +15,7 @@
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/x49gp/x49gp-code
+HAVE_CONFIGURE=	yes
 
 USE_GCC=	any
 USE_XORG=	x11
@@ -40,6 +41,8 @@
 
 .include <bsd.port.options.mk>
 
+MAKE_ARGS+=CC="${CC}"
+
 .if ${PORT_OPTIONS:MFIRMWARE_215H3} || ${PORT_OPTIONS:MFIRMWARE_215}
 MAKE_ARGS+=FIRMWARE=4950_215.bin
 DISTFILES+=hp4950v215.zip
@@ -63,6 +66,9 @@
 #	@${CP} ${WRKDIR}/rom215_hpgcc3_R004/hpgccrom.bin ${WRKSRC}/4950_215.bin
 #.endif
 
+do-configure:
+	cd ${WRKSRC}/qemu/qemu-git && ./configure-small --extra-cflags=-DX49GP --cc="${CC}"
+
 do-build:
 	cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS}
 
Index: emulators/x49gp/files/hp50g.sh.in
===================================================================
--- emulators/x49gp/files/hp50g.sh.in	(revision 339973)
+++ emulators/x49gp/files/hp50g.sh.in	(working copy)
@@ -36,6 +36,7 @@
 
 		if [ "`uname  -p`" = "amd64" ]; then
 			cp "${datadir}/hp50g-hack.png" "${sdir}/"
+			cp "${datadir}/hp50g-hack.png" "${sdir}/hp50g.png"
 		else
 			cp "${datadir}/hp50g.png" "${sdir}/"
 		fi
Index: emulators/x49gp/files/patch-Makefile
===================================================================
--- emulators/x49gp/files/patch-Makefile	(revision 339973)
+++ emulators/x49gp/files/patch-Makefile	(working copy)
@@ -30,3 +30,11 @@
  
  ifdef QEMU_OLD
  QEMUSRC = qemu/prepare.sh \
+@@ -81,6 +88,7 @@ QEMU_DIR_BUILD=$(QEMU_DIR)/arm-softmmu
+ QEMU_DEFINES+=-DNEED_CPU_H
+ X49GP_LDFLAGS=
+ X49GP_LIBS= $(QEMU_DIR_BUILD)/exec.o $(QEMU_DIR_BUILD)/translate-all.o $(QEMU_DIR_BUILD)/cpu-exec.o $(QEMU_DIR_BUILD)/translate.o $(QEMU_DIR_BUILD)/fpu/softfloat.o $(QEMU_DIR_BUILD)/op_helper.o $(QEMU_DIR_BUILD)/helper.o $(QEMU_DIR_BUILD)/disas.o $(QEMU_DIR_BUILD)/i386-dis.o $(QEMU_DIR_BUILD)/arm-dis.o $(QEMU_DIR_BUILD)/tcg/tcg.o $(QEMU_DIR_BUILD)/iwmmxt_helper.o $(QEMU_DIR_BUILD)/neon_helper.o
++X49GP_LIBS += -lz -lm
+ endif
+ QEMU_INCDIR=$(QEMU_DIR)
+ QEMU_INC=-I$(QEMU_INCDIR)/target-arm -I$(QEMU_INCDIR) -I$(QEMU_INCDIR)/fpu -I$(QEMU_INCDIR)/arm-softmmu