From fde63539ba009916194d04759929d654abdc3c8a Mon Sep 17 00:00:00 2001 From: Ian Whyman Date: Sun, 18 Jan 2015 19:53:43 +0000 Subject: [PATCH] Extend ffmpeg sed to a couple more files, fixes #509300 Package-Manager: portage-2.2.15/cvs/Linux x86_64 --- media-libs/libquicktime/ChangeLog | 7 +++++-- media-libs/libquicktime/Manifest | 14 ++------------ .../libquicktime/libquicktime-1.2.4-r1.ebuild | 8 +++++--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index 67581cf1b553..849333351646 100644 --- a/media-libs/libquicktime/ChangeLog +++ b/media-libs/libquicktime/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libquicktime -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.198 2014/12/09 10:06:49 jer Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.199 2015/01/18 19:53:42 thev00d00 Exp $ + + 18 Jan 2015; Ian Whyman libquicktime-1.2.4-r1.ebuild: + Extend ffmpeg sed to a couple more files, fixes #509300 09 Dec 2014; Jeroen Roovers libquicktime-1.2.4-r1.ebuild: Stable for HPPA (bug #526014). diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest index ea7926e791b9..66c8602f48a8 100644 --- a/media-libs/libquicktime/Manifest +++ b/media-libs/libquicktime/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX libquicktime-1.2.4+libav-9.patch 464 SHA256 d2ae77357d52e522f56c12fb1409b6d27bd576582122d04177a7433b39538bb3 SHA512 691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e WHIRLPOOL 5906f1cc37d305616579084e0e4338f08a41817e51dc66e3d044b0e9012253aef2674c9fb06df48d689dea8e7431f73a8d8c278af723982d7e873d8376f717d4 AUX libquicktime-1.2.4-ffmpeg2.patch 4046 SHA256 2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93 SHA512 32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d WHIRLPOOL c22a21bd245f51c457d68291bb86536f7b381fbf01f9ff5ad6e3f4b727938dde9cbe0bc0ba7eb4fbef71dbced2aa02121a097a9cdeb5bdd4c24dac699df48c08 DIST libquicktime-1.2.4.tar.gz 1028626 SHA256 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd WHIRLPOOL 8eda1c75d86d728157f4e4c9e07555dd8dfa2a6ad5fc37d022142111993610d8350e54d586fe1c6627402f22ce42a9b9505a3ffb909f9bb530b9ea0f71b6b192 -EBUILD libquicktime-1.2.4-r1.ebuild 3567 SHA256 632168edf960e1af5e4e763abe6b815e115ff9c04be3c209712c6c002479a37e SHA512 b7fb268080de864f2d5290bb12a3cf89619a6bcb06464a610fb7537f7cebbcafd1c3dbf47b24617652e102fd7b6641377ede5c16a574b00aefd540ac44f8593a WHIRLPOOL 39e220e47d2f29fdddbfe8cd29a1c30c427bf29a18e01815abc7fce711593fa618274cdffb294e47bf4e2d0255135a8fd7cc69338c6c299af64120dc9719cd6e +EBUILD libquicktime-1.2.4-r1.ebuild 3622 SHA256 5253ab1ae927824fe9bb03241dbbf69466cf3d5554fdc739c11f8fb64bb6c9d0 SHA512 fc03c1295e9f25d108ffba3a199d10207aef2beb207c7a860674659f3f076e129cd65de8356548ff4c98cc2979fc3e95c0d5367568401b786534e43e98f62578 WHIRLPOOL 8bbf0131f5daced0ec6dc586ee29ba4f625221684df18b92d7b0600915f408ee1929892813315b40add4f6e33da33fe853f5223710e73d6235bfcdb652fb131f EBUILD libquicktime-1.2.4.ebuild 2794 SHA256 dd3e6aeba101accb0e12e09cbce953e6dcb1ebd30e0760cfbcd82a5d82390432 SHA512 98bef72f817ac29710db5951b37cb1bff33537b67b0c8bf4416b6ea6b5fd0c2572b773d0fab85bc0ff3842d7c36fdb38977886467669f81c9f07a17922046535 WHIRLPOOL ad339a8ae6cb545dddaefb060c2021053904f33ea4a6b3990f40caff20303e02b8f99fd0f0a93b074a9f626caab26afc697d155a5258d80c579b5d546f3d1ee6 -MISC ChangeLog 29166 SHA256 0be29799d3ba637849cef0c82bca176079948f9a3613f9f41dc96ba30b83f5d9 SHA512 f02224010e82af40887c2d09080b4f5bbaa5eae629523ddd1f74a5eae523b1d8e567ca5d578333706c000bc69730000918b24cdd6c1140ed4e4165c128f5c9f2 WHIRLPOOL ca59b1effda72a6c9d2a67266113e4255e2e219fc427c95d4329fcec56fa3e956268a5dac91524e68890b21a39382f884426f9c84c6325eaa6ff2f8e48fcc499 +MISC ChangeLog 29310 SHA256 254e4c04f1f07345bccb85cbae15edfcb58850d033b30d2ef6284d5c571e5459 SHA512 48497de3e2b8e04ab50a4a38746c8f51f56c4732b4163b8cf58adbb809d37bcff99525d01d5a6334d32c3bfd8e7c32630f476e2ae0ff8cf07a3bf0babc15367e WHIRLPOOL 7afa5dc4cb57603353c63d792fb4d11a5e7f80f34da207bc585856a7fb07b6e097c9c1be3e8efdc889d630de38f1c8bc4c08b42a7db96e335b11974d21059ecc MISC metadata.xml 429 SHA256 0f34b97b72c8fd6ac971342f174aee213910769a0a45060b188da3e9b98bbfb0 SHA512 03e085e21c5be7412f7424eb900f3ff33f085e9941b8f296356b6a39d6ee2233bfcf01f54ac06fe459ae960f8c8f829969946379a6bd54b6f5d59d51c79555e9 WHIRLPOOL 33ee43277f22fe3d52e05362e1d3a2ceb17f96b6c3acdaa37e58e32418c7039be05e19c87a5f10a261dc4a1592a0192f0e52b1223b34addf6acceb4842e57326 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlSGyboACgkQVWmRsqeSphMjLwCcDnRGVV9NX7gxCe61rHeP5Ys4 -/qQAnRic3VcXE1bV2jrC6FfiITS2DcpL -=rBw9 ------END PGP SIGNATURE----- diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild index 8df190d5cd28..239537a3dd37 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild +++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild,v 1.5 2014/12/09 10:06:49 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild,v 1.6 2015/01/18 19:53:42 thev00d00 Exp $ EAPI=5 inherit libtool eutils multilib-minimal @@ -54,7 +54,9 @@ src_prepare() { epatch "${FILESDIR}"/${P}+libav-9.patch \ "${FILESDIR}"/${P}-ffmpeg2.patch - sed -i -e "s:CODEC_ID_:AV_&:g" "${S}/plugins/ffmpeg/lqt_ffmpeg.c" || die + for FILE in lqt_ffmpeg.c video.c audio.c ; do + sed -i -e "s:CODEC_ID_:AV_&:g" "${S}/plugins/ffmpeg/${FILE}" || die + done elibtoolize # Required for .so versioning on g/fbsd } -- 2.26.2