diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-03-11 08:48:25 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-03-11 08:48:25 +0000 |
| commit | 5fcc6998cbd3f57d22eaf74055cbeccbf0a9803a (patch) | |
| tree | de9793df6d370715fc8d56b962f5575163988377 /media-video/bombono-dvd | |
| parent | Bump glib to 0.13.1.0 (diff) | |
| download | historical-5fcc6998cbd3f57d22eaf74055cbeccbf0a9803a.tar.gz historical-5fcc6998cbd3f57d22eaf74055cbeccbf0a9803a.tar.bz2 historical-5fcc6998cbd3f57d22eaf74055cbeccbf0a9803a.zip | |
fix build with ffmpeg 2.6, bug #542814
Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/bombono-dvd')
| -rw-r--r-- | media-video/bombono-dvd/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/bombono-dvd/Manifest | 11 | ||||
| -rw-r--r-- | media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild | 5 | ||||
| -rw-r--r-- | media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch | 13 |
4 files changed, 28 insertions, 9 deletions
diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog index 2849276abc99..394cde2a64f0 100644 --- a/media-video/bombono-dvd/ChangeLog +++ b/media-video/bombono-dvd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/bombono-dvd -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.38 2014/07/24 17:17:32 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.39 2015/03/11 08:48:19 aballier Exp $ + + 11 Mar 2015; Alexis Ballier <aballier@gentoo.org> bombono-dvd-1.2.2.ebuild, + +files/bombono-dvd-1.2.2-ffmpeg26.patch: + fix build with ffmpeg 2.6, bug #542814 24 Jul 2014; Pacho Ramos <pacho@gentoo.org> bombono-dvd-1.2.2.ebuild: amd64/x86 stable (#517982) diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest index c0ab2dffcbab..1a66450f9457 100644 --- a/media-video/bombono-dvd/Manifest +++ b/media-video/bombono-dvd/Manifest @@ -6,18 +6,19 @@ AUX bombono-dvd-1.2.0-cdrtools.patch 864 SHA256 48bc239848cfff2adff21a11f11d7690 AUX bombono-dvd-1.2.1-glib.patch 375 SHA256 bff2c5f84dc4aae2fc4bcbda393d752de794a8a956848c560e4d2f471113e359 SHA512 ac6a71cd699979e665c209885c8586f260cd2ae973188a7a541235c264996a93f0636a74ed230d6dffd0de60dfbb87757738521552bc6aa5d7ffe859685179f9 WHIRLPOOL c9799826d6483200af120279f536dde8a1ede1677029166e8d3e3ad500fc6f74935873ef626a2c19b4a6bbc35f02a615355bb93aa9fbbbd374ede41a3006abde AUX bombono-dvd-1.2.1-libav9.patch 1338 SHA256 3c702126af49a3ac58131d7aef39738890afb833b0e6d156d19cee411db56935 SHA512 f4bded7a4ea89591dadf10529a1cd6f6a63a87b1511e06018bb7210243660deb1ebf66b6754fb6a66384e607310704ea545b082fd40b9b296bbe29f15d4f9255 WHIRLPOOL 4430d5eb062dc97d82d30a5eb647559a62ed2b5ed6387366f0ff69b272312e4592960ea2a4a636b698b240fbfb5952ed8e7e255f9e24afd07d2ae775ae64e07a AUX bombono-dvd-1.2.2-ffmpeg2.patch 1336 SHA256 11f64269b002ce1c3159d06358a9e623a9d8d03c465c3fcdb52ab3c93907b7a8 SHA512 317f8ac0998f2e4338d8254889ec95f560cb96344ef70d7c4828d640d5a0752d2970edf22ce9ed93da034b2691c3929db3376a7d505c8fdae7345f42afee4ecb WHIRLPOOL ea0a649b8a1758c99cd9ac49b47aa29e267f78b8a7a453650943b0707abf8fdf7589afc04459bd6be3150399b853ccd641f355bb91749bef0788c89d3fd50ed7 +AUX bombono-dvd-1.2.2-ffmpeg26.patch 772 SHA256 ee89adeff7bd19d731eac96c180d5d59766bb3a68f3b21b898199e1cb6c5639e SHA512 84518ecd15ed3190504f66df23a6fc45e98bdc4f726b59a93e7be401e260e8a78169f11a95c41e7c6b391042d766b46f5cd88c944b9e43684a991ee4d9311821 WHIRLPOOL b6f539eba7c3dabaaf00796ed0beba61b8cd77a855b7752230d642dd87fdbe4272acad1213ad984adc525346caa2e9dc291d3ba51e107ae3f3ddf6d25c56d6c7 AUX bombono-dvd-boost-1.51.0-fix.patch 23903 SHA256 f96827cbf9ef0aa50c522dee4db863bdfe44994a5d3811f5a52a195ddafa2622 SHA512 dd3b2054fe2c40bf33f3835d4b1a9eec9722e10bbcac4951a77365b83fccf1ada051a10aee1692ccce9076dcf7bac247d0f6d159ec3e24c5fe2875233ac8c2d7 WHIRLPOOL efb0c80880fa3d5b755a6b6744e7b0454855c32a48a09ee032d64009a809f3323e28b9959a448d1e6bf8937365a647b2867a9e85191e4e67c598eedb1de1ec18 DIST bombono-dvd-1.2.1.tar.bz2 4111237 SHA256 89817ce134b5ee2879285dfb30e9f8b0603b2282989ecb91793e7b928d64152f SHA512 09dcb91b16074f21606af052e3e22a842050d06a93ba41dbe9474ccacb1dad4e5903dffb1f7818fcf864df9b234fb50087d39f19dbdc2eb14268847059c30765 WHIRLPOOL 36376b1375a7cb8f8cb96c8f5adf3589b4ada0ed3f8707394da6ffdbc98b3853eb620a43636322b3e64ecbeab1c11fceebc076df83df93ee59b41f117ba2f0fc DIST bombono-dvd-1.2.2.tar.bz2 4406764 SHA256 3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b SHA512 66982f014b6d45a9fa5a8a748dc3ed0ad79ae2d1c9e5afdf22d8db89e0f91c29fcd5639ca27ac50e50916ad37a80e536ea186e079d07efca7547fe49ab8f7d6b WHIRLPOOL 797c495a480c7b12f112809bc73e2032e846dbb57db8f3d2989d7063aa6686c3cdc8f07813bb34f0d076c6e53188931fe4b01e461d5c76bcb95557783c21cfe4 EBUILD bombono-dvd-1.2.1-r1.ebuild 1698 SHA256 5d602c023a7423b96f2b03b075ce8bc3113722e1e316c887939cce9ce384f2a5 SHA512 4398047a2876d1d2719cd381a82eb14c8d354338094309090a15bba739cfc646ae97e11aa9b92ceb34e4b84e46a2c8c04a467d9fc8664df25f43abc5f9c024a9 WHIRLPOOL 505859ba01bc165cdcd61e2b6c3fb1a7c7b516389aca8d4a2c6aab3531d6eb061aa4d259b4eb9f36e805eed7a40c077132dc47f37c6d4abb2a89f79d32d6337c EBUILD bombono-dvd-1.2.1.ebuild 1606 SHA256 0271cc2f122bea4a80f5963c3323b9629cb9837b47cb26511878d7f381d96ed0 SHA512 14d1c4e6d88fe0a17dc75e7add227440428f7e1f115d9f7a423eca20ef1734f31c9f09bea7492724406bee2c2d0884b78a7a3aa59ab866fdc06c04d9fa6a8b5f WHIRLPOOL beb2a9671f12512647394bd3a31701b8d643c1c58ffe59f915c2f9b433e1d9152856e00cbc3bfeb1c814672d01c317e0e8a36ed0ef6cd8bfec33d0fbddf444e6 -EBUILD bombono-dvd-1.2.2.ebuild 1612 SHA256 c2e283a1d2447ac50563e32acec735e32e63d0ec76ada8b5fa13b4cd30a0a4b6 SHA512 884d6f431543263e7059957652e5dff84fce4be8cf71e94686529204fbf1b609dac2b03492b4c4d4fdd4c722c9bb1fae31e882d974e4bac7d886ca660665d559 WHIRLPOOL 49a827b2223e0276a15a9ec6552c627a6e8bb908af91eb19255b5aa2de04f194465995b92e86700b8fd340ec9bfb38cd1dcf5654af9f7545dff7a55d61c681ad -MISC ChangeLog 6990 SHA256 0151547381a71f3491b9d73a3ba3b517b7901643ac5f2c08cfb92aa8290fcb9e SHA512 505b16a7f0e8022ba4a20f82aa70c309fe3137d572285b180b25174f30fa5a90c364d6fcd8a0b25a804473ce2f9b8bac6a6593cc3bcbd196aa68255082cda5fa WHIRLPOOL a3eac04270c2a9f02f6e3f22feea4723a17c62ee0bd1a6658cbdb1bd49e04fbfda77d4d91fcc0442a1ca43314e354bd206b21635ade645df4259afc6262bf9c8 +EBUILD bombono-dvd-1.2.2.ebuild 1657 SHA256 cc77dbfcafe00df1970f774f5ac00cd6b3b22a8398d4b13860bdf60cd683433b SHA512 8360ed61477dc1830d88144f8b63c44eae2a8104dd9c80c5b8e09ff562a810a953f489ec2975b3b66b82b98853ae4e0d0d8142f55bb1759de88f91457736ef9c WHIRLPOOL e0dd7d24bf68e6958b3ef0d93fad08f40a9701185af90e3920f4f7cbffa4253421676f2c0475c5eb9d0781b87d17025725bf565c83c2d459542d6fd97b8d77c4 +MISC ChangeLog 7156 SHA256 b33fec910431f0f76d7c3bc0b9d08fd5c2c7975f5436783b21371c049d7bda62 SHA512 30ca57094e6d82d2457b5610938c70ca1870ef7e37fbea87fb297ef8bec76ca2cc45d3d53181a7f60db65cab81f10a37b63eef0404ed109f5904f737e0fd4ec8 WHIRLPOOL 0101a70ab8dac76ffca2a6df6d897c98c7e281ae35c858dde2a61e4160ddacec6cebec518c07b71769227391a32e4b3ccb0a82e778dc9b03f9f9684e1a57f967 MISC metadata.xml 290 SHA256 3bb63ae5b1fbcfa2f62fb73656f85027b0703d398b3fe2e0a19c1b0c58e4452f SHA512 b9281587b7b73585274a406a01b3e2b185e5293ef50eb7968683c64ad85abd8357a420d1bad3f250975ee59e5dd3fa68c7978f9b4c63987a4c40c92506a90816 WHIRLPOOL 0e8df82744267b36619e322c546c35f3b1b234b20d3c14444198e411880aee2b929d45b02c0b1063408717cce1454a48738c8c2ec1c89b118f05f610e1357e56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPRP7AACgkQCaWpQKGI+9Tc/gCeNjTWkQtYhDYIBWYWLiPaKwh8 -LW0AnjSzn2IJaEOfwSFv2aWmtgFuXgac -=g4DI +iEYEAREIAAYFAlUAAVQACgkQvFcC4BYPU0rhCgCcDx+Kd+sS2moNMuGEk7Y3BujY +/t0Ani4Ms9oa4fD/rLFEA1ZURkIqwysR +=1ilk -----END PGP SIGNATURE----- diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild index 06ff90333d42..7371fac0680b 100644 --- a/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild +++ b/media-video/bombono-dvd/bombono-dvd-1.2.2.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-video/bombono-dvd/bombono-dvd-1.2.2.ebuild,v 1.3 2014/07/24 17:17:32 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.2.ebuild,v 1.4 2015/03/11 08:48:19 aballier Exp $ EAPI=4 SCONS_MIN_VERSION="0.96.1" @@ -46,6 +46,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.0.1-cflags.patch" "${FILESDIR}/${PN}-1.2.0-cdrtools.patch" "${FILESDIR}/${PN}-1.2.2-ffmpeg2.patch" + "${FILESDIR}/${PN}-1.2.2-ffmpeg26.patch" ) src_configure() { diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch new file mode 100644 index 000000000000..b511a9d4ebd3 --- /dev/null +++ b/media-video/bombono-dvd/files/bombono-dvd-1.2.2-ffmpeg26.patch @@ -0,0 +1,13 @@ +Index: bombono-dvd-1.2.2/src/mgui/ffviewer.cpp +=================================================================== +--- bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp ++++ bombono-dvd-1.2.2/src/mgui/ffviewer.cpp +@@ -1120,7 +1120,7 @@ static bool SeekSetTime(FFViewer& ffv, d + bool seek_ok = TimeSeek(ffv, start_time, time); + if( !seek_ok && CanByteSeek(ffv.iCtx) ) + // тогда переходим в начало файла +- seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true); ++ seek_ok = DoSeek(ffv, 0, true); + + // некоторое видео глючит в начале (Hellboy), из-за чего + // последовательный доступ выполняется с перескоками - |