From 3a0d5a0f774f8ccc2b86723228773c03ce57cdca Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 29 Mar 2014 05:10:38 +0000 Subject: Fix underlinking (missing -lm for function rintf()) wrt #504270 by Hector Martin Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D --- media-libs/libtheora/ChangeLog | 9 ++++++-- media-libs/libtheora/Manifest | 27 ++++++++-------------- .../files/libtheora-1.1.1-underlinking.patch | 14 +++++++++++ media-libs/libtheora/libtheora-1.1.1-r1.ebuild | 5 ++-- 4 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch (limited to 'media-libs/libtheora') diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog index abdf768aabf9..f0fd1380f3a4 100644 --- a/media-libs/libtheora/ChangeLog +++ b/media-libs/libtheora/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libtheora -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.114 2013/10/14 17:47:48 mgorny Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.115 2014/03/29 05:10:33 ssuominen Exp $ + + 29 Mar 2014; Samuli Suominen + +files/libtheora-1.1.1-underlinking.patch, libtheora-1.1.1-r1.ebuild: + Fix underlinking (missing -lm for function rintf()) wrt #504270 by Hector + Martin 14 Oct 2013; Michał Górny libtheora-1.1.1-r1.ebuild: Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest index 86fffa7574f4..9076666018c1 100644 --- a/media-libs/libtheora/Manifest +++ b/media-libs/libtheora/Manifest @@ -3,27 +3,20 @@ Hash: SHA256 AUX libtheora-1.0_beta2-flags.patch 763 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6 SHA512 72916c4ed0f9609b84af7c72b35b558ecfb2ed7533739e170ed088e06d0e82a585dcc1185f3c5a5d0644d30901459813b635df2ba951e2290bcd4303cfebc20b WHIRLPOOL 6545f1566ae050c109b786dc7d1a5ee42b4d093fcd4d418ac4e86a51f0ac753f6c9ca2837a43db2dd60623a0c9b1650d0243dcf06bcf7a0eab455856eb08f2ab AUX libtheora-1.1.1-libpng16.patch 512 SHA256 e4c9a8dc798c596ed32a2a720020ae27a0e72f5add1a47cb8fadebe0e7180d7e SHA512 856da5da7788863c59c9cb6c4fa102d250e60d6b302a5c118799169bcbc5350ab0bf6798f2ae2586f1d361ff9030d1d715214d8df900d7e1aa4a4e1d58f44276 WHIRLPOOL 51bf5187e103aa9b02240d60e200d545fcbed9ce5850705fff542d69822688694e29e5924de8cc6fd39442baa165a5e0958ebe38d4984d586e14be0f076d315c +AUX libtheora-1.1.1-underlinking.patch 477 SHA256 738d6ad8392079273b66b4d2268afcd4f14ac3677c6393bf72d2fa8aefabba8e SHA512 00d02a773d5c95361d2d582d0147d4469ac4c882e62e25452908329b536261e9f09de82db8280fdc42985d0d8d5cdfa2f4866c76da03aca8f29237799b70a080 WHIRLPOOL 99d5e7b71e435b01b903e2b30022129eec1294e86335db21e43d9927350754175d65bd9fe7cc44d69c190784e6388ef03eb3b2cae2d4ec5ba59650c77082d18d DIST libtheora-1.1.1.tar.bz2 1903175 SHA256 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd WHIRLPOOL deeb71454da7b32e3561ef31925e685170123bb18b0b4963db18cad8c422ede3a8e0a29662dbd45edce51ceca12c7ad5d2fe70f33db0c3a9b1cabe84fb37376b -EBUILD libtheora-1.1.1-r1.ebuild 2482 SHA256 ef6efdf0b50e8ce51d3825b3ced9d0b59892ddb953a1e4538a6c6ed436f1e6bb SHA512 82ca39aa2e22f1c5ae636b80843977a9ca76b44cfd3af3a095b66d28e4c06fd48aa7b6739d16f24d945e289933e64c303e1ae77bfbd7057f9fa0bf64bbc55421 WHIRLPOOL 298ebcf0357fd0406edb634114f1cb49c0ac0c895c77eb0c53d6ebc29a346b7c87624ce7bdce5b82a3ee86ea04cb8156f086744542f62d8a49946876a1b032b5 +EBUILD libtheora-1.1.1-r1.ebuild 2527 SHA256 d18cf484fe1d6b39a660d4eb716b83f3a3cecbaeae0f7e6082670168cc5b2dfe SHA512 85c3bbce00cae87572b505c2bc1522d98db0fb14db37984a2dcfcd2f1b4ad52ac72f66a0e297d3b6fab4848bb28e2c65beba1d5d6d9f8910f2708e6509180133 WHIRLPOOL 39eb0ad9019f63913d630e4f8ecfb0ab19086f21c85b27e206714d63b95b993d75b5ea4fd159816ea01707260b4e27195d9c092619cc0e3ceee0e4f529276701 EBUILD libtheora-1.1.1.ebuild 1960 SHA256 905477070fbc01671a6cc4d3e00aa2afbc9c7e1d601bb06f167978882cbf064e SHA512 6f5249a60c994010a7ed6753ea72b357e165b6eea68d15d035cf998db4a8c8234040ee8e879abce75306e1e002a43db01556f54bf43111d6fa08d715b6519102 WHIRLPOOL 16e77d1ff3eaff9660d457790eb44f87d3d7d2e3f5ac25d9aeec98c52f2e133a69ae6442ca4d2d529b7046eb6eac42ee968f23339748d20b4772f826f98353bf -MISC ChangeLog 16008 SHA256 e4df1a29d950eac68b0e5a52b7a65f188b9a2a107b253a44853c5b51acd1cc47 SHA512 e7ac373837bd238615ca217823163374f8655548280d1955c312c0e924054ddb268bffca4f0575a5e956b61bea6ce8241dd349881f20262d16c93fc141242d1d WHIRLPOOL fcd488e1241dcfa9f3766c087fec4b93c198ad9d875d1d74653c9a1c8352016010269f7fa53b5aca046201aab11c848612cfa3cb9cfc9e678bbdcfbd37f27452 +MISC ChangeLog 16223 SHA256 a2474dea9115e4bed8b1f262f076cd13e9a1df7d0051ac47236b26e5fb94de76 SHA512 cd11b9ffb45f93823c2969d5c4fde35957e24728eb0f954dddce86a5d06517e54317bda0df2a432c7fe3fb8b045284e41def4c6a6860cf4884148ef190c26f8f WHIRLPOOL bb87ba2b00500df25eca2e97d4c8f6b284e86b4d7b6008274d9c8714190594fa68122d7105718ea5887bc6d4f10084222291c80511e94ff6395cb53420b97285 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJSXC5PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1hEP/1xu2hiEv1fImFZENmhO+qLF -TIRYQj5kVdsUyaWoDOcDbHe/6tuOGpVjuBIyQm/z+6fa3DLqpmuA77R534qVjLwR -V2R4QyPz9JxTeSZ7stmAKFoyOz+CBZ9zAeK2GJlwBzmfRRJbPIitWJtR0K+TLu7Q -sFVC3KTX/TDkouVZjY72koiUEuphx64KWc23fmGfdnTGuHPHTcpcn+IGvJkddn5d -eXT7naTlsczayuhBy/9gmhUx3aGnqRDm1mmscWlTga5Rb5TVc5EyPodNq5tVexx4 -OVCDNEPeXj3zTvIyuvye+4RWAb7kZ8zxbOiGjYOJAQkncVJvFrWcKGxq9v82yKhK -rbNVG/G2PZrNbOhq0A0dhXJPQtwxx0ZSqzlCiZagnY/aqOVagEyLhA4hKyjf2XX7 -hvRqSinmOBiqsHw2mC8tZJGQRfBZs4nh92Az9iU9ggeRqtuAinfYK0JZ8x7Wjz0J -v17aeAL8VCmGNiWmElyLEN4JhFJiByDB6H1Ar3mnMQsuTIFAFCcc8Q3pkAi5mcbO -Rq2pqSeUEdYOfypY0giJbdRAtx/wYNgDxhFd3jPb+X9YPJDUiun87jr7dmo4ip1l -FfFKxYUzX0Lp63KlehR0CZaEIp5C3bDYmrKYRGZo1bztW9cDIlpkDjlLwcVVlcCQ -damKj6mHWijY2GO5BLvb -=A5hS +iQEcBAEBCAAGBQJTNlSXAAoJEEdUh39IaPFNDrwIAIToR6gb5qZZ9HQ0kp1xFIBy +pDG5Qlq2tYF475GR13RkHsE4TfxhsYOCmAg8rnTIjVQR9cRj/cj03SI0/AD7qPCr +JBhShFl1Czj7iXmPAinCKAFoNZQs7jKH5DLmfxn3OkUHih52Wjl9CrFJC/srpzoO +JvR1RYNoFjojaDXL95k5G3ASXf3dlRLpQaleA+YsiBfIL81Tc7AWW4Nkijb1UiEF +EwjS3/u/N7EGYboT15C6eDeVME7wKXwWucYYITDIOsoFv0NO/O6AjLogQhfyIBMN +ViQvDhRZ4gd6SIDBhbfq9PjUSoKeQ2wGxswLq8XFtNlDHCAIDi57nVWSrId+Y/o= +=7klH -----END PGP SIGNATURE----- diff --git a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch new file mode 100644 index 000000000000..b45a368ebd76 --- /dev/null +++ b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/504270 + +--- examples/Makefile.am ++++ examples/Makefile.am +@@ -22,7 +22,7 @@ + + player_example_SOURCES = player_example.c + player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) +-player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS) ++player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS) -lm + + encoder_example_SOURCES = encoder_example.c + EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h + diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild index 2e3ab381d050..e74b9516e0c7 100644 --- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild +++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1-r1.ebuild,v 1.3 2013/10/14 17:47:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1-r1.ebuild,v 1.4 2014/03/29 05:10:33 ssuominen Exp $ EAPI=5 inherit autotools eutils flag-o-matic multilib-minimal @@ -37,6 +37,7 @@ DOCS=( AUTHORS CHANGES README ) src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.0_beta2-flags.patch \ + "${FILESDIR}"/${P}-underlinking.patch \ "${FILESDIR}"/${P}-libpng16.patch #465450 # bug 467006 -- cgit v1.2.3-65-gdbad