From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../gngeo/files/gngeo-0.8-concurrentMake.patch | 16 ++++ .../gngeo/files/gngeo-0.8-execstacks.patch | 105 +++++++++++++++++++++ games-emulation/gngeo/files/gngeo-0.8-zlib.patch | 9 ++ 3 files changed, 130 insertions(+) create mode 100644 games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch create mode 100644 games-emulation/gngeo/files/gngeo-0.8-execstacks.patch create mode 100644 games-emulation/gngeo/files/gngeo-0.8-zlib.patch (limited to 'games-emulation/gngeo/files') diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch new file mode 100644 index 000000000000..1afc182c0988 --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch @@ -0,0 +1,16 @@ +--- src/generator68k/Makefile.am.orig 2015-01-23 18:37:37.998723294 -0500 ++++ src/generator68k/Makefile.am 2015-01-23 18:38:39.995391133 -0500 +@@ -71,9 +71,12 @@ + + #def68k : def68k.c + # gcc def68k.c tab68k.c -o def68k -I .. -I ../.. -I . `sdl-config --cflags` +-def68k.o gen68k.o tab68k2.o : %.o : %.c ++def68k.o tab68k2.o : %.o : %.c + $(gcc_build_verbose)$(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags` + ++gen68k.o: gen68k.c def68k-iibs.h ++ $(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags` ++ + def68k : def68k.o tab68k2.o + $(gcc_build_verbose)$(CC_FOR_BUILD) def68k.o tab68k2.o -o $@ + diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch new file mode 100644 index 000000000000..17c576b7d634 --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch @@ -0,0 +1,105 @@ +--- src/effect/2xsaimmx.asm ++++ src/effect/2xsaimmx.asm +@@ -2107,3 +2107,7 @@ + final1b resb 8 + final2a resb 8 + final2b resb 8 ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/effect/effect_i386.asm ++++ src/effect/effect_i386.asm +@@ -88,3 +88,7 @@ + emms + + endproc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/effect/hq2x16.asm ++++ src/effect/hq2x16.asm +@@ -1935,3 +1935,7 @@ + dd ..@cross8, ..@flag0, ..@flag0, ..@flag0, + dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/effect/hq3x16.asm ++++ src/effect/hq3x16.asm +@@ -2520,3 +2520,7 @@ + dd ..@cross8, ..@flag0, ..@flag0, ..@flag0, + dd ..@flag0, ..@flag0, ..@flag0, ..@flag0 + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/memcpy.S ++++ src/memcpy.S +@@ -495,4 +495,8 @@ + + Lmemcpy_bsrcul1l4: + add r1, r1, #1 +-b Lmemcpy_bl4 +\ No newline at end of file ++b Lmemcpy_bl4 ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +--- src/raze/Makefile.am ++++ src/raze/Makefile.am +@@ -20,7 +20,7 @@ + $(srcdir)/strip_ $< $@ + + raze2.asm: raze.asmu raze.incu raze.regu +- nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@ ++ nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@ + + # This assembles the file, once it's been pre-processed + raze.o: raze2.asm +--- src/raze/raze.asm ++++ src/raze/raze.asm +@@ -4259,3 +4259,6 @@ + + ;- the end ------------------------------------------------------------------; + ++%ifidn ___OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/screen_i386.asm ++++ src/screen_i386.asm +@@ -96,3 +96,6 @@ + endproc + + ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif +--- src/star/star.c ++++ src/star/star.c +@@ -2431,6 +2431,10 @@ + */ + static void suffixes(void) { + emit("end\n"); ++ ++ emit("%%ifidn ___OUTPUT_FORMAT__,elf\n"); ++ emit("section .note.GNU-stack noalloc noexec nowrite progbits\n"); ++ emit("%%endif\n"); + } + + /**************************************************************************** +--- src/video_i386.asm ++++ src/video_i386.asm +@@ -86,3 +86,7 @@ + + popa + endproc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif diff --git a/games-emulation/gngeo/files/gngeo-0.8-zlib.patch b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch new file mode 100644 index 000000000000..9aa4a6b5f479 --- /dev/null +++ b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch @@ -0,0 +1,9 @@ +diff -ru gngeo-0.8.orig/configure.in gngeo-0.8/configure.in +--- gngeo-0.8.orig/configure.in 2012-11-15 17:57:57.849578009 -0500 ++++ gngeo-0.8/configure.in 2012-11-15 18:19:55.305923094 -0500 +@@ -95,6 +95,7 @@ + #AC_SUBST(LIBOBJS) + AC_CHECK_LIB([m], [acos]) + AC_CHECK_LIB([z], [inflate]) ++AC_CHECK_LIB([minizip], [unzReadCurrentFile]) + -- cgit v1.2.3-65-gdbad