diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-03-26 15:20:48 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-26 15:20:48 +0000 |
| commit | 5eb5eaf250eceaac9414d8f1472ffb4fa49fa6e0 (patch) | |
| tree | f91bf8de11e68eda5f16dbc17bc23d3a167301a4 /media-video/ffmpegthumbnailer | |
| parent | New addition, mainly written by rei4dan (diff) | |
| download | historical-5eb5eaf250eceaac9414d8f1472ffb4fa49fa6e0.tar.gz historical-5eb5eaf250eceaac9414d8f1472ffb4fa49fa6e0.tar.bz2 historical-5eb5eaf250eceaac9414d8f1472ffb4fa49fa6e0.zip | |
Fix building with sys-devel/gcc >= 4.6 wrt #357305 by Ryan Hill.
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpegthumbnailer')
4 files changed, 23 insertions, 5 deletions
diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog index b7d3d985505c..d2e8ad1ba7fc 100644 --- a/media-video/ffmpegthumbnailer/ChangeLog +++ b/media-video/ffmpegthumbnailer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpegthumbnailer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.113 2011/01/22 18:05:18 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.114 2011/03/26 15:20:48 ssuominen Exp $ + + 26 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> + ffmpegthumbnailer-2.0.6.ebuild, +files/ffmpegthumbnailer-2.0.6-gcc46.patch: + Fix building with sys-devel/gcc >= 4.6 wrt #357305 by Ryan Hill. 22 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> ffmpegthumbnailer-2.0.4.ebuild: diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest index 6704c570eee4..aaa903746bea 100644 --- a/media-video/ffmpegthumbnailer/Manifest +++ b/media-video/ffmpegthumbnailer/Manifest @@ -1,8 +1,9 @@ AUX ffmpegthumbnailer-2.0.6-asneeded.patch 763 RMD160 602d8a289b5da40e65d27f17fbe5781f5f601088 SHA1 e81d9f7b63b71c45a14f5b25c4397f4c37991ff1 SHA256 355341d389b90c31d0a80ba6ff92f6cbbcc3da397878f4b50b05500a8ac9a2e7 AUX ffmpegthumbnailer-2.0.6-flags.patch 797 RMD160 58371ffbda3b458c202883e31b36697c826470a7 SHA1 4705bca7e0836782875117eff57883016ba09e0a SHA256 1f8bfe8a1cafdda386fbe2d19920874a001c64d58e5e1ca86aee7762755c4db4 +AUX ffmpegthumbnailer-2.0.6-gcc46.patch 439 RMD160 2a76f670a6488419f3f82c5ec3f19d7506d78637 SHA1 035f01e78d634f0c7568a1cb7b89dba6b31e2186 SHA256 2c6bf46fefdf89e1e6c79306ec34ccc4a8b7b2d1c7009f0c4d6d52008c06547e DIST ffmpegthumbnailer-2.0.4.tar.gz 343282 RMD160 a7a9af78f316d181a678ed85098c233aaa0808aa SHA1 ce1e55d9a207ec4eacc963e054ac5a08b9e051df SHA256 05871ee318c6a4afa1fc88503e51680390e4730c76ae0acf5b3791f3ea955d5e DIST ffmpegthumbnailer-2.0.6.tar.gz 340052 RMD160 8c635c6d35b699ea9d2ef753fc70aa23827c0a57 SHA1 c565eb31910ea03801045e19230870c7e772b1a6 SHA256 e9752c0fd3c9bbe20382b527a11d5d4abf2386d0a18ae77fc0e6b1eeb00b7dcd EBUILD ffmpegthumbnailer-2.0.4.ebuild 1101 RMD160 5b5d93a83af5d0c6a6816e1106de63a7e44d19ef SHA1 d2a6179cc41733de616eacc82a5affb57e7b1c3f SHA256 cb4e9a391187f816a3a66ccd372392be9c1b3ecb9d75730bffd222d91b03f87b -EBUILD ffmpegthumbnailer-2.0.6.ebuild 1154 RMD160 3b301f84a4bbb85c10fafd39fdd7754b291377a1 SHA1 929b5062b772fb6d7d5357f1c3c35173dcf5728d SHA256 37fc6b7c1b9fe9fe3ae510069bd64aef209a1a86d1c20676969f40185dd676c0 -MISC ChangeLog 16274 RMD160 1e8d4cb4ad502024326ded751c867c52e3d9d227 SHA1 e4557711fb51559204007d3a03b540b82eb70f89 SHA256 e2cea0473f7617eece61cca833b0609e1f824847ed1567ef1dcfeae76b753076 +EBUILD ffmpegthumbnailer-2.0.6.ebuild 1160 RMD160 0bd872f141f9c3032d59d83cc8713630eb74e0da SHA1 aed6bb3942c50b727c6f8c78b54550b25d0262e3 SHA256 cad0f3917d290885ffa3c494e88aab5eadbd255db4a9da63d99cd7d752f79896 +MISC ChangeLog 16473 RMD160 6093f89f1a96eb74122389e38d86c6ff461b25e1 SHA1 fd458baad9504ecda3698b5efca401c56f1f59be SHA256 3396959e62e2f28e4cd2e7e7483f4e9e2665faa0bb1b32417d538792037479d8 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild index 641fae116a49..fe8de338fcaf 100644 --- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild +++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.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/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.2 2011/01/09 14:05:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.3 2011/03/26 15:20:48 ssuominen Exp $ EAPI=2 inherit autotools eutils @@ -23,7 +23,7 @@ DEPEND="${COMMON_DEPEND} dev-util/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${P}-{asneeded,flags}.patch + epatch "${FILESDIR}"/${P}-{asneeded,flags,gcc46}.patch eautoreconf } diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-gcc46.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-gcc46.patch new file mode 100644 index 000000000000..71f0fd9acd63 --- /dev/null +++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-gcc46.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/357305 +http://code.google.com/p/ffmpegthumbnailer/issues/detail?id=83&can=1 + +--- a/libffmpegthumbnailer/filmstripfilter.cpp ++++ b/libffmpegthumbnailer/filmstripfilter.cpp +@@ -14,6 +14,7 @@ + // along with this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++#include <cstddef> + #include "filmstripfilter.h" + #include "filmstrip.h" + |