summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-06 13:21:48 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-06 13:21:48 +0000
commit3f4c43480c72dc34bbc573cc3e7fe9fdcdcb0297 (patch)
treeaed4e34d4c2ac659e13433f3972b936fff0cff99 /media-video
parentmask for removal lyx2html, bug #388987 (diff)
downloadgentoo-2-3f4c43480c72dc34bbc573cc3e7fe9fdcdcb0297.tar.gz
gentoo-2-3f4c43480c72dc34bbc573cc3e7fe9fdcdcb0297.tar.bz2
gentoo-2-3f4c43480c72dc34bbc573cc3e7fe9fdcdcb0297.zip
USE="pic" to control text relocation(s) in aclib wrt #271476 by Rafał Mużyło
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/transcode/ChangeLog7
-rw-r--r--media-video/transcode/metadata.xml7
-rw-r--r--media-video/transcode/transcode-1.1.7.ebuild13
3 files changed, 18 insertions, 9 deletions
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 <ssuominen@gentoo.org> 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/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 @@
<email>media-video@gentoo.org</email>
</maintainer>
<use>
- <flag name="mjpeg">Enables mjpegtools support</flag>
- <flag name="nuv">NuppelVideo container format demuxing</flag>
- <flag name="postproc">Build with ffmpeg libpostproc support</flag>
+ <flag name='mjpeg'>Enables mjpegtools support</flag>
+ <flag name='nuv'>NuppelVideo container format demuxing</flag>
+ <flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
+ <flag name='postproc'>Build with ffmpeg libpostproc support</flag>
</use>
</pkgmetadata>
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() {