From: Samuli Suominen Date: Tue, 6 Dec 2011 13:21:48 +0000 (+0000) Subject: USE="pic" to control text relocation(s) in aclib wrt #271476 by Rafał Mużyło X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e1446cd1df09cc4c2c47d9350a041051118b4407;p=gentoo.git USE="pic" to control text relocation(s) in aclib wrt #271476 by Rafał Mużyło Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index acb2f25d076e..4b025aeaf576 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/transcode # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.290 2011/12/06 07:39:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.291 2011/12/06 13:21:48 ssuominen Exp $ + + 06 Dec 2011; Samuli Suominen transcode-1.1.7.ebuild, + metadata.xml: + USE="pic" to control text relocation(s) in aclib wrt #271476 by Rafał + Mużyło *transcode-1.1.7 (06 Dec 2011) diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index b8b56439f3dd..27b863fcc762 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -10,17 +10,17 @@ AUX transcode-1.1.7-ffmpeg.patch 2274 RMD160 9873bd9a8ba3336948336a508551ca3dd0c DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009 DIST transcode-1.1.7.tar.bz2 2183627 RMD160 faa854acbbfd52faaa216505176f94d756d77841 SHA1 e35df68b960eb56ef0a59a4cdbed1491be56aee6 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 EBUILD transcode-1.1.5-r2.ebuild 4068 RMD160 28a0702c2d17db840b4914e679436103bcc0e32b SHA1 c6151bb2cab015e00ea8af9bcb08f3909e96ce18 SHA256 270250fe0f65571ed21827260ebed39e4430d0a442458c0bdece21281b190841 -EBUILD transcode-1.1.7.ebuild 3011 RMD160 b48cb24438b32785ba9fe0a6f1406a68b937f404 SHA1 564a3d6e2062909a925cd96c900b7c5922169299 SHA256 eb317892d8d66a0e5bd59a7ac09c311871e1351cc7d256686b405aee9e1c9e3e -MISC ChangeLog 48470 RMD160 935cc729dbcabed34de64bed44cbfc68ec0c55e7 SHA1 e5b25172468c4b99bf15056a255924f5ec012fb1 SHA256 89a6a888ded953a834ef0d3498b06ff39b5e81398ca7b6c55a273ccf9329e1bc -MISC metadata.xml 444 RMD160 af149b7604eda71e81265e34df694127e22d6614 SHA1 24254d62a1f342d7b5ca933da99f4fce5876da6d SHA256 aa72df101b5326a3ed9f47121b70546c60c45d486d70574d8f46bfc4e374ffdf +EBUILD transcode-1.1.7.ebuild 3094 RMD160 726a5910a7d7b88e5f772f219ce9ca531ef984ef SHA1 65c1984b730ec9954f8e0fa5901e7e6bad24b03c SHA256 e302621fd3b6f7c81dd5d20e0239eee1f510e2bc7896eb3a08d3d8e8af5022b9 +MISC ChangeLog 48649 RMD160 f8415fa81859e15355c8f07cff6ee63f410a8a26 SHA1 a502cb30e52e19106c93b431e5861711032c4e89 SHA256 f0ea414ac2caf1f894a833789f22930ce4e4739ead9acc818806876bb13cd9e4 +MISC metadata.xml 529 RMD160 c52a55dcb8ffedb63e2ddbc99d4bf959f9772550 SHA1 f26965716f7025486b78a2c953efd9180ed82fb5 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJO3caSAAoJEEdUh39IaPFNLYEH/3LJMP4pS+TYAvVLsjCWuZM/ -IXqwrGde2Q2cE6Elfvwt+6xaopWTTRqAM2NB0+SUafGSHd+y1gbsO+Fn968HOGpq -/UQIjrLZnyppANCD1bmZ1nq3l+os+tYhp5/pZJcpQ+OThHfqdTESRTgqQnZp/Le2 -o5+2jGBaDdgkaQWFNQfEa/O/iIYC1ZM3H9+55ncWxQkFSIlN4iulwaC0xyFDj5dj -2HYI+hKhHp+3rkQrpTE+Miluo3DpxfcP2hSpBGhrASFpXjKVVs46xHiNF9mQYStX -7Z7BU7/qf9SYRIjk+r16RgJk8TUrj+1q6OVOXSxGixGx5U7Kq1SACHrh1cTzwEQ= -=/VXs +iQEcBAEBAgAGBQJO3hbeAAoJEEdUh39IaPFNBRUIAJCgkxtOfZkNi3ZXHdhDXTv7 +YAU3RlN+/cNY89cklm/CPgGY6mHz8m7mzE8R8aLONsOSoguiPqlTAgV8Sf5Inuql +1CLJ7LhDhz/Uh6iB2DMXQWyPeAggqxusnU4X7e7nAneAiDA54nSXaf/2Ojs49SHm +26PJLXuaLJLD0r7wjuRiJyS4JsDDxvxrhB/LHHvL65xw9Y0jIrIpY7lumMmDQup+ +HKW/8lStXrhM9Won4/oHcbxuWNsgII1wQvXjYb4ZvX/jTf6WXSoHTEESwtkY9TTS +qUF7YEVOflTGgOesdDLn0wEQYtV5h7wTibGUKETZUqLs1ohVQnTpKBg3e8fTRdQ= +=7STw -----END PGP SIGNATURE----- diff --git a/media-video/transcode/metadata.xml b/media-video/transcode/metadata.xml index ec1027e5fb2e..2efa5d017162 100644 --- a/media-video/transcode/metadata.xml +++ b/media-video/transcode/metadata.xml @@ -6,8 +6,9 @@ media-video@gentoo.org - Enables mjpegtools support - NuppelVideo container format demuxing - Build with ffmpeg libpostproc support + Enables mjpegtools support + NuppelVideo container format demuxing + disable optimized assembly code that is not PIC friendly + Build with ffmpeg libpostproc support diff --git a/media-video/transcode/transcode-1.1.7.ebuild b/media-video/transcode/transcode-1.1.7.ebuild index a63bf109d17f..dd74b16e0b3b 100644 --- a/media-video/transcode/transcode-1.1.7.ebuild +++ b/media-video/transcode/transcode-1.1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7.ebuild,v 1.1 2011/12/06 07:39:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.7.ebuild,v 1.2 2011/12/06 13:21:48 ssuominen Exp $ EAPI=4 inherit eutils libtool multilib @@ -12,7 +12,7 @@ SRC_URI="http://bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid" +IUSE="3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl sse sse2 theora truetype v4l vorbis X x264 xml xvid" RDEPEND=" virtual/ffmpeg @@ -50,9 +50,8 @@ DEPEND=" REQUIRED_USE=" sse? ( mmx ) - sse2? ( mmx ) + sse2? ( mmx sse ) 3dnow? ( mmx ) - sse2? ( sse ) nuv? ( lzo ) " @@ -62,6 +61,9 @@ src_prepare() { } src_configure() { + local myconf + use x86 && myconf="$(use_enable !pic x86-textrels)" #271476 + econf \ $(use_enable mmx) \ $(use_enable 3dnow) \ @@ -99,7 +101,8 @@ src_configure() { $(use_enable iconv) \ $(use_enable nuv) \ $(use_with X x) \ - --with-mod-path=/usr/$(get_libdir)/transcode + --with-mod-path=/usr/$(get_libdir)/transcode \ + ${myconf} } src_install() {