diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-06 21:29:34 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-06 21:29:34 +0000 |
| commit | 39ac8385fe7f345967f64a58270a644c95d2b739 (patch) | |
| tree | aba126b5283c6207517f06322dcfb96fe37ffe0d /app-cdr/k3b | |
| parent | Version bump (diff) | |
| download | historical-39ac8385fe7f345967f64a58270a644c95d2b739.tar.gz historical-39ac8385fe7f345967f64a58270a644c95d2b739.tar.bz2 historical-39ac8385fe7f345967f64a58270a644c95d2b739.zip | |
Fix build with ffmpeg 2, bug #476494
Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'app-cdr/k3b')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/k3b/Manifest | 15 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch | 19 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r4.ebuild | 3 |
4 files changed, 39 insertions, 4 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index 3aa2f53c5aaf..fe484ccbc330 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.280 2013/04/23 23:54:55 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.281 2013/08/06 21:29:26 aballier Exp $ + + 06 Aug 2013; Alexis Ballier <aballier@gentoo.org> k3b-2.0.2-r4.ebuild, + +files/k3b-2.0.2-ffmpeg2.patch: + Fix build with ffmpeg 2, bug #476494 23 Apr 2013; Luca Barbato <lu_zero@gentoo.org> k3b-2.0.2-r4.ebuild, +files/k3b-2.0.2-libav9.patch: diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index 6bd7477e5856..9d75cabc5600 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX k3b-2.0.2-ffmpeg.patch 3298 SHA256 4285080dd207ba7282bde1de73b98c49c80e0d02e7ab53cb0317a94b08a2a547 SHA512 ceea638638bbeb9c8d83b8ff3a660f5968dacf75a57e066782fc368396206584657372f1be55e435582e43284a50ff7df82371e63e9d51a657e06362ac7d1968 WHIRLPOOL b1aa447ed842a8f0c8a688728a59189e68ecd8000faf7b0449a71ddca54ca72ccc81bc4bcb4af2ab10d50b1c4a77192ad7c0d3eca352a73112c5dc59ee079946 +AUX k3b-2.0.2-ffmpeg2.patch 610 SHA256 10172f1720a1f762512d3db2358e84ad2b7aff6634a708c20533fbb9cceae987 SHA512 1657accc1d93b803f5b517d6342c8e686b0036d457daf0aa167e3ca81fff97a72ea22667fe8b108d0ef3816ac21db34d3028cbc5321e9907394dcf79e2ed037d WHIRLPOOL d0cf603c20d186183ae37305cbbcedeefa447f33f6a14274be25ca8c4f65584c91eb35c7a642219c8923cad18cdd4a7f1c183bb838e45a772b4629ce6eb9b0c4 AUX k3b-2.0.2-libav9.patch 991 SHA256 fc69fb52fc6c0e1a6420c7b33600095f21c444397e188aa5d41e067ef5d9d1ef SHA512 3c33390b92f92ee6c914b58ead112671a90060b5a9d2a3d23564c30f2eb1f604b88675081b60cd4dbaf707f32a2c019f322ada4707c7fd0607e9f2b055f65eec WHIRLPOOL df0af01f885aa25f636cd11da2f63bc791c88f113ee9fccef088f50e7eb99f6f64b38c166616611aca1d283efe17b53de6d6b3d21a0f6f1cb271b48b21993fc0 AUX k3b-2.0.2-libavformat54.patch 917 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271 SHA512 bb43a19ce8a0b506a63dbe0472b558c24b543684981f10b35721e83903b2b4d2fdbc5893a0634463b0d37763f6d3efdec127f2ac7d937ce8ed0f3a5b8cda8b53 WHIRLPOOL 0fe3cf36bcb50886a1ee9e9f29ddf2844a3cf4087ca9c7a752335f32f4680d031a0cec972d8354818718c8036c714951b8b4c81e7f123dc48dc492ce663260dc DIST k3b-2.0.2.tar.bz2 12833321 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd SHA512 e0a3d357decf7120a67d391d2311aaa5992f42cddbd20c5dc67f3d0e2ce15d6c53c0978cf2de6c09b96d57d273bca915fbbc0ca28547d708e2db20c795b86aa9 WHIRLPOOL 0dc975344962c98c20f9a03e3fb9225499668bed206ed61ea58b17ebe4594c2f71e237cdfc94e84a85e08b585cad6d1eee1415b129e998da3664d0544218a171 -EBUILD k3b-2.0.2-r4.ebuild 3277 SHA256 f03729171a6c8fcc3fa6c47528a66b31cf577ebb195c7de271e02b4b968a25df SHA512 f48c01005ebb7dda487d6e8133422332f1a6f042f7a59ca14840293a25c4ef5ce1671b4bec15f1958650549d7bd29111ba55196134cf28f210dd9143d8988a17 WHIRLPOOL bdb9f198b8b7154f0f83f131f543e4648c3b7929cd2955ce99f2bc6c9c73b4798afe6d70ce3e55f0c5e96e4d078c77ddbc91fef6c2bf713e721737dc05a331ca -MISC ChangeLog 40984 SHA256 0ea5b39b0f65cfe74e2a62244906682664bdb5ce1d5e8ea2db37e920bdbdee59 SHA512 75a07d800bcac852a54a92919e7210936984e25bfc914c3de32b3f1b4a5c6e05941b9001dc8bc391fb13d88c585ee3519a4bd7dd93c3465d1ce82e53bd16efa9 WHIRLPOOL fae867670235ba6eaa1b3a88adad242a74bfd884f416aee05f4c1df063155d5412a89100d8676522c8a85a2f3ce5b2915b2fcdf631810b5856db3599894ceb13 +EBUILD k3b-2.0.2-r4.ebuild 3312 SHA256 c38fe3207e51e82afa11e47c0c97bb8b616e691fbd4073bd191c1970b76fa279 SHA512 84e027f6e105021c74dd66a78f2c039843af9907279697e9d330b79928c37fc8c754629cb3876e1fbef411728400ba73c4598b5609d3c08affabb5f1a2592e25 WHIRLPOOL de5ab08f475deec6624c4dc6692e8c387cc93c974cc8fd6c93703fad3fb7876d943a89414c73e457b477d8d0e86d33584d7a5175935f1f1d1b10b4c10db8338f +MISC ChangeLog 41132 SHA256 6168d2454f634cfb0bafd1e3e696bed9118f7f66f98b022e84033c87baffda3a SHA512 1569e9ba5a1afbb51acb7f3facd383b477aba97f1eb563e0f255bfb6c1aab07879176aa81d67d1c516c20c64ab70113db11f805ebf7007b586d6ff7d62620998 WHIRLPOOL 2485a53bf9042459e25f619f3618720e0876d1865e7c95b3dc9d9267d7f66bec4787226462a308753eedfbbe1c4534fbf13d0a238c80082ff5b40eebca6b99ca MISC metadata.xml 265 SHA256 3dea268ff3e546f9a3d7df20a050528dbf48f83fe0142cf490b63312eed88cc6 SHA512 8c7a8d5e962e26b742feb0cda67f3920db24b9266f44cc2404514e50fa0214544f0307404cc7d226a33475da8d26eae830238ea1704c350da28bb99c641ea841 WHIRLPOOL b31fdfe2e9545569ae68416695e172fffefbf0422ec04b09d83d82a9d146738456435d8ac60983105ef8c72169c67ee8ec0f3f76e978609ad9ca7e9e7fddecbd +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iEYEAREIAAYFAlIBargACgkQvFcC4BYPU0ofPwCfThSH/a1mqeunoOwQT4Ff9vGa +6bMAn17IPTpV0aJ3gT7If2W9cK7VS9gH +=6Zhu +-----END PGP SIGNATURE----- diff --git a/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch new file mode 100644 index 000000000000..5c34e0891ded --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/show_bug.cgi?id=476494 + +A better patch using avcodec_decode_audio4 will be needed but for now this +fixes the problem. + +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -37,6 +37,9 @@ extern "C" { + + #include <klocale.h> + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4) ++#endif + + #if LIBAVFORMAT_BUILD < 4629 + #define FFMPEG_BUILD_PRE_4629 diff --git a/app-cdr/k3b/k3b-2.0.2-r4.ebuild b/app-cdr/k3b/k3b-2.0.2-r4.ebuild index f1748a13d4e4..47b0b30a127d 100644 --- a/app-cdr/k3b/k3b-2.0.2-r4.ebuild +++ b/app-cdr/k3b/k3b-2.0.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.6 2013/04/23 23:54:55 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.7 2013/08/06 21:29:26 aballier Exp $ EAPI=4 @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" "${FILESDIR}/${P}-libavformat54.patch" "${FILESDIR}/${P}-libav9.patch" + "${FILESDIR}/${P}-ffmpeg2.patch" ) REQUIRED_USE=" |