update to 0.8.25. sound not working yet.

This commit is contained in:
fgsch 2007-10-08 13:45:53 +00:00
parent 39262ab837
commit 3ec9fbcfa9
5 changed files with 76 additions and 60 deletions

View File

@ -1,35 +1,37 @@
# $OpenBSD: Makefile,v 1.11 2007/09/16 00:45:13 merdely Exp $
# $OpenBSD: Makefile,v 1.12 2007/10/08 13:45:53 fgsch Exp $
COMMENT= UAE amiga emulator
DISTNAME= uae-0.8.21
DISTNAME= uae-0.8.25
CATEGORIES= emulators x11
MASTER_SITES= ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/
HOMEPAGE= http://www.freiburg.linux.de/~uae
HOMEPAGE= http://uae.coresystems.de/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xi Xxf86dga Xxf86vm c m
WANTLIB= ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
Xrandr Xrender Xxf86dga Xxf86vm atk-1.0 c cairo expat \
fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread z
MASTER_SITES= ftp://ftp.coresystems.de/pub/uae/sources/develop/
MODULES= devel/gettext
LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-dga --enable-vidmode --disable-ui
CONFIGURE_ARGS+= --enable-dga --enable-vidmode
NO_REGRESS= Yes
# Workaround compiler bug on hppa: cc1plus spinning forever
.if ${MACHINE_ARCH} == "hppa"
CFLAGS+= -O0
.endif
MODULES= devel/gettext
LIB_DEPENDS+= glib.>=1.2,gmodule.>=1.2::devel/glib \
gtk.>=1.2,gdk.>=1.2::x11/gtk+
NO_REGRESS= Yes
DOCS= COMPATIBILITY CREDITS FAQ NEWS README README.PROGRAMMERS
FILES= mousehack timehack transdisk transrom uae-control \

View File

@ -1,5 +1,5 @@
MD5 (uae-0.8.21.tar.gz) = S7LZvGUkPfQaUdNv0VH7qA==
RMD160 (uae-0.8.21.tar.gz) = 2osgxqzB0XIOQW7Zj6R7HEXn4Ho=
SHA1 (uae-0.8.21.tar.gz) = m5RXS7P0YrAZ8bJo1qCzaUC94WA=
SHA256 (uae-0.8.21.tar.gz) = 0WvMS7GSQQ0JRD0XpObPCOI7XuoLGFMLY4TjuG+QA2E=
SIZE (uae-0.8.21.tar.gz) = 914495
MD5 (uae-0.8.25.tar.gz) = 5mDKK+w8AWyXjviBF7DEMg==
RMD160 (uae-0.8.25.tar.gz) = aZDceq9DyL2g17hubQrhZCCdHrE=
SHA1 (uae-0.8.25.tar.gz) = QbenDPZy08xRa9OFagUUWalaZRc=
SHA256 (uae-0.8.25.tar.gz) = YRp+BN13CA2Hx+loCu2ZftK+RRFu7JFhPrNqhSNaaGo=
SIZE (uae-0.8.25.tar.gz) = 970727

View File

@ -1,9 +1,29 @@
$OpenBSD: patch-configure,v 1.1 2003/05/11 18:24:49 naddy Exp $
--- configure.orig Sun May 11 12:11:59 2003
+++ configure Sun May 11 12:12:54 2003
@@ -6082,8 +6082,7 @@ fi
$OpenBSD: patch-configure,v 1.2 2007/10/08 13:45:53 fgsch Exp $
--- configure.orig Fri Jul 1 14:00:17 2005
+++ configure Thu Oct 4 12:03:59 2007
@@ -1973,17 +1973,9 @@ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
+ CFLAGS="-g"
else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
+ CFLAGS=
fi
echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
@@ -13858,8 +13850,7 @@ fi
if test $ac_cv_prog_gcc = yes; then
if test $ac_cv_c_compiler_gnu = yes; then
WARNING_CFLAGS="-Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes"
- OPTIMIZE_CFLAGS="-O2 -fomit-frame-pointer"
- CFLAGS=

View File

@ -1,47 +1,18 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2003/05/11 18:24:49 naddy Exp $
--- src/Makefile.in.orig Mon Nov 19 05:34:18 2001
+++ src/Makefile.in Sun May 11 12:14:43 2003
@@ -75,7 +75,7 @@ uae: $(OBJS)
$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
clean:
- $(MAKE) -C tools clean
+ cd tools && ${MAKE} clean
-rm -f $(OBJS) *.o uae readdisk
-rm -f blit.h cpudefs.c
-rm -f cpuemu.c build68k cputmp.s cpufast*.s cpustbl.c cputbl.h
@@ -99,13 +99,13 @@ blittable.c: tools/genblitter blitfunc.h
$OpenBSD: patch-src_Makefile_in,v 1.3 2007/10/08 13:45:53 fgsch Exp $
--- src/Makefile.in.orig Thu Oct 4 11:25:12 2007
+++ src/Makefile.in Thu Oct 4 11:25:38 2007
@@ -100,11 +100,11 @@ blittable.c: tools/genblitter blitfunc.h
./tools/genblitter t >blittable.c
tools/genblitter:
- $(MAKE) -C tools genblitter
+ cd tools && ${MAKE} genblitter
+ cd tools && $(MAKE) genblitter
tools/build68k:
- $(MAKE) -C tools build68kc
+ cd tools && ${MAKE} build68kc
tools/cpuopti:
- $(MAKE) -C tools cpuopti
+ cd tools && ${MAKE} cpuopti
+ cd tools && $(MAKE) build68kc
tools/gencpu:
- $(MAKE) -C tools gencpu
+ cd tools && ${MAKE} gencpu
+ cd tools && $(MAKE) gencpu
custom.o: blit.h
drawing.o: linetoscr.c
@@ -120,13 +120,11 @@ cpuemu.c: tools/gencpu
cpustbl.c: cpuemu.c
cputbl.h: cpuemu.c
-cpufast.s: cpuemu.c tools/cpuopti
- $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s
- ./tools/cpuopti <cputmp.s >$@
- rm cputmp.s
+cpufast.s: cpuemu.c
+ $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) cpuemu.c -o $@
console_missing.o: missing.c
- $(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
+ $(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $? -o $@
osdep/beos.o: osdep/beos.cpp
$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) osdep/beos.cpp -o osdep/beos.o

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_tools_configure,v 1.1 2007/10/08 13:45:53 fgsch Exp $
--- src/tools/configure.orig Thu Oct 4 12:07:07 2007
+++ src/tools/configure Thu Oct 4 12:07:34 2007
@@ -734,17 +734,9 @@ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
+ CFLAGS="-g"
else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
+ CFLAGS=
fi