[Pkg-sdl-commits] r25 - in unstable/libsdl1.2/debian: . patches

[Sam Hocevar]

Author: sho
Date: 2006-03-01 18:52:36 +0000 (Wed, 01 Mar 2006)
New Revision: 25

Added:
   unstable/libsdl1.2/debian/patches/012_gnu_stack.diff
Modified:
   unstable/libsdl1.2/debian/changelog
Log:
  * debian/patches/012_gnu_stack.diff:
    + Add ".note.GNU-stack" sections to all NASM files so that gcc does not
      think these files need an executable stack.


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-03-01 18:51:06 UTC (rev 24)
+++ unstable/libsdl1.2/debian/changelog	2006-03-01 18:52:36 UTC (rev 25)
@@ -30,7 +30,11 @@
     + New patch: "dst_w == last.src_w" should be "dst_w == last.dst_w" in
       src/video/SDL_stretch.c.
 
-  * debian/patches/debian/patches/014_missing_mmx_blit.diff:
+  * debian/patches/012_gnu_stack.diff:
+    + Add ".note.GNU-stack" sections to all NASM files so that gcc does not
+      think these files need an executable stack.
+
+  * debian/patches/014_missing_mmx_blit.diff:
     + New patch: ConvertMMXpII32_24RGB888 was not used anywhere, yet it is
       fully functional. This patch activates it.
 

Added: unstable/libsdl1.2/debian/patches/012_gnu_stack.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/012_gnu_stack.diff	2006-03-01 18:51:06 UTC (rev 24)
+++ unstable/libsdl1.2/debian/patches/012_gnu_stack.diff	2006-03-01 18:52:36 UTC (rev 25)
@@ -0,0 +1,45 @@
+diff -puriN SDL-1.2.9/src/hermes/mmx_main.asm newSDL-1.2.9/src/hermes/mmx_main.asm
+--- SDL-1.2.9/src/hermes/mmx_main.asm	2001-04-26 18:45:45 +0200
++++ newSDL-1.2.9/src/hermes/mmx_main.asm	2006-03-01 12:13:17 +0100
+@@ -70,5 +70,5 @@ endconvert:
+ 	
+ 	ret		
+ 
+-
++SECTION .note.GNU-stack
+ 
+diff -puriN SDL-1.2.9/src/hermes/mmxp2_32.asm newSDL-1.2.9/src/hermes/mmxp2_32.asm
+--- SDL-1.2.9/src/hermes/mmxp2_32.asm	2002-03-01 19:01:16 +0100
++++ newSDL-1.2.9/src/hermes/mmxp2_32.asm	2006-03-01 12:13:42 +0100
+@@ -383,4 +383,5 @@ _convert_bgr555_cheat:
+ 	jmp _mmxreturn
+ 
+ 
++SECTION .note.GNU-stack
+ 
+diff -puriN SDL-1.2.9/src/hermes/x86_main.asm newSDL-1.2.9/src/hermes/x86_main.asm
+--- SDL-1.2.9/src/hermes/x86_main.asm	2001-04-26 18:45:45 +0200
++++ newSDL-1.2.9/src/hermes/x86_main.asm	2006-03-01 12:14:13 +0100
+@@ -123,3 +123,5 @@ _Hermes_X86_CPU:
+ 
+ .L1:	
+ 	ret
++
++SECTION .note.GNU-stack
+diff -puriN SDL-1.2.9/src/hermes/x86p_16.asm newSDL-1.2.9/src/hermes/x86p_16.asm
+--- SDL-1.2.9/src/hermes/x86p_16.asm	2001-04-26 18:45:45 +0200
++++ newSDL-1.2.9/src/hermes/x86p_16.asm	2006-03-01 12:14:23 +0100
+@@ -494,3 +494,4 @@ _ConvertX86p16_8RGB332:
+ .L7 pop ebp
+     jmp _x86return
+ 
++SECTION .note.GNU-stack
+diff -puriN SDL-1.2.9/src/hermes/x86p_32.asm newSDL-1.2.9/src/hermes/x86p_32.asm
+--- SDL-1.2.9/src/hermes/x86p_32.asm	2001-04-26 18:45:45 +0200
++++ newSDL-1.2.9/src/hermes/x86p_32.asm	2006-03-01 12:14:31 +0100
+@@ -1041,3 +1041,5 @@ _ConvertX86p32_8RGB332:
+ 	
+ .L4:	
+ 	jmp _x86return
++
++SECTION .note.GNU-stack