[gentoo-commits] gentoo-x86 commit in games-emulation/gngeo/files: gngeo-0.8-zlib.patch gngeo-0.8-concurrentMake.patch gngeo-0.8-execstacks.patch

[gentoo-commits] gentoo-x86 commit in games-emulation/gngeo/files: gngeo-0.8-zlib.patch gngeo-0.8-concurrentMake.patch gngeo-0.8-execstacks.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    15/01/24 05:58:44

  Added:                gngeo-0.8-zlib.patch gngeo-0.8-concurrentMake.patch
                        gngeo-0.8-execstacks.patch
  Log:
  version bump
  
  (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  games-emulation/gngeo/files/gngeo-0.8-zlib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/gngeo/files/gngeo-0.8-zlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/gngeo/files/gngeo-0.8-zlib.patch?rev=1.1&content-type=text/plain

Index: gngeo-0.8-zlib.patch
===================================================================
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])
 



1.1                  games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch?rev=1.1&content-type=text/plain

Index: gngeo-0.8-concurrentMake.patch
===================================================================
--- 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 $@ 
 



1.1                  games-emulation/gngeo/files/gngeo-0.8-execstacks.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch?rev=1.1&content-type=text/plain

Index: gngeo-0.8-execstacks.patch
===================================================================
--- 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