Fix underlinking by always linking against -lm -ldl wrt #504698 by "Guy"

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 41 insertions, 19 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/Manifest b/media-video/ffmpeg2theora/Manifest
index 2c490fef87a7..be97b414f371 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -3,25 +3,20 @@ Hash: SHA256
 
 AUX ffmpeg2theora-0.29-ffmpeg2.patch 1509 SHA256 c61e51f3c5b42c80bec5e2587609a3385862978c9020fcfc7d13c6d4dbaabfc0 SHA512 5fa1ac0b1b6f78b6e3d9bc9813357c80f2581b02998eb7ca88ba2864d79032ded59bb9a62dabd90a1808d0497ef1ec6790ebf23e03795c7d6ed0b35fe7a19d91 WHIRLPOOL eb5264e9e5a969ec76c8ddffb22bcd56626c6f086731c6c1401c9244172eefe70ae2cc05df791cec65962a54e9b0714def209a82dd6d7f78e45e0118ea4b4ea0
 AUX ffmpeg2theora-0.29-swr.patch 778 SHA256 f0e9faa4770ff965eb5a95318a3f9b52f8e6a2abf8de780f909e36ddc911537d SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73 WHIRLPOOL 3e33b488c759730eb73fad415a237acee3119026b99d9750d828622d9ce5cd8db98d515fcc175299bef9721a7940f64c6a89283dc6208f7b3cd2e0207116c018
+AUX ffmpeg2theora-0.29-underlinking.patch 503 SHA256 3b937c7e3a5afe327ee75e246ef606a747b8fb5880b43a864b3b9db4a245ef7f SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632 WHIRLPOOL e7e6d9a91e904c818514d02d12eff877d74d2960ccb201aefaff4f56de3588c7d481a8daa07da3928424d7c506561fbebd004a92b8d4a8ce873d2b8596112ec8
 DIST ffmpeg2theora-0.29.tar.bz2 90143 SHA256 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d SHA512 5e5cf1dbc6807a15b3a3e8526955ef341357b6a3106a6449a54b5dc09c652a9df34b5e93c9cbf05e1efad87542364cb8335e173a59a184aa2ff38ec4b536a725 WHIRLPOOL d093a0b0a5d90f6b9a3d959ff662e5e8c9f8ca36d51122f0c293d2189493bdf6daa710fa94be0fdca0d63166c3102dba82da1e533e1876e62f3ed4ec47b65bea
-EBUILD ffmpeg2theora-0.29-r1.ebuild 1212 SHA256 af5cf65d8341cfc7dcf66dc7003ff2b2d6737b0d23f6783da827cb758a022f91 SHA512 1635a344a77a249ac1c83b47744f1f82c7851f1162682210fb8bec624dbe7a347e9d3945b877df54423bb31031bb90f8c9c31a4eef01fe4530c82d63acbefbe9 WHIRLPOOL 63b1f8bcb9f398d24611ddec287ecc6e3e0b5db782ea1558dcef875fbde3e6e97b88b5eeac2848bb0421c810e7fe143d960dc0feca86560df378832af9ac0cce
+EBUILD ffmpeg2theora-0.29-r1.ebuild 1264 SHA256 d0e255eb8ab97c2786798cb7bf39a1f0a9683fb3f055010441bc5e754cfdcc00 SHA512 278f6ee05c90f67d30a77d1ee977f749a35adf0d0e5e0b020d1144cfcaab9a21e6910649de4c70e83b71869b6609a02277801de75dbea4f95ec3aec1ebbe9e7f WHIRLPOOL e954ae0aa4e401b17074ddc096293fc952fbf1def81937f9d63833f9fecf8fbc947f15f85482b588ca64c95d22a3ee4c4753bbfe3c4b707c7104f1c8a5786962
 EBUILD ffmpeg2theora-0.29.ebuild 1199 SHA256 232798ab60e1e93a67fb16c754506e2fcbe99da326011b23a58e784495447db4 SHA512 5b0e125653d9d0b8b99f61f33d65c37442d4d7e14a101b019407723e4b91df400c3bca07c38c5ffc183fa2b5c8f9204490589958964bf58921d3ba9336492d51 WHIRLPOOL 24a0402dee386af09baa8c3e283f8d27204cdfc5c0d8fea2d19d9b0b5c9e51a28ed8cc38857ab86f8919533628c92140e17bc528e6a1034c5bdf2e0e3220662e
-MISC ChangeLog 10204 SHA256 132679b1ea0fb9274251cd8e3a1aefcd91a1efea2c04bc74e6cbf913c0c00039 SHA512 85e1d690b6507c875d4fec940f4a3187018d77c658a04b90c10b81c1f4e390bb1ad47368b75682b7b5a5fc55dd1470ff1993bc70bab1ecb656149c2e1a7230f9 WHIRLPOOL c7a2cc7f8feba8292b04bc0bc9ccc8b03b95273a7e928170cd170dc5e16681a367546cc8f810914827996fbec6acc8e1dfdaba8af67be0fa3c79757770d0621c
+MISC ChangeLog 10418 SHA256 35b52040efc8bcdf59044a830e26eec37246d31f2f597f88b863bcbf4214eb7c SHA512 aa411c914f71b1c607f1c1f1cf3abe348bfb332dcbe21819a3412c4659d48bbce80be1501181c8e4668f8a397e425ef91affea401990b3f1a7e66095d12fc9ec WHIRLPOOL cdb424bed17cec44cc4bb8c9eabb25edb7e74aca5c0d59e54bd8bb4cd56632013fb2768616011ce6ffe94f79857435e20cbe603a428aa6b484e1215720e09b4b
 MISC metadata.xml 319 SHA256 0baf3db1e97a58c0210e91be4f08d6ecd30270f6875c0b63a77deab3aa85e530 SHA512 32c75672f9052ca9341ca231961d98777d7629027da1221c042a23834ccb4bea444bc8571e6157464f53c038064e68a5c0bfcfd0c0f459cac1df67297230e403 WHIRLPOOL 41c55a833e2d927d416c3948b2ee961a116e3d68375ba07b0c459c0dc98c9a8df5dc3fb104fd6670045a52ff744d2fcf3acfc4cb64db1ebb660eddde760c551a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1UHNAAoJELp701BxlEWfsukQALeRwuTSLrF6Mv8ZKwbfWOAw
-5qcTdrvKRQvUrKUsIzbyPSd+nPqBPRDhXuzESUggaA4f5JiNuYNs5cG8PtX6uvK1
-TXfzzElJm5WKDughZT3z79DBQrrb5NIgeC3lIswbp0Png3xgfUNRZxm2ufOjI5BC
-h7ZbpKjEQnmCwEXiyU+mwNX1WQv2pxQ2lnKU8ycLsgbG3BY7kjAP1deZcUOOxNuv
-xbpGHmFiA4qbh4Z41069mXJLlp2K8dLAKMFbWQhB2vFUrdQMyi4CzB1XoRDcXq61
-mHxLG52r0KpPGQW3J+tE+FsuGamG4MWT0bC1xdaEsdOBJh75Ms6dKZU/+UXb+4Mt
-cQItySwe+Kgv4KXx1R2U0Yrhi/sCgoF2I2dvYq1H4oCZLKuKlHkRSziedhy+CyAe
-OfjcGQTfZiWNNRdT4KPfpW9hY5y+/zrotdKIpbO5LYslabEJRO5v25+rfYeWoZYy
-PWTcNRsF1fmzEM+h9X6sfj7z4J9CLyQ6GLmUdM9U6abOPXik/VAM87RJ+7aOFs2M
-+onrPgi1A9fpZ6FvzlPbAlMEJPtVrAwuQuA9l4gyr41X3LrVckQReUtL3AkwUYgI
-2mWAtlJVbC8Ijc414kmAuIa7cOhHdC1aGnYDlDIcYj/tdTs5kruDuQuZbaojCHer
-D1obJcz5oBVqRg5nKpkj
-=bhMf
+iQEcBAEBCAAGBQJTJKNEAAoJEEdUh39IaPFNHuQH/0CLR6LMo9PqW0hAM+wSwe8N
+UTuxTaHjAN4lLLl0pzpAnbtX3KE0ddsevgb5N+bt6RcBINXpl4p7Toe04WdsEW0O
+AX0lBH8t/Yk1Sl2WBoBP/oSlGEPyjfSc3p8LIg4vOVHkbqKMjFiV9C5qeZay1AhQ
+fZcOqLtqAqKR5k7nTVJPRbaOgN1YA347QEMba7Avx/Mns2scGmq1IjJbtHrYBYab
+WNTyMlB+e3KCh87JD3N2xiRhAuD3Sbybb5wLzabiHuV1ORWHMGAapFay4bjhyghi
+raM6aaNMBBaJBtYbT/nGEkes1xtNalkjUcjP7olmalXrPo0+y7WNRsuoXSgHM4w=
+=v5iZ
 -----END PGP SIGNATURE-----
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()
+