summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-05-29 17:20:53 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-05-29 17:20:53 +0000
commitd9a50d18ec27fbae3d33f4c393d8ec030e5ede9d (patch)
treed978bb91a23495996c0ebaede1e8933dc66e5051
parentTaking the ebuild, thanks to darkside for proxy committing. Adding a new revi... (diff)
downloadhistorical-d9a50d18ec27fbae3d33f4c393d8ec030e5ede9d.tar.gz
historical-d9a50d18ec27fbae3d33f4c393d8ec030e5ede9d.tar.bz2
historical-d9a50d18ec27fbae3d33f4c393d8ec030e5ede9d.zip
Fix execstacks wrt #258804, thanks to en.ABCD at gmail.org.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
-rw-r--r--media-libs/xvid/ChangeLog9
-rw-r--r--media-libs/xvid/Manifest7
-rw-r--r--media-libs/xvid/files/xvid-1.2.2-no_execstacks.patch382
-rw-r--r--media-libs/xvid/xvid-1.2.1.ebuild51
-rw-r--r--media-libs/xvid/xvid-1.2.2-r1.ebuild (renamed from media-libs/xvid/xvid-1.2.2.ebuild)9
5 files changed, 400 insertions, 58 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 7ee136b1b7a1..63a5f1996d30 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/xvid
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.105 2009/05/29 16:36:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.106 2009/05/29 17:20:53 ssuominen Exp $
+
+*xvid-1.2.2-r1 (29 May 2009)
+
+ 29 May 2009; Samuli Suominen <ssuominen@gentoo.org> -xvid-1.2.1.ebuild,
+ -xvid-1.2.2.ebuild, +xvid-1.2.2-r1.ebuild,
+ +files/xvid-1.2.2-no_execstacks.patch:
+ Fix execstacks wrt #258804, thanks to en.ABCD at gmail.org.
*xvid-1.2.2 (29 May 2009)
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 70bf67c236cb..3831d6ece77f 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,12 +1,11 @@
AUX xvid-1.1.0-3dnow-2.patch 510 RMD160 6676868458608d25cc93a696dcec73bf4be80392 SHA1 94407b1b98ca8680b3c8fec88931ef1c87e897dd SHA256 4528dacdd88db8cf2bffe7894af284e3ca79e02c3d3f3c48196642d971ddeb46
AUX xvid-1.1.0_beta2-altivec.patch 1070 RMD160 316da7461c58ddabec7d2907431fbb9675cea322 SHA1 7ea51c2a5a06c8c8a183398fec4656f159335085 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d
AUX xvid-1.1.3-ia64-build.patch 393 RMD160 2d4b9e76e7c8bcea8466e19c76458db378c12bb9 SHA1 410d1e61dacf4ec6e321abdc44e37e16a3a578d4 SHA256 2b95dc6c1e39b9a39b88284cba7f43580131a140467d7b7893624869098df067
+AUX xvid-1.2.2-no_execstacks.patch 16629 RMD160 23db2ae58119cb74353dabe1819a805e19c7838f SHA1 040c918e9fef95337cb0c63c63bfa9e356538d10 SHA256 492bc3f943653c075175eb541e6509c6f19350c37a8dbe45063ec3b85b17184b
DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f SHA1 0f5e9e15e96c6c2a1a6d7bea67e8abd5b41442fa SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa
DIST xvidcore-1.1.3.tar.bz2 625974 RMD160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8 SHA1 7a945c245851e115bc107aa621f72d775a5d1adb SHA256 f5d7f658840ef6fda5b2cd8b105d3738e1a3e735ee12ddc0136527f0185c14ed
-DIST xvidcore-1.2.1.tar.bz2 641101 RMD160 fcb6a5a0410d1921d99361fe5d580f00128b9ba3 SHA1 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3 SHA256 ef0175aa86b2d8b48138ca993526645403371b87683c69853b09f1163797ddcc
DIST xvidcore-1.2.2.tar.bz2 643344 RMD160 5fbbc99a02d9eab7f2394220cec2c872957ff26f SHA1 d03270c803592f7655e7aa4181de587be25ba97f SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11
EBUILD xvid-1.1.3.ebuild 1875 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc SHA1 0965e58a77047ba8f5e809e6eae1bbd7f7230411 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59
-EBUILD xvid-1.2.1.ebuild 1428 RMD160 3d02091ba181f259b3ebbd1d3fc45cb002d4a29a SHA1 6ced7700f08bd8f8c8cb99eb57a60722197d148a SHA256 c0577ca3e007d7cda3b6fefff8760ea7f10c48a061dd3903cc8fa36825d27c89
-EBUILD xvid-1.2.2.ebuild 1192 RMD160 dcd5cd4848074957aa9ed06ff33d90ba9a9923e4 SHA1 e5c5fcc3d2b301d406ba843fc36b863ee57d4d84 SHA256 e7090366ecc2140ff1bd4153458f85ccdd2a91035bc684b78cb8631ed0c07608
-MISC ChangeLog 13867 RMD160 4b020137014c437d3fb77dbcf9a4bb641d231ef5 SHA1 6dc7524f1db7a78a50986b1b73a6a690277bd9b7 SHA256 f159a0a2ec4282d614a7aceff4a42f64a6552a9b76670e5f17694928eb4619d3
+EBUILD xvid-1.2.2-r1.ebuild 1294 RMD160 db852a443f86350ad6df95c15fabbb18c53405ff SHA1 cdad0da39ef47ad7aa1e5892d6b8d03def5da846 SHA256 362342923a7597a333bbf1c96e6a7f7e1701413a6918a1bf8888269d922b4ff4
+MISC ChangeLog 14120 RMD160 4e4ef87eb170a7f355b66c9b43344d1cdb8780a6 SHA1 ccbd6848559f070ca9f8306377e4248a149ab851 SHA256 8a40bf14fb7e2cfd72c124b1a95d8d5e32da84f86cdaf7a410fa34d5d46e6592
MISC metadata.xml 326 RMD160 91617f57d22a91f7320a8a4cf31acdb62be99786 SHA1 8a03f8977295939de344ac23e4fdd8185d953d65 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9
diff --git a/media-libs/xvid/files/xvid-1.2.2-no_execstacks.patch b/media-libs/xvid/files/xvid-1.2.2-no_execstacks.patch
new file mode 100644
index 000000000000..7c5632b39e29
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.2.2-no_execstacks.patch
@@ -0,0 +1,382 @@
+diff -ur xvidcore.orig/src/bitstream/x86_asm/cbp_mmx.asm xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
+--- xvidcore.orig/src/bitstream/x86_asm/cbp_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2009-05-29 20:08:30.000000000 +0300
+@@ -128,6 +128,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/bitstream/x86_asm/cbp_sse2.asm xvidcore/src/bitstream/x86_asm/cbp_sse2.asm
+--- xvidcore.orig/src/bitstream/x86_asm/cbp_sse2.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2009-05-29 20:08:46.000000000 +0300
+@@ -118,6 +118,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/dct/x86_asm/fdct_mmx_ffmpeg.asm xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm
+--- xvidcore.orig/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2009-05-29 20:00:19.000000000 +0300
+@@ -402,6 +402,6 @@
+ MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/dct/x86_asm/fdct_mmx_skal.asm xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm
+--- xvidcore.orig/src/dct/x86_asm/fdct_mmx_skal.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2009-05-29 19:59:46.000000000 +0300
+@@ -501,6 +501,6 @@
+ MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/dct/x86_asm/fdct_sse2_skal.asm xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm
+--- xvidcore.orig/src/dct/x86_asm/fdct_sse2_skal.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2009-05-29 20:01:18.000000000 +0300
+@@ -609,6 +609,6 @@
+ times 8 dw 0
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/dct/x86_asm/idct_3dne.asm xvidcore/src/dct/x86_asm/idct_3dne.asm
+--- xvidcore.orig/src/dct/x86_asm/idct_3dne.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2009-05-29 20:00:38.000000000 +0300
+@@ -700,6 +700,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/dct/x86_asm/idct_mmx.asm xvidcore/src/dct/x86_asm/idct_mmx.asm
+--- xvidcore.orig/src/dct/x86_asm/idct_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2009-05-29 20:00:00.000000000 +0300
+@@ -610,6 +610,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/dct/x86_asm/idct_sse2_dmitry.asm xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm
+--- xvidcore.orig/src/dct/x86_asm/idct_sse2_dmitry.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2009-05-29 20:01:37.000000000 +0300
+@@ -327,6 +327,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/colorspace_rgb_mmx.asm xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/colorspace_rgb_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2009-05-29 20:04:41.000000000 +0300
+@@ -531,6 +531,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/colorspace_yuv_mmx.asm xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/colorspace_yuv_mmx.asm 2009-05-28 18:04:35.000000000 +0300
++++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2009-05-29 20:02:30.000000000 +0300
+@@ -475,6 +475,6 @@
+ MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/colorspace_yuyv_mmx.asm xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/colorspace_yuyv_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2009-05-29 20:05:16.000000000 +0300
+@@ -342,6 +342,6 @@
+ 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
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/deintl_sse.asm xvidcore/src/image/x86_asm/deintl_sse.asm
+--- xvidcore.orig/src/image/x86_asm/deintl_sse.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/deintl_sse.asm 2009-05-29 20:05:52.000000000 +0300
+@@ -133,5 +133,5 @@
+ ;//////////////////////////////////////////////////////////////////////
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+diff -ur xvidcore.orig/src/image/x86_asm/gmc_mmx.asm xvidcore/src/image/x86_asm/gmc_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/gmc_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2009-05-29 20:07:06.000000000 +0300
+@@ -222,5 +222,5 @@
+ ;//////////////////////////////////////////////////////////////////////
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+diff -ur xvidcore.orig/src/image/x86_asm/interpolate8x8_3dn.asm xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm
+--- xvidcore.orig/src/image/x86_asm/interpolate8x8_3dn.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2009-05-29 20:03:34.000000000 +0300
+@@ -465,6 +465,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/interpolate8x8_3dne.asm xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm
+--- xvidcore.orig/src/image/x86_asm/interpolate8x8_3dne.asm 2009-05-28 18:04:35.000000000 +0300
++++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2009-05-29 20:04:58.000000000 +0300
+@@ -565,6 +565,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/interpolate8x8_mmx.asm xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/interpolate8x8_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2009-05-29 20:03:19.000000000 +0300
+@@ -1330,6 +1330,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/interpolate8x8_xmm.asm xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm
+--- xvidcore.orig/src/image/x86_asm/interpolate8x8_xmm.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2009-05-29 20:04:25.000000000 +0300
+@@ -821,6 +821,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/postprocessing_mmx.asm xvidcore/src/image/x86_asm/postprocessing_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/postprocessing_mmx.asm 2009-05-28 18:04:35.000000000 +0300
++++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2009-05-29 20:02:08.000000000 +0300
+@@ -115,6 +115,6 @@
+ ;//////////////////////////////////////////////////////////////////////
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/postprocessing_sse2.asm xvidcore/src/image/x86_asm/postprocessing_sse2.asm
+--- xvidcore.orig/src/image/x86_asm/postprocessing_sse2.asm 2009-05-28 18:04:35.000000000 +0300
++++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2009-05-29 20:00:53.000000000 +0300
+@@ -131,6 +131,6 @@
+ ;//////////////////////////////////////////////////////////////////////
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/qpel_mmx.asm xvidcore/src/image/x86_asm/qpel_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/qpel_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2009-05-29 20:05:34.000000000 +0300
+@@ -1150,6 +1150,6 @@
+ %undef DST_PTR
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/image/x86_asm/reduced_mmx.asm xvidcore/src/image/x86_asm/reduced_mmx.asm
+--- xvidcore.orig/src/image/x86_asm/reduced_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2009-05-29 20:06:46.000000000 +0300
+@@ -987,6 +987,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/motion/x86_asm/sad_3dn.asm xvidcore/src/motion/x86_asm/sad_3dn.asm
+--- xvidcore.orig/src/motion/x86_asm/sad_3dn.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2009-05-29 20:06:14.000000000 +0300
+@@ -218,6 +218,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/motion/x86_asm/sad_3dne.asm xvidcore/src/motion/x86_asm/sad_3dne.asm
+--- xvidcore.orig/src/motion/x86_asm/sad_3dne.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2009-05-29 20:12:08.000000000 +0300
+@@ -492,6 +492,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/motion/x86_asm/sad_mmx.asm xvidcore/src/motion/x86_asm/sad_mmx.asm
+--- xvidcore.orig/src/motion/x86_asm/sad_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2009-05-29 20:11:01.000000000 +0300
+@@ -733,6 +733,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/motion/x86_asm/sad_sse2.asm xvidcore/src/motion/x86_asm/sad_sse2.asm
+--- xvidcore.orig/src/motion/x86_asm/sad_sse2.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2009-05-29 20:11:44.000000000 +0300
+@@ -178,6 +178,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/motion/x86_asm/sad_xmm.asm xvidcore/src/motion/x86_asm/sad_xmm.asm
+--- xvidcore.orig/src/motion/x86_asm/sad_xmm.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2009-05-29 20:11:22.000000000 +0300
+@@ -438,6 +438,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/plugins/x86_asm/plugin_ssim-a.asm xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
+--- xvidcore.orig/src/plugins/x86_asm/plugin_ssim-a.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2009-05-29 20:01:51.000000000 +0300
+@@ -274,5 +274,5 @@
+ ENDFUNC
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+diff -ur xvidcore.orig/src/quant/x86_asm/quantize_h263_3dne.asm xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm
+--- xvidcore.orig/src/quant/x86_asm/quantize_h263_3dne.asm 2009-05-28 18:04:35.000000000 +0300
++++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2009-05-29 20:09:29.000000000 +0300
+@@ -932,6 +932,6 @@
+ ENDFUNC
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/quant/x86_asm/quantize_h263_mmx.asm xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm
+--- xvidcore.orig/src/quant/x86_asm/quantize_h263_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2009-05-29 20:09:55.000000000 +0300
+@@ -1072,6 +1072,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/quant/x86_asm/quantize_mpeg_mmx.asm xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm
+--- xvidcore.orig/src/quant/x86_asm/quantize_mpeg_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2009-05-29 20:09:07.000000000 +0300
+@@ -659,6 +659,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/quant/x86_asm/quantize_mpeg_xmm.asm xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm
+--- xvidcore.orig/src/quant/x86_asm/quantize_mpeg_xmm.asm 2009-05-28 18:04:35.000000000 +0300
++++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2009-05-29 20:10:35.000000000 +0300
+@@ -620,6 +620,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/utils/x86_asm/cpuid.asm xvidcore/src/utils/x86_asm/cpuid.asm
+--- xvidcore.orig/src/utils/x86_asm/cpuid.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/utils/x86_asm/cpuid.asm 2009-05-29 20:12:32.000000000 +0300
+@@ -241,6 +241,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/utils/x86_asm/interlacing_mmx.asm xvidcore/src/utils/x86_asm/interlacing_mmx.asm
+--- xvidcore.orig/src/utils/x86_asm/interlacing_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2009-05-29 19:58:57.000000000 +0300
+@@ -200,6 +200,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/utils/x86_asm/mem_transfer_3dne.asm xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm
+--- xvidcore.orig/src/utils/x86_asm/mem_transfer_3dne.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2009-05-29 19:59:24.000000000 +0300
+@@ -467,6 +467,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
+diff -ur xvidcore.orig/src/utils/x86_asm/mem_transfer_mmx.asm xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm
+--- xvidcore.orig/src/utils/x86_asm/mem_transfer_mmx.asm 2009-05-28 11:42:37.000000000 +0300
++++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2009-05-29 20:04:06.000000000 +0300
+@@ -590,6 +590,6 @@
+
+
+ %ifidn __OUTPUT_FORMAT__,elf
+-section ".note.GNU-stack" noalloc noexec nowrite progbits
++section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+
diff --git a/media-libs/xvid/xvid-1.2.1.ebuild b/media-libs/xvid/xvid-1.2.1.ebuild
deleted file mode 100644
index ed389529be0f..000000000000
--- a/media-libs/xvid/xvid-1.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.1.ebuild,v 1.3 2009/02/11 19:35:19 aballier Exp $
-
-inherit eutils fixheadtails
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="http://www.xvid.org"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples altivec"
-
-NASM=">=dev-lang/nasm-2.04"
-DEPEND="x86? ( ${NASM} )
- amd64? ( ${NASM} )
- x86-fbsd? ( ${NASM} )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_compile() {
- econf $(use_enable altivec)
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
-
- dodoc "${S}"/../../{AUTHORS,ChangeLog*,README,TODO}
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.*.dylib))
- dosym ${mylib} /usr/$(get_libdir)/libxvidcore.dylib
- else
- local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
- dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
- dosym ${mylib} /usr/$(get_libdir)/${mylib%.?}
- fi
-
- if use examples; then
- dodoc "${S}"/../../CodingStyle
- insinto /usr/share/${PN}
- doins -r "${S}"/../../examples
- fi
-}
diff --git a/media-libs/xvid/xvid-1.2.2.ebuild b/media-libs/xvid/xvid-1.2.2-r1.ebuild
index 58b7369a83f8..79e81a5eeec3 100644
--- a/media-libs/xvid/xvid-1.2.2.ebuild
+++ b/media-libs/xvid/xvid-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2.ebuild,v 1.1 2009/05/29 16:36:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r1.ebuild,v 1.1 2009/05/29 17:20:53 ssuominen Exp $
EAPI=2
-inherit multilib
+inherit eutils multilib
MY_PN=${PN}core
MY_P=${MY_PN}-${PV}
@@ -25,6 +25,11 @@ RDEPEND=""
S=${WORKDIR}/${MY_PN}/build/generic
+src_prepare() {
+ cd "${WORKDIR}"/${MY_PN}
+ epatch "${FILESDIR}"/${P}-no_execstacks.patch
+}
+
src_configure() {
econf \
$(use_enable pic assembly)