rpms/xvidcore/F-14 xvidcore-noexec-stack.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xvidcore.spec, 1.5, 1.6 xvidcore-1.2.1-noexec-stack.patch, 1.1, NONE

Dominik Mierzejewski rathann at rpmfusion.org
Sun Dec 12 03:35:23 CET 2010


Author: rathann

Update of /cvs/free/rpms/xvidcore/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23715

Modified Files:
	.cvsignore sources xvidcore.spec 
Added Files:
	xvidcore-noexec-stack.patch 
Removed Files:
	xvidcore-1.2.1-noexec-stack.patch 
Log Message:
* Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1
- 1.2.2
- rebase noexec-stack patch


xvidcore-noexec-stack.patch:
 bitstream/x86_asm/cbp_mmx.asm         |    6 +-----
 bitstream/x86_asm/cbp_sse2.asm        |    6 +-----
 dct/x86_asm/fdct_mmx_ffmpeg.asm       |    5 +----
 dct/x86_asm/fdct_mmx_skal.asm         |    5 +----
 dct/x86_asm/fdct_sse2_skal.asm        |    5 +----
 dct/x86_asm/idct_3dne.asm             |    6 +-----
 dct/x86_asm/idct_mmx.asm              |    6 +-----
 dct/x86_asm/idct_sse2_dmitry.asm      |    6 +-----
 image/x86_asm/colorspace_rgb_mmx.asm  |    6 +-----
 image/x86_asm/colorspace_yuv_mmx.asm  |    5 +----
 image/x86_asm/colorspace_yuyv_mmx.asm |    5 +----
 image/x86_asm/deintl_sse.asm          |    5 +----
 image/x86_asm/gmc_mmx.asm             |    5 +----
 image/x86_asm/interpolate8x8_3dn.asm  |    6 +-----
 image/x86_asm/interpolate8x8_3dne.asm |    6 +-----
 image/x86_asm/interpolate8x8_mmx.asm  |    6 +-----
 image/x86_asm/interpolate8x8_xmm.asm  |    6 +-----
 image/x86_asm/postprocessing_mmx.asm  |    5 +----
 image/x86_asm/postprocessing_sse2.asm |    5 +----
 image/x86_asm/qpel_mmx.asm            |    5 +----
 image/x86_asm/reduced_mmx.asm         |    6 +-----
 motion/x86_asm/sad_3dn.asm            |    6 +-----
 motion/x86_asm/sad_3dne.asm           |    6 +-----
 motion/x86_asm/sad_mmx.asm            |    6 +-----
 motion/x86_asm/sad_sse2.asm           |    6 +-----
 motion/x86_asm/sad_xmm.asm            |    6 +-----
 nasm.inc                              |    9 +++++++++
 plugins/x86_asm/plugin_ssim-a.asm     |    4 +---
 quant/x86_asm/quantize_h263_3dne.asm  |    5 +----
 quant/x86_asm/quantize_h263_mmx.asm   |    6 +-----
 quant/x86_asm/quantize_mpeg_mmx.asm   |    6 +-----
 quant/x86_asm/quantize_mpeg_xmm.asm   |    6 +-----
 utils/x86_asm/cpuid.asm               |    5 +----
 utils/x86_asm/interlacing_mmx.asm     |    6 +-----
 utils/x86_asm/mem_transfer_3dne.asm   |    6 +-----
 utils/x86_asm/mem_transfer_mmx.asm    |    6 +-----
 36 files changed, 44 insertions(+), 161 deletions(-)

--- NEW FILE xvidcore-noexec-stack.patch ---
diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
--- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm	2010-12-12 03:21:50.000000000 +0100
@@ -126,8 +126,4 @@ calc_cbp_mmx:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm
--- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm	2010-12-12 03:21:50.000000000 +0100
@@ -116,8 +116,4 @@ calc_cbp_sse2:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm
--- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm	2010-12-12 03:21:50.000000000 +0100
@@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW
 
 MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm
--- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm	2010-12-12 03:21:50.000000000 +0100
@@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_
 
 MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm
--- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm	2010-12-12 03:23:11.000000000 +0100
@@ -608,7 +608,4 @@ ENDFUNC
 ALIGN SECTION_ALIGN  
   times 8 dw 0 
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm
--- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/dct/x86_asm/idct_3dne.asm	2010-12-12 03:21:50.000000000 +0100
@@ -698,8 +698,4 @@ idct_3dne:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm
--- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/dct/x86_asm/idct_mmx.asm	2010-12-12 03:21:50.000000000 +0100
@@ -608,8 +608,4 @@ idct_xmm:
     ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm
--- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm	2010-12-12 03:21:50.000000000 +0100
@@ -325,8 +325,4 @@ idct_sse2_dmitry:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm
--- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm	2010-12-12 03:21:51.000000000 +0100
@@ -529,8 +529,4 @@ MAKE_COLORSPACE  rgba_to_yv12_mmx,0,   4
 MAKE_COLORSPACE  yv12_to_bgr_mmx,48,   3,8,2,  YV12_TO_BGR,  3, -1
 MAKE_COLORSPACE  yv12_to_bgra_mmx,48,  4,8,2,  YV12_TO_BGR,  4, -1
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm
--- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm	2010-12-12 03:21:51.000000000 +0100
@@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12	yv12_to_yv12_mmx, 0
 
 MAKE_YV12_TO_YV12	yv12_to_yv12_xmm, 1
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
--- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm	2010-12-12 03:21:51.000000000 +0100
@@ -341,7 +341,4 @@ MAKE_COLORSPACE  yv12_to_uyvy_mmx,0,    
 MAKE_COLORSPACE  yv12_to_yuyvi_mmx,0,   2,8,4,  YV12_TO_YUYVI, 0, -1
 MAKE_COLORSPACE  yv12_to_uyvyi_mmx,0,   2,8,4,  YV12_TO_YUYVI, 1, -1
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm
--- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/deintl_sse.asm	2010-12-12 03:21:51.000000000 +0100
@@ -131,7 +131,4 @@ xvid_deinterlace_sse:
 ENDFUNC
 
 ;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm
--- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/gmc_mmx.asm	2010-12-12 03:21:51.000000000 +0100
@@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41:
 ENDFUNC
 
 ;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm	2010-12-12 03:21:51.000000000 +0100
@@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm	2010-12-12 03:21:51.000000000 +0100
@@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm	2010-12-12 03:21:51.000000000 +0100
@@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm	2010-12-12 03:21:51.000000000 +0100
@@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm:
   EPILOG
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm
--- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm	2010-12-12 03:21:51.000000000 +0100
@@ -114,7 +114,4 @@ image_brightness_mmx:
 ENDFUNC
 ;//////////////////////////////////////////////////////////////////////
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm
--- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm	2010-12-12 03:21:52.000000000 +0100
@@ -130,7 +130,4 @@ image_brightness_sse2:
 ENDFUNC
 ;//////////////////////////////////////////////////////////////////////
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm
--- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/qpel_mmx.asm	2010-12-12 03:21:52.000000000 +0100
@@ -1149,7 +1149,4 @@ ENDFUNC
 %undef SRC_PTR
 %undef DST_PTR
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm
--- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/image/x86_asm/reduced_mmx.asm	2010-12-12 03:21:52.000000000 +0100
@@ -985,8 +985,4 @@ ENDFUNC
 
   ; pfeewwww... Never Do That On Stage Again. :)
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm
--- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_3dn.asm	2010-12-12 03:21:52.000000000 +0100
@@ -216,8 +216,4 @@ sad8bi_3dn:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm
--- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_3dne.asm	2010-12-12 03:21:52.000000000 +0100
@@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm
--- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_mmx.asm	2010-12-12 03:21:52.000000000 +0100
@@ -731,8 +731,4 @@ sse8_8bit_mmx:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm
--- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_sse2.asm	2010-12-12 03:21:52.000000000 +0100
@@ -176,8 +176,4 @@ dev16_sse3:
   MEAN16_SSE2_SSE3 lddqu
 ENDFUNC
 
- 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm
--- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_xmm.asm	2010-12-12 03:21:52.000000000 +0100
@@ -436,8 +436,4 @@ sad16v_xmm:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc
--- xvidcore/src/nasm.inc.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/nasm.inc	2010-12-12 03:21:52.000000000 +0100
@@ -203,3 +203,12 @@ BITS 32
 		%endif
 	%endif
 %endmacro
+
+%macro NON_EXEC_STACK 0
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%endmacro
diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
--- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm	2010-12-12 03:21:53.000000000 +0100
@@ -273,6 +273,4 @@ consim_mmx:
 	ret
 ENDFUNC
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm
--- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm	2010-12-12 03:21:53.000000000 +0100
@@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN
   ret
 ENDFUNC
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm
--- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm	2010-12-12 03:21:53.000000000 +0100
@@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm
--- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm	2010-12-12 03:21:53.000000000 +0100
@@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm
--- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack	2009-05-28 17:04:35.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm	2010-12-12 03:21:53.000000000 +0100
@@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm
--- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/utils/x86_asm/cpuid.asm	2010-12-12 03:21:53.000000000 +0100
@@ -240,7 +240,4 @@ ENDFUNC
 %endif
 
 
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm
--- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm	2010-12-12 03:21:53.000000000 +0100
@@ -198,8 +198,4 @@ MBFieldTest_mmx:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm
--- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm	2010-12-12 03:21:53.000000000 +0100
@@ -465,8 +465,4 @@ transfer8x4_copy_3dne:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm
--- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack	2009-05-28 10:42:37.000000000 +0200
+++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm	2010-12-12 03:21:53.000000000 +0100
@@ -588,8 +588,4 @@ transfer8x4_copy_mmx:
   ret
 ENDFUNC
 
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xvidcore/F-14/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Dec 2008 18:21:34 -0000	1.4
+++ .cvsignore	12 Dec 2010 02:35:23 -0000	1.5
@@ -1 +1 @@
-xvidcore-1.2.1.tar.bz2
+xvidcore-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xvidcore/F-14/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Dec 2008 18:21:34 -0000	1.4
+++ sources	12 Dec 2010 02:35:23 -0000	1.5
@@ -1 +1 @@
-8c4470ae8e5a104abedb39f6c70e2a40  xvidcore-1.2.1.tar.bz2
+6a3473a12c8a1fa7bdc2b5cb829fab58  xvidcore-1.2.2.tar.bz2


Index: xvidcore.spec
===================================================================
RCS file: /cvs/free/rpms/xvidcore/F-14/xvidcore.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xvidcore.spec	21 Sep 2009 10:26:59 -0000	1.5
+++ xvidcore.spec	12 Dec 2010 02:35:23 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           xvidcore
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        MPEG-4 Simple and Advanced Simple Profile codec
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.xvid.org/
 Source0:        http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Patch0:         xvidcore-1.2.1-noexec-stack.patch
+Patch0:         xvidcore-noexec-stack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch %{ix86} x86_64
@@ -83,6 +83,10 @@
 
 
 %changelog
+* Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1
+- 1.2.2
+- rebase noexec-stack patch
+
 * Mon Sep 21 2009 Hans de Goede <j.w.r.degoede at hhs.nl> - 1.2.1-3
 - Do not require an executable stack on x86_64 (rf743, rf733)
 


--- xvidcore-1.2.1-noexec-stack.patch DELETED ---



More information about the rpmfusion-commits mailing list