diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-03-15 19:04:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-03-15 19:04:18 +0000 |
| commit | cf7d55154db7f033a527eebc3d22bf261c668389 (patch) | |
| tree | c303b12d5880c5b4a3a74794aeb8d9582c27b8ee /media-video/ffmpeg2theora | |
| parent | old (diff) | |
| download | gentoo-2-cf7d55154db7f033a527eebc3d22bf261c668389.tar.gz gentoo-2-cf7d55154db7f033a527eebc3d22bf261c668389.tar.bz2 gentoo-2-cf7d55154db7f033a527eebc3d22bf261c668389.zip | |
Fix underlinking by always linking against -lm -ldl wrt #504698 by "Guy"
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video/ffmpeg2theora')
| -rw-r--r-- | media-video/ffmpeg2theora/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch | 21 |
3 files changed, 31 insertions, 4 deletions
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog index 30ef56df9493..81fc03cc606a 100644 --- a/media-video/ffmpeg2theora/ChangeLog +++ b/media-video/ffmpeg2theora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg2theora # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.66 2014/01/14 13:55:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.67 2014/03/15 19:04:18 ssuominen Exp $ + + 15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> + +files/ffmpeg2theora-0.29-underlinking.patch, ffmpeg2theora-0.29-r1.ebuild: + Fix underlinking by always linking against -lm -ldl wrt #504698 by "Guy" 14 Jan 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg2theora-0.29-r1.ebuild: Stable for x86, wrt bug #495818 diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild index 59ba680cf282..d8daaea0fdfb 100644 --- a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild,v 1.3 2014/01/14 13:55:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild,v 1.4 2014/03/15 19:04:18 ssuominen Exp $ EAPI=4 inherit eutils toolchain-funcs scons-utils @@ -25,8 +25,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}/${P}-swr.patch" \ - "${FILESDIR}/${P}-ffmpeg2.patch" + epatch \ + "${FILESDIR}"/${P}-swr.patch \ + "${FILESDIR}"/${P}-ffmpeg2.patch \ + "${FILESDIR}"/${P}-underlinking.patch } src_configure() { diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch new file mode 100644 index 000000000000..dc877603913a --- /dev/null +++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch @@ -0,0 +1,21 @@ +For example, pow() from mathlib is used directly in src/ffmpeg2theora.c: + +<snip> +v = pow(v, g) * 255.0; // mplayer's vf_eq2.c multiplies with 256 here, strange... +</snip> + +For build failure and log, see Gentoo bug #504698 + +--- SConstruct ++++ SConstruct +@@ -206,9 +206,8 @@ + if env['crossmingw']: + env.Append(CCFLAGS=['-Wl,-subsystem,windows']) + env.Append(LIBS=['m']) +- elif env['static']: +- env.Append(LIBS=['m', 'dl']) + ++ env.Append(LIBS=['m', 'dl']) + + env = conf.Finish() + |