uclibctoolize is no longer needed and fix executable stacks

Package-Manager: portage-2.0.51.22-r2

3 files changed, 145 insertions, 9 deletions

diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 44f694ddf181..1eef1d03d2b7 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -5,19 +5,20 @@ MD5 60942b2edbb86e8d72b2a8b583cb5e9c libdv-0.102.ebuild 1153
 MD5 1427fcf4db28b76b675aae8bac20ab39 metadata.xml 274
 MD5 9eddaa9f84b052f62b463beadff4dfe7 libdv-0.99-r1.ebuild 1169
 MD5 9ff480f44ba52c721c629991852b4ddf libdv-0.101.ebuild 1147
-MD5 22bd73227f9f128a93f82f03d4f9e59a libdv-0.104.ebuild 1210
+MD5 4b6f2ab5770ea5c031c0cebdcd4e3c90 libdv-0.104.ebuild 1225
 MD5 80c0b436e1352c2838f1b7592f4f13b6 ChangeLog 5983
 MD5 3d3bbf2ecd039329fe6b73dc9ada38bf files/digest-libdv-0.99-r1 62
 MD5 2524a27d2f6e849452d1d5d1f97580ec files/digest-libdv-0.104 63
+MD5 704fb72c3eb12e3adcc0b29838f9c1a1 files/libdv-0.104-no-exec-stack.patch 2631
 MD5 592d600ce50f0a107ecd5b348d434f9f files/libdv-0.99-2.6.patch 439
 MD5 21abc06a6e969b1a6b5b1ca2f1f09474 files/digest-libdv-0.101 63
 MD5 ccdc17c32d38a07aab1b06d6932a13f8 files/libdv-0.104-amd64reloc.patch 9114
 MD5 d577f2ed689030f4f13088422f1fa185 files/digest-libdv-0.102 63
 MD5 db1c07312c8a5de3d64bc80c44b26d6e files/libdv-0.99-disablegtk.patch 3309
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCzyjSgIKl8Uu19MoRAmUKAJ9X8OCEqjx00gMlXDison9yq+I4YgCbBJvH
-oNUABmdTWpQcUDmfE6BPEDw=
-=Dyje
+iD8DBQFDQymfgIKl8Uu19MoRAiJkAJ43ATwHOMd8bG9kDmwv1g+BwyPMZwCeN+ei
+LRfcud3ynvKR49QLhZk2MRM=
+=fz6D
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdv/files/libdv-0.104-no-exec-stack.patch b/media-libs/libdv/files/libdv-0.104-no-exec-stack.patch
new file mode 100644
index 000000000000..f1870e34106a
--- /dev/null
+++ b/media-libs/libdv/files/libdv-0.104-no-exec-stack.patch
@@ -0,0 +1,135 @@
+Make sure that the asm files don't incorrectly trigger an executable
+stack marking in the final shared library.  That's bad, mmmkay.
+
+--- libdv/dct_block_mmx.S
++++ libdv/dct_block_mmx.S
+@@ -1207,3 +1207,7 @@ _dv_dct_block_mmx_postscale_248:
+ 	popl	 %esi
+ 	popl	 %ebp
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/dct_block_mmx_x86_64.S
++++ libdv/dct_block_mmx_x86_64.S
+@@ -1197,3 +1197,7 @@ _dv_dct_block_mmx_x86_64_postscale_248:
+ 	pop	 %r12
+ 	
+ 	ret
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/encode_x86.S
++++ libdv/encode_x86.S
+@@ -599,3 +599,6 @@ _dv_need_dct_248_mmx_rows:
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/encode_x86_64.S
++++ libdv/encode_x86_64.S
+@@ -600,3 +600,6 @@ _dv_need_dct_248_mmx_x86_64_rows:
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/idct_block_mmx.S
++++ libdv/idct_block_mmx.S
+@@ -648,3 +648,6 @@ x0:
+ 	.long 0,0
+ 	.align 8
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/idct_block_mmx_x86_64.S
++++ libdv/idct_block_mmx_x86_64.S
+@@ -653,3 +653,6 @@ x0:
+ 	.long 0,0
+ 	.align 8
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/quant_x86.S
++++ libdv/quant_x86.S
+@@ -454,3 +454,6 @@ _dv_quant_x86:	
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/quant_x86_64.S
++++ libdv/quant_x86_64.S
+@@ -459,3 +459,6 @@ _dv_quant_x86_64:
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/rgbtoyuv.S
++++ libdv/rgbtoyuv.S
+@@ -1430,3 +1430,6 @@ video_copy_ntsc_c_block_mmx_loop:	
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/rgbtoyuv_x86_64.S
++++ libdv/rgbtoyuv_x86_64.S
+@@ -1370,3 +1370,6 @@ video_copy_ntsc_c_block_mmx_loop:	
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/transpose_x86.S
++++ libdv/transpose_x86.S
+@@ -188,3 +188,7 @@ popl    %esi
+ popl %ebp
+ 
+ ret     $0
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/transpose_x86_64.S
++++ libdv/transpose_x86_64.S
+@@ -188,3 +188,7 @@ all_done_ready_to_exit:
+ 	pop	%r12
+ 
+ 	ret     $0
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/vlc_x86.S
++++ libdv/vlc_x86.S
+@@ -585,3 +585,7 @@ mod_12:
+ 	.align 16
+ const_f_0_0_0:
+ 	.short	0xffff,0,0,0
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- libdv/vlc_x86_64.S
++++ libdv/vlc_x86_64.S
+@@ -671,3 +671,7 @@ mod_12:
+ 	.align 16
+ const_f_0_0_0:
+ 	.short	0xffff,0,0,0
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
diff --git a/media-libs/libdv/libdv-0.104.ebuild b/media-libs/libdv/libdv-0.104.ebuild
index 8749521bf921..bf9a3ad66a1d 100644
--- a/media-libs/libdv/libdv-0.104.ebuild
+++ b/media-libs/libdv/libdv-0.104.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.5 2005/07/09 01:29:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.6 2005/10/05 01:15:50 vapier Exp $
 
-inherit eutils libtool flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Software codec for dv-format video (camcorders etc)"
 HOMEPAGE="http://libdv.sourceforge.net/"
@@ -15,7 +15,7 @@ IUSE="debug gtk sdl xv"
 
 RDEPEND="dev-libs/popt
 	gtk? ( =x11-libs/gtk+-1.2* )
-	sdl? ( >=media-libs/libsdl-1.2.4.20020601 )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
 	xv? ( virtual/x11 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -25,8 +25,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
 	epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
+	epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
 	epunt_cxx #74497
-	uclibctoolize #74497
 }
 
 src_compile() {