| 1 |
mr_bones_ 14/07/02 03:48:44 |
| 2 |
|
| 3 |
Added: generator-0.35_p4-configure.patch |
| 4 |
generator-0.35_p4-underlink.patch |
| 5 |
generator-0.35_p4-execstacks.patch |
| 6 |
Log: |
| 7 |
patch version bump |
| 8 |
|
| 9 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-emulation/generator/files/generator-0.35_p4-configure.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/generator/files/generator-0.35_p4-configure.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/generator/files/generator-0.35_p4-configure.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: generator-0.35_p4-configure.patch |
| 18 |
=================================================================== |
| 19 |
--- configure.ac.original 2008-03-17 13:07:48.000000000 -0400 |
| 20 |
+++ configure.ac 2008-03-17 13:08:03.000000000 -0400 |
| 21 |
@@ -28,15 +28,12 @@ |
| 22 |
AC_ARG_WITH(tcltk, |
| 23 |
AS_HELP_STRING(--with-tcltk,Create tcltk version), |
| 24 |
MY_PROG="generator-tcltk") |
| 25 |
- AC_ARG_WITH(gtk, |
| 26 |
- AS_HELP_STRING(--with-gtk,Create gtk version), |
| 27 |
- MY_PROG="generator-gtk") |
| 28 |
AC_ARG_WITH(sdl, |
| 29 |
AS_HELP_STRING(--with-sdl,Create SDL version), |
| 30 |
[MY_PROG="generator-sdl"; USE_SDL_AUDIO=yes]) |
| 31 |
if [[ "x$MY_PROG" = "x" ]]; then |
| 32 |
AC_MSG_ERROR(You must select a user interface type: |
| 33 |
- svgalib allegro tcltk gtk sdl) |
| 34 |
+ svgalib allegro tcltk sdl) |
| 35 |
fi |
| 36 |
if [[ "x$MY_PROG" = "xgenerator-allegro" ]]; then |
| 37 |
AC_DEFINE(ALLEGRO, 1, [Allegro version]) |
| 38 |
@@ -202,50 +199,6 @@ |
| 39 |
CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused" |
| 40 |
fi |
| 41 |
fi |
| 42 |
- if [[ "x$DEBUG" != "xno" ]]; then |
| 43 |
- AC_MSG_RESULT(Turning on debug flags) |
| 44 |
- CFLAGS="$CFLAGS -g -O" |
| 45 |
- optimum=no |
| 46 |
- else |
| 47 |
- if [[ "x$GCCVER" != "xno" ]]; then |
| 48 |
- AC_MSG_RESULT(Turning on gcc optimisations) |
| 49 |
- CFLAGS="$CFLAGS -O3 -fomit-frame-pointer" |
| 50 |
- if [[ "x$GCCVER" = "x3" ]]; then |
| 51 |
- AC_MSG_RESULT(Turning on gcc 3 optimisations) |
| 52 |
- CFLAGS="$CFLAGS -fno-math-errno" |
| 53 |
- fi |
| 54 |
- case "$CFLAGS" in |
| 55 |
- *mcpu*|*march*) AC_MSG_RESULT(Skipping target optimisations) |
| 56 |
- ;; |
| 57 |
- *) case "$target_cpu" in |
| 58 |
- i386) AC_MSG_RESULT(Turning on i386 optimisations) |
| 59 |
- CFLAGS="$CFLAGS -march=i386 -ffast-math" |
| 60 |
- ;; |
| 61 |
- i486) AC_MSG_RESULT(Turning on i486 optimisations) |
| 62 |
- CFLAGS="$CFLAGS -march=i486 -ffast-math" |
| 63 |
- ;; |
| 64 |
- i586) AC_MSG_RESULT(Turning on pentium optimisations) |
| 65 |
- # cannot do malign-double as we link to other libraries and |
| 66 |
- # it would break binary compatibility |
| 67 |
- CFLAGS="$CFLAGS -march=pentium -ffast-math" |
| 68 |
- ;; |
| 69 |
- i?86) AC_MSG_RESULT(Turning on i686 optimisations) |
| 70 |
- # cannot do malign-double as we link to other libraries and |
| 71 |
- # it would break binary compatibility |
| 72 |
- CFLAGS="$CFLAGS -march=i686 -ffast-math" |
| 73 |
- ;; |
| 74 |
- alpha*) AC_MSG_RESULT(Adding -mieee for Alpha) |
| 75 |
- CFLAGS="$CFLAGS -mieee" |
| 76 |
- ;; |
| 77 |
- *) AC_MSG_RESULT(Sorry unknown target CPU) |
| 78 |
- ;; |
| 79 |
- esac |
| 80 |
- esac |
| 81 |
- else |
| 82 |
- AC_MSG_WARN(You did not opt for gcc optimisations!) |
| 83 |
- optimum=no |
| 84 |
- fi |
| 85 |
- fi |
| 86 |
AC_CHECK_LIB(jpeg, jpeg_start_compress, |
| 87 |
[ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ]) |
| 88 |
|
| 89 |
@@ -272,14 +225,7 @@ |
| 90 |
|
| 91 |
AC_PATH_XTRA |
| 92 |
|
| 93 |
- if [[ "x$MY_PROG" = "xgenerator-gtk" ]]; then |
| 94 |
- MY_SUBDIRS="glade gtkopts $MY_SUBDIRS" |
| 95 |
- AM_PATH_GTK(1.2.10,,AC_MSG_ERROR(Generator needs gtk 1.2.10 or later)) |
| 96 |
- AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later)) |
| 97 |
- |
| 98 |
- MY_LIBS="$MY_LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" |
| 99 |
- CFLAGS="$CFLAGS $X_CFLAGS" |
| 100 |
- elif [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then |
| 101 |
+ if [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then |
| 102 |
MY_SUBDIRS="gtkopts $MY_SUBDIRS" |
| 103 |
AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later)) |
| 104 |
|
| 105 |
@@ -305,6 +251,7 @@ |
| 106 |
AC_CHECK_SIZEOF(unsigned long, 4) |
| 107 |
AC_CHECK_SIZEOF(unsigned long long, 8) |
| 108 |
AC_CHECK_HEADERS(sys/param.h) |
| 109 |
+ AC_CHECK_HEADERS(sys/time.h) |
| 110 |
AC_CHECK_HEADERS(bzlib.h) |
| 111 |
AC_CHECK_HEADERS(zlib.h) |
| 112 |
AC_CHECK_HEADERS(tcl8.0.h) |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.1 games-emulation/generator/files/generator-0.35_p4-underlink.patch |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/generator/files/generator-0.35_p4-underlink.patch?rev=1.1&view=markup |
| 119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/generator/files/generator-0.35_p4-underlink.patch?rev=1.1&content-type=text/plain |
| 120 |
|
| 121 |
Index: generator-0.35_p4-underlink.patch |
| 122 |
=================================================================== |
| 123 |
--- main/Makefile.am.old 2011-06-20 21:35:25.832460030 +0200 |
| 124 |
+++ main/Makefile.am 2011-06-20 21:36:29.490503981 +0200 |
| 125 |
@@ -7,7 +7,7 @@ |
| 126 |
bin_PROGRAMS = @PROGRAM@ |
| 127 |
EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \ |
| 128 |
generator-gtk generator-sdl |
| 129 |
-LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \ |
| 130 |
+LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \ |
| 131 |
../sn76496/libsn76496.a |
| 132 |
|
| 133 |
## this should be generator_tcltk_DATA but it won't let me do that |
| 134 |
|
| 135 |
|
| 136 |
|
| 137 |
1.1 games-emulation/generator/files/generator-0.35_p4-execstacks.patch |
| 138 |
|
| 139 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/generator/files/generator-0.35_p4-execstacks.patch?rev=1.1&view=markup |
| 140 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/generator/files/generator-0.35_p4-execstacks.patch?rev=1.1&content-type=text/plain |
| 141 |
|
| 142 |
Index: generator-0.35_p4-execstacks.patch |
| 143 |
=================================================================== |
| 144 |
--- raze/Makefile.am.old 2006-09-03 03:17:39.000000000 +0200 |
| 145 |
+++ raze/Makefile.am 2006-09-03 03:16:36.000000000 +0200 |
| 146 |
@@ -343,6 +343,10 @@ |
| 147 |
raze: raze.o |
| 148 |
raze.o: raze.asm raze.reg |
| 149 |
nasm -e raze.asm -o raze2.asm |
| 150 |
+ echo "%ifidn __OUTPUT_FORMAT__,elf" >> raze2.asm |
| 151 |
+ echo "section .note.GNU-stack noalloc noexec nowrite progbits" \ |
| 152 |
+ >> raze2.asm |
| 153 |
+ echo "%endif" >> raze2.asm |
| 154 |
nasm -f @ASMOUTPUT@ raze2.asm -o raze.o -praze.reg |
Archives