diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-11-10 15:25:51 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-11-10 15:25:51 +0000 |
| commit | 07fe9ea991208fc30f33a449ba1b89e3345f619d (patch) | |
| tree | e0e73bd3fd8c5813dabd9e5c570a90817bfc5b0f /media-video/vlc | |
| parent | Stable on arm, wrt bug #488802 (diff) | |
| download | historical-07fe9ea991208fc30f33a449ba1b89e3345f619d.tar.gz historical-07fe9ea991208fc30f33a449ba1b89e3345f619d.tar.bz2 historical-07fe9ea991208fc30f33a449ba1b89e3345f619d.zip | |
Fix pre-processor checks for 2.1.0 when avcodec USE flag is disabled; fixes bug #489612, reported by Maciej Piechotka.
Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 18 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.1.0.ebuild | 5 |
3 files changed, 18 insertions, 11 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index f8014a6e6cc4..c212fd6c9faf 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.871 2013/10/27 13:24:41 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.872 2013/11/10 15:25:45 tomwij Exp $ + + 10 Nov 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild: + Fix pre-processor checks for 2.1.0 when avcodec USE flag is disabled; fixes + bug #489612, reported by Maciej Piechotka. 27 Oct 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild, vlc-2.1.9999.ebuild, vlc-9999.ebuild: diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 7f74b53ce378..4e80741e413d 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -24,20 +24,20 @@ EBUILD vlc-2.0.8.ebuild 13162 SHA256 97f6b3484f91f885f2f2d1816030b8407b05073622c EBUILD vlc-2.0.8a.ebuild 13163 SHA256 819e109d3044dd445369e633249ccd1fdb47b7f86da0bfb4040f30e6a86b07be SHA512 4764c3e265b6cf4b42bd84e845b87b7101e268e79b241ab6b1131784377eebd46358e5edc52a77a33eef1d524905f24f60b527a802928f5dc042414955dcd1bb WHIRLPOOL 0d6f462dbd7c3d6cc78c19ccb2e69e92cef650a8500251a9a87c05b15b6c7c9824ac54d4f9f655ce76efb8c50095a0e16322b7ac55fa0e52b216807b959fd450 EBUILD vlc-2.0.9.ebuild 13162 SHA256 45e08ec820240405f563e6a626b1d74c94d3720db321098b4135eed0659fd40b SHA512 46ec6af228d588c597dae72730a2537551802114c80323b86441646e4bd7a6eae7bf3f8e147edba63b9bd35277f26da316283091b46e801441d6d77874c2d03c WHIRLPOOL f086c959afdbf660fc60cf9f3f62e91fc846f5075549c45c110ac11e97aa05521f24b2eab0f11677b055ea27a7909aae32909b1d8d97de68746723268b2dd5a6 EBUILD vlc-2.0.9999.ebuild 13190 SHA256 0b5ecf88c5e0004497ac8f520345de436d1ba0efc5d69eb59f3b339c578cdcc4 SHA512 67856d9418e6337661bea1f14bec14ebab28f8f19e60df8c77f283ae6dc250dd270a0a8962a91614b1fdefe93fc0b1c48af68c74dfa17be507cd343b97408e42 WHIRLPOOL 51501663292f95015f11e6b7978ff92310f7aef26e1fc9894181bb0e324654b0b4dcc9a81f031bdb31e32c0d574aa0c02c434c3d669dcf8e61dfe54f4427a20c -EBUILD vlc-2.1.0.ebuild 13906 SHA256 a840fb3495bae93f4d145f99597cbf906479eb542d0f6e2283af2771a504f1da SHA512 f5ef235ac6659900d95f2d58fdcabc3210e4f50824dfb9789cd78e25cba750b6cbc41a22dbb938268fab208e5f337fbb4d318e67d45e35fad377329a78713445 WHIRLPOOL 3b336032021498588f38cf5a26c81107bfff416f95568dbdcc59d1bdf9ab3f430a792701292d7d5da0e1b352d1873a489b9ee0219a5aca9b8a781df2b552418b +EBUILD vlc-2.1.0.ebuild 14051 SHA256 3be43b913f2963e78988ccd53b2031d92fa889bf767a05b89ae81ffd1bcd9c6e SHA512 eaab36aca9caeae1c7a4a230a183af2c28756cc8e8d0df275539f52157f72e10779fce33a6a6d0b3900d56f3829dc82b3e4ea957a723c72a5c6deb42fe639ada WHIRLPOOL f622062424d37795ced9d44a6348ace5b5c8f6be0385474e655be18ab8335ae6d82178a28ef20076975e47210a9f15bb737a9437b1030fa548694592b221331c EBUILD vlc-2.1.9999.ebuild 13754 SHA256 bacd3606e5ff0c909748698567a80ca2ae587ea512274317389c73086bbccc57 SHA512 78628b922447397da001f8073bbe3106cf4c911aaa97468f5765730fe568295a87d20cc1b4c09acde90a89b0d8ed99b3fbebac3b8d4e8862a88200395a202503 WHIRLPOOL 975d012a790aca4421c135127cafb87cfb09dae2179de213e4b97a14c3d82cd44c4c5bab2a6fc1aff17021eabbd6866c6ec6e6f9bad4dc8d917accc7954b98f3 EBUILD vlc-9999.ebuild 13992 SHA256 4783c65ee33af8032b29ee8d443c0cee1500f579f00f95a14fed57bda513bcca SHA512 f9997557b72fe1206e8c167d8536813f4c545747a84e11232c51eb9147051760f38bff7042747b7368c3cbafa5b5232e6efa5e8ee4e2363ddba7ee3ac8795f46 WHIRLPOOL 5b16962422fc60e4ca0a14e15a510790ccdf03e0e3d508d2787ed202c744225447a7e59c60b64983b0f270d7f636a603a34807165aa259432a44c964f6080a5f -MISC ChangeLog 19754 SHA256 288d90f21e95f8f1d6ac503d4ff0f770bb4efd75fd046f85b455869c3480d023 SHA512 3b83d96504838f2f2298bd027923aac09fa7c6dbcb7a45f7081341e80d246c3696df9f467369930b6b7f45a77e6c381423da357e209cd171a0a1b09dd4b97297 WHIRLPOOL c0db51d6fddf987415e1c9f16dbc4e2d56e5c943b9c9139c79651e25f27e3051d7742d91456e6e1f51d73fe37f136c9a3227a3269047899ca10f61744265d50f +MISC ChangeLog 19943 SHA256 df0add99dbc4702e82668b5ad1217fbace78ac200ab934bdd22d61dbbb9c24be SHA512 2755b7cdb86179b58651dee72ff4091d0a741fa6a3c8a8f71625b0e171d94b8dc56a257a58129e1694d290e3b707b5b04cc7e513a60d574925844dcc23291abb WHIRLPOOL 447dbac8b6b544f7d81b1aef91c00db4f6465dbe0a81051e91d08224c9f4635de88674fe20f34981a74c67ecbfbb6b9dc5cafac74f577e5cd1a4d4c65bbac53b MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe MISC metadata.xml 6882 SHA256 3620cc5667481a82177337d6c85e3a85b94850039f7d04a5407a9f19f36d7a82 SHA512 a68bda118fd709fc8ee71d899205080d3108efb8db49bdb74973f434ce3deecc610784d1ca6118a2b09ce62a858ba6d841763d83a71ef5ef8919826e0e5a9638 WHIRLPOOL 8bffe3ded979f9bbd0fa45017900edefb0598f9657fb91de1f918160614af611103425bf9125057b230583071367b0c0144ad839bca9972349be0ee3d980c8d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSbRQIAAoJEJWyH81tNOV9iMkIAKw8OfOMLAsaNPEMgzvNQ/3g -vtaaY+1SDoaUJbuWSQJO7WE3xJYxn41e5jrhoJESOnj2Lc3VeUfT2Q809zmBGtt3 -uqaji3SgbMeRmYK006SC463G9psPeb4021myjtFiJlx5mSUgmrzQemfNYxpatnWP -OA6GgmiSU7kUDJn9W6J+XXSWxdgo0qjwCp4SpTOMtT5LaBPZezvK+OgDuZ5Z4kHE -MNvyyO8+UT+9jDtV8GBLmG3C56iKPx6Nyk6FeUXadT7Xjr4LKl0cVKir5F1OTYPm -7sKaIp5OCsu4XNWlvu3IWL2Yi6Qn9pIWYLH4Qz0GUYyVF4FZxHnN+tojRV6xDwk= -=fG/9 +iQEcBAEBCAAGBQJSf6VQAAoJEJWyH81tNOV92SEH/3muHSlkfSrcX8bLPxW6vJWp +ZFJw0V7UTx3Adjgwg4oNMDZz4n5cIin8atY8DvjwmAI8BLgeFt5ocyCLZUH0cDwk +30ElLmsQUVwZRuNNCgK+PdsSnhKhIUIaB6NBxZ0diID+GMSxMsjJG0J7tQNDKeBd +qsKguo2cKpXjkdOboN01TcBasPL4aeYlGmW3g3zjEsr3RvP2onyvsWtDfURLWcVT +eehxXJsaTxRqceOIF8f53Ws5QnqkvBDtbzFERhHTMp96IHOF6GxF2rP3A8XAzQC4 +xyCSCUiBRF8zB9RLohoXydw3xvvN10P9O5SQIjf4nbDXM8a2D8+WmP7gmVzVBrA= +=ybs7 -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-2.1.0.ebuild b/media-video/vlc/vlc-2.1.0.ebuild index 075b6871dadc..1706ab20359f 100644 --- a/media-video/vlc/vlc-2.1.0.ebuild +++ b/media-video/vlc/vlc-2.1.0.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/media-video/vlc/vlc-2.1.0.ebuild,v 1.5 2013/10/27 13:24:41 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.6 2013/11/10 15:25:45 tomwij Exp $ EAPI="5" @@ -241,6 +241,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.1.0-avcodec-check-update-buffered_time-earlier-so-we-sho.patch epatch "${FILESDIR}"/${PN}-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch + # Disable avcodec checks when avcodec is not used. + sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die + eautoreconf # Disable automatic running of tests. |