diff --git a/.gitignore b/.gitignore index e69de29..1e9b4d6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +xvidcore-1.1.3.tar.bz2 diff --git a/sources b/sources index e69de29..82597b8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2 diff --git a/xvidcore-noexecstack.patch b/xvidcore-noexecstack.patch new file mode 100644 index 0000000..e738d40 --- /dev/null +++ b/xvidcore-noexecstack.patch @@ -0,0 +1,514 @@ +--- xvidcore-1.1.2/src/bitstream/x86_asm/cbp_3dne.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/bitstream/x86_asm/cbp_3dne.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -123,3 +123,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/bitstream/x86_asm/cbp_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/bitstream/x86_asm/cbp_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -148,3 +148,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/bitstream/x86_asm/cbp_sse2.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/bitstream/x86_asm/cbp_sse2.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -140,3 +140,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_64_asm/fdct_mmx_skal.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_64_asm/fdct_mmx_skal.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -461,3 +461,8 @@ + ;----------------------------------------------------------------------------- + + MAKE_FDCT_FUNC fdct_skal_x86_64, fMTX_MULT_XMM ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_64_asm/idct_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_64_asm/idct_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -523,3 +523,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -422,3 +422,8 @@ + ;----------------------------------------------------------------------------- + + MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_skal.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/fdct_mmx_skal.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -523,3 +523,8 @@ + ;----------------------------------------------------------------------------- + + MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/fdct_sse2_skal.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/fdct_sse2_skal.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -620,3 +620,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/idct_3dne.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/idct_3dne.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -720,3 +720,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/idct_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/idct_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -630,3 +630,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/idct_sse2_dmitry.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/idct_sse2_dmitry.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -345,3 +345,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/dct/x86_asm/simple_idct_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/dct/x86_asm/simple_idct_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -1254,3 +1254,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -706,4 +706,8 @@ + + pop rbx + ret +-.endfunc +\ No newline at end of file ++.endfunc ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_xmm.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_64_asm/interpolate8x8_xmm.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -704,3 +704,8 @@ + + EPILOG + .endfunc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_64_asm/qpel_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_64_asm/qpel_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -1152,3 +1152,8 @@ + .endfunc + + ;////////////////////////////////////////////////////////////////////// ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/colorspace_rgb_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/colorspace_rgb_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -429,3 +429,8 @@ + 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 ++ +--- xvidcore-1.1.2/src/image/x86_asm/colorspace_yuv_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/colorspace_yuv_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -279,3 +279,8 @@ + 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 ++ +--- xvidcore-1.1.2/src/image/x86_asm/colorspace_yuyv_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/colorspace_yuyv_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -329,3 +329,8 @@ + + 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 ++ +--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dn.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dn.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -485,3 +485,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dne.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_3dne.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -579,3 +579,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -1367,3 +1367,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_xmm.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/interpolate8x8_xmm.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -841,3 +841,8 @@ + EPILOG + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/postprocessing_mmx.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/postprocessing_mmx.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -124,3 +124,8 @@ + ret + .endfunc + ;////////////////////////////////////////////////////////////////////// ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/postprocessing_sse2.asm~ 2007-02-15 09:57:50.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/postprocessing_sse2.asm 2007-02-15 09:57:50.000000000 +0100 +@@ -140,3 +140,8 @@ + ret + .endfunc + ;////////////////////////////////////////////////////////////////////// ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/qpel_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/qpel_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -1060,3 +1060,8 @@ + .endfunc + + ;////////////////////////////////////////////////////////////////////// ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/image/x86_asm/reduced_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/image/x86_asm/reduced_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -1002,3 +1002,8 @@ + + ; pfeewwww... Never Do That On Stage Again. :) + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_64_asm/sad_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_64_asm/sad_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -162,4 +162,8 @@ + + ;; All done + ret +-.endfunc +\ No newline at end of file ++.endfunc ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_64_asm/sad_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_64_asm/sad_xmm.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -439,4 +439,8 @@ + movd eax, mm7 + pop rbx + ret +-.endfunc +\ No newline at end of file ++.endfunc ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_asm/sad_3dn.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_asm/sad_3dn.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -228,3 +228,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_asm/sad_3dne.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_asm/sad_3dne.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -502,3 +502,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_asm/sad_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_asm/sad_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -747,3 +747,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_asm/sad_sse2.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_asm/sad_sse2.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -170,3 +170,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/motion/x86_asm/sad_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/motion/x86_asm/sad_xmm.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -444,3 +444,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/quant/x86_64_asm/quantize_h263_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/quant/x86_64_asm/quantize_h263_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -505,3 +505,8 @@ + xor rax, rax + ret + .endfunc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/quant/x86_64_asm/quantize_mpeg_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/quant/x86_64_asm/quantize_mpeg_xmm.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -807,4 +807,8 @@ + + xor rax, rax + ret +-.endfunc +\ No newline at end of file ++.endfunc ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_3dne.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_3dne.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -784,3 +784,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/quant/x86_asm/quantize_h263_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -1039,3 +1039,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -750,3 +750,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_xmm.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/quant/x86_asm/quantize_mpeg_xmm.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -815,3 +815,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_64_asm/cpuid.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_64_asm/cpuid.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -216,3 +216,8 @@ + .endfunc + + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_64_asm/interlacing_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_64_asm/interlacing_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -212,3 +212,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_64_asm/mem_transfer_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_64_asm/mem_transfer_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -434,3 +434,8 @@ + COPY_8_TO_8 + ret + .endfunc ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_asm/cpuid.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_asm/cpuid.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -226,3 +226,8 @@ + .endfunc + + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_asm/interlacing_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_asm/interlacing_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -217,3 +217,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_3dne.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_3dne.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -459,3 +459,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ +--- xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_mmx.asm~ 2007-02-15 09:57:51.000000000 +0100 ++++ xvidcore-1.1.2/src/utils/x86_asm/mem_transfer_mmx.asm 2007-02-15 09:57:51.000000000 +0100 +@@ -568,3 +568,8 @@ + ret + .endfunc + ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section ".note.GNU-stack" noalloc noexec nowrite progbits ++%endif ++ diff --git a/xvidcore.spec b/xvidcore.spec new file mode 100644 index 0000000..10d6a70 --- /dev/null +++ b/xvidcore.spec @@ -0,0 +1,179 @@ +Name: xvidcore +Version: 1.1.3 +Release: 4%{?dist} +Summary: Free reimplementation of the OpenDivX video codec + +Group: System Environment/Libraries +License: XVID (GPL with specific restrictions) +URL: http://www.xvid.org/ +Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2 +Patch0: %{name}-noexecstack.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%ifarch %{ix86} x86_64 +BuildRequires: yasm +%endif + +%description +Free reimplementation of the OpenDivX video codec. You can play OpenDivX +and DivX4 videos with it, as well as encode compatible files. + +%package devel +Summary: Development files for the XviD video codec +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains header files, static library and API +documentation for the XviD video codec. + + +%prep +%setup -q +%patch0 -p1 -b .noexec +chmod -x examples/*.pl +f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f +# Yes, we want to see the build output. +%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile + + +%build +cd build/generic +export CFLAGS="$RPM_OPT_FLAGS -ffast-math" +%configure +make %{?_smp_mflags} +cd - + + +%install +rm -rf $RPM_BUILD_ROOT +make -C build/generic install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a +cd $RPM_BUILD_ROOT%{_libdir} +chmod 755 libxvidcore.so* +/sbin/ldconfig -n . +ln -s libxvidcore.so.? libxvidcore.so +cd - + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc LICENSE README AUTHORS ChangeLog TODO +%{_libdir}/libxvidcore.so.* + +%files devel +%defattr(-,root,root,-) +%doc CodingStyle examples/ +%{_includedir}/xvid.h +%{_libdir}/libxvidcore.so + + +%changelog +* Sun Aug 03 2008 Thorsten Leemhuis 1.1.3-3 +- Merge freshrpms spec into livna spec for rpmfusion: +- Set release to 3 to be higher as both livna and freshrpms latest release +- Add -ffast-math to CFLAGS + +* Sat Jun 30 2007 Dominik Mierzejewski - 1.1.3-1 +- 1.1.3, security bugfix release, fixes CVE-2007-3329 (#1563) + +* Sun Mar 11 2007 Dominik Mierzejewski - 1.1.2-2 +- fix SElinux noexec stack issue (patch by Hans de Goede) + +* Sat Nov 11 2006 Ville Skyttä - 1.1.2-1 +- 1.1.2. +- Convert docs to UTF-8. +- Use make install DESTDIR=... instead of %%makeinstall. + +* Fri Oct 06 2006 Thorsten Leemhuis 1.1.0-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Tue Sep 19 2006 Ville Skyttä - 1.1.0-3 +- Use yasm to build, enable asm code on x86_64. +- Drop no longer needed Obsoletes. +- Specfile cleanups. + +* Sat May 20 2006 Ville Skyttä - 1.1.0-2 +- Fix library permissions and symlink. +- Don't ship static library. +- Avoid -devel dependency on perl. + +* Thu Mar 09 2006 Andreas Bierfert +- switch to new release field + +* Tue Feb 28 2006 Andreas Bierfert +- add dist + +* Wed Jan 18 2006 Adrian Reber - 1.1.0-0.lvn.1 +- Updated to 1.10 +- Droped now unnecessary patch +- Droped Epoch + +* Sun Feb 20 2005 Ville Skyttä - 0:1.0.3-0.lvn.1 +- 1.0.3. + +* Wed Sep 29 2004 Ville Skyttä - 0:1.0.2-0.lvn.1 +- Update to 1.0.2. + +* Tue Jun 8 2004 Dams 0:1.0.1-0.lvn.1 +- Updated to 1.0.1 + +* Mon May 17 2004 Ville Skyttä - 0:1.0.0-0.lvn.1 +- Updated to 1.0.0. +- Patch to show build output. + +* Mon May 3 2004 Ville Skyttä - 0:1.0.0-0.lvn.0.2.rc4 +- Updated to 1.0.0-rc4. + +* Mon Mar 29 2004 Dams 0:1.0.0-0.lvn.0.2.rc3 +- Updated to rc3 + +* Sat Jan 10 2004 Dams 0:1.0.0-0.lvn.0.1.beta3 +- Updated to 1.0.0-beta3 +- Small spec file cleanup + +* Sun Sep 28 2003 Dams 0:0.9.2-0.fdr.1.0.94 +- Removed comment after scriptlets + +* Fri Aug 15 2003 Marius L. Johndal 0:0.9.2-0.fdr.1 +- Updated to 0.9.2. +- Updated according to current SPEC template. +- Changed to properly versioned .so-files. + +* Tue Apr 8 2003 Marius Johndal 0:0.9.1-0.fdr.3 +- Cleaned up the documentation. + +* Fri Apr 4 2003 Marius Johndal 0:0.9.1-0.fdr.2 +- Added epoch and release number to requires. + +* Wed Apr 2 2003 Marius Johndal 0:0.9.1-0.fdr.1 +- Updated to 0.9.1. + +* Wed Apr 2 2003 Marius Johndal 0:0.9.0-0.fdr.1 +- Initial fedora RPM release. +- Changed -static back to -devel as that seems more logic. + +* Mon Mar 31 2003 Matthias Saou +- Rebuilt for Red Hat Linux 9. + +* Wed Jan 29 2003 Matthias Saou +- Fixed the location of the .h files... doh! + +* Sun Jan 12 2003 Matthias Saou +- Remove the decore.h and encore2.h inks as divx4linux 5.01 will provide them. +- Rename -devel to -static as it seems more logic. + +* Fri Dec 27 2002 Matthias Saou +- Initial RPM release.