diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-07 02:15:31 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-07 02:15:31 +0000 |
| commit | 2f0f7c06ba5f4d0562821d98ef69d1fe104334ef (patch) | |
| tree | 7a5441976ce0c1138f446e46ade9d26c36e439bb /media-plugins | |
| parent | fix build with ffmpeg2 (diff) | |
| download | historical-2f0f7c06ba5f4d0562821d98ef69d1fe104334ef.tar.gz historical-2f0f7c06ba5f4d0562821d98ef69d1fe104334ef.tar.bz2 historical-2f0f7c06ba5f4d0562821d98ef69d1fe104334ef.zip | |
Fix build with ffmpeg 2.0 due to wrong version check. Bug #478084.
Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-plugins')
4 files changed, 27 insertions, 8 deletions
diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog index 430dfd25488b..1cbe50ea81b2 100644 --- a/media-plugins/alsa-plugins/ChangeLog +++ b/media-plugins/alsa-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/alsa-plugins # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.174 2013/08/02 11:35:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.175 2013/08/07 02:15:23 aballier Exp $ + + 07 Aug 2013; Alexis Ballier <aballier@gentoo.org> alsa-plugins-1.0.27.ebuild, + +files/alsa-plugins-1.0.27-ffmpeg-version-check.patch: + Fix build with ffmpeg 2.0 due to wrong version check. Bug #478084. 02 Aug 2013; Markus Meier <maekke@gentoo.org> alsa-plugins-1.0.27.ebuild: arm stable, bug #473404 diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index ddfe8fc76055..f5f57cec48d4 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -6,17 +6,18 @@ AUX alsa-plugins-1.0.19-missing-avutil.patch 489 SHA256 8b3f3469043f0cf9d313f6a0 AUX alsa-plugins-1.0.23-automagic.patch 346 SHA256 fe30d4011c06c37a84ff74f467f37d3c6e7a43c01b436de49addf9a36f794840 SHA512 e10f990a0138d83af93bbcb8848a588ed0a1dc643452352b75ca56e243979b69a07a1b6685dbd4c5ff6e32a3d2e98fcb3c0f5da35ff5645c0cae490ece3c710c WHIRLPOOL 89c7967ed0a20658468943424761c52cf8ce894093becdfe9e8ad637cc221bd7495b83e7d8a709774b45fd606abcdb79ccf361536405455bdcf0d6a7c6549b4f AUX alsa-plugins-1.0.25-avcodec54.patch 1041 SHA256 8d1ae7cf337b2081b2501bf7e1fa45fa779fbc53e9fdd00d65777081ec1162a5 SHA512 16797183efce9896eeb03bd7b5468ea0993133914b4dbc9a280b8297af17175f71c1b42842baf7d13d46967de9e42fd51372aa9ccd5bea08abbd84d5d0c8019d WHIRLPOOL b614707af0b885f7b329a1f37a9dc11c6b4764f6ae5fb289d149eb80151f3eaed0a9c04b324267da2d29f7864ebc314d331d7c7483cea6ce0f3acd568f22a2fc AUX alsa-plugins-1.0.26-libav9.patch 1003 SHA256 b772bcb5969f949352998cffb213826707afe3e4a1c3b0cc0f2485c0ea101b04 SHA512 53a2d6827f9c88ddb896f431b4e7875cf6ac75b8d058f1dcea37b7ba6104eca42965615cd489d43a337315cfa0515577c866df00b7682e3ca8a080b7e392fc46 WHIRLPOOL b4ff92fc8ace23f9a121ba3db8a80a4e4e3a0f429c904c5bc556ae68019c188abae24fbc133e9e9c8c78abc8bca6b9d058cbd73b60096bf6747860495f3e597b +AUX alsa-plugins-1.0.27-ffmpeg-version-check.patch 482 SHA256 f9d13f2d35c61ca1c52ec033f62f19ce64eed58930e4e140d219862e3f791e39 SHA512 20d08381ecce296a8ec94289029d03938ccc3eb13781276cf392a941a0adc2028d0534de70a01aa775aab4f97eb528f57a83ffb93a0bc602820d3d8394b43837 WHIRLPOOL 2e120a764fcfc1b52e16ba45fc26c0e77ee1ef4c1ac4cd9aaf730cdd400a120ca94386ac9604eb1f8814f736a3ce7f190ec635ea43431ad6a3e936c3904b218f AUX pulse-default.conf 196 SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e WHIRLPOOL 373d276717005df7531b9a517d5392d7ff6ac765d677819ffc59799cfa6fd944428008e7e6e827bc31db0ed861044576f45eea67137158bb5a543717e17b00f1 DIST alsa-plugins-1.0.26.tar.bz2 361017 SHA256 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f SHA512 3307e3712e2a8a418db9430889cf0b328d09d083d6b9a59b64b59515fc6d6262c3a8b7d32bcdb8f2cb21a0c52072a7264fb4a3066cdc2cf1bd7c8654c7a15919 WHIRLPOOL 1b32dd78b8ce3b0dadba8e0283d7e909bd4c8ca6f2106687315f182d1fe5a27bd627028f3e4ceb3fed42fa638a257c6ebe1846657236e95ed87e81e8566f7494 DIST alsa-plugins-1.0.27.tar.bz2 363593 SHA256 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 SHA512 73c2010b66022429bc664bdab1c03694dfd669260dea569e32496bc6e10a11a0da2dd87db6a661ab1376f3aa59f1df8a84cb48ff1d20bb064756c655203f9993 WHIRLPOOL 4487734e0377c880a46df6f7fa53d86a7c38fa3d4bd35e06d128c0ec2b99c789ed64674b59003d8bd0abce2db53301234e467d235532ea145ddb150919cb49af EBUILD alsa-plugins-1.0.26.ebuild 2645 SHA256 be5e4ca709b28c2e2bbeb2ec215d704680e742d78bef3456e37042c368c5342d SHA512 287fd751f4447ccf65fd30a807d17405a228b49e7aed16c6b3c139ea4050f987816327d8196b2b04227c2ecd65c089789bf345bf65a7f2c84b0e1971771cb778 WHIRLPOOL 6c306342a301d9d04316d7b9bb1ef6a32bed092f635afa0fbe25f32fe36a0a32410146fcac35267bc860d85807baaffbc2b7ef8a88db97e5ab4f638fecab36a5 -EBUILD alsa-plugins-1.0.27.ebuild 2518 SHA256 6cc9cef76f51ac76e7a36c81ddac7183339629e54f3feb1b5e2c91109a99cc20 SHA512 76daf3a2c9a5ecfce9c1ffd29d49ace7df1abd3f7b84e5a90e883d281cae376c94abff73bf3879f1cfd96be5ee52c36e13959098316a17e34a8ce9fec78ed998 WHIRLPOOL 5609ecca0b436d2bfc54b74fde73fa90df7249f9105f58d97b708220f092e5a5dedda5ec474efc95da917010f9c64b3d87faa95e36b33eca6718319bdee1900c -MISC ChangeLog 26221 SHA256 a52ba94246e1c776de137772006bcbbd27ac35219ab1d70c389420675bf1c230 SHA512 35eeb7c654cc3e896a0805a79ffe1a2e5c7d460e92037d20e1a29bc9af5aecd932133c3f6d9867310a1016c97f89ccc2afe8ab32c36f61904079df3dc80e2821 WHIRLPOOL d3114b769654bd8edc5b45260fe71e5a082a4ab33c2d23a41bf8f02c51a7f570c855438af03168b5b2866c3335e36679b6f149a119e1e20f685662d25e10d6b3 +EBUILD alsa-plugins-1.0.27.ebuild 2578 SHA256 26ce7c4517e63c24c7d56dd03d8d6f37d45429f7f152e81b25406751cd1cd3de SHA512 fe0b89c758831147454b8172a7fc9fca14db1fb579dd4fb17ea5a8103054b3737abb0b20916e4e344250c57bf262e123170377988fd88caace952a3e54791d71 WHIRLPOOL f263b454eb7fcab4fe974641e8958d39d52d1f8fbf4752b30cdf114491c106c1be4a3cae1738fda4cf68126501564545123d7fd67a6c3feb1a4e0d0ca08132d6 +MISC ChangeLog 26430 SHA256 780fc6d640853589ce09d64a4c7a986770fe2d7ff27bcd8112b6fc31656aec28 SHA512 6198d8929f2ab6a826059660e5ac31f234d09ca79f792620cb4c3763cfc6999109a73a7bf0195a7770caa359085ac45ecad7a6f7a28093c6f368803ec8a91cd1 WHIRLPOOL dc9a2c253532a49b4ddfec948c265e9d4c0e222c43695f03c61eb3c74546aff196ea8e07a7a263f95afb64da741ae624ae37666b8edf3fccc1449fe1592a5bfd MISC metadata.xml 310 SHA256 d82c778805ce9088b30b84e54f57aab84dc02dd4c8d59c91740bf06e6d9b17fc SHA512 c05b98f8288c3fbaacbb5c9f194dbddf607e044e1cfc4f2ae2af9aeedb682a162aa4bb25ad17b6337224a5d25d367e809b23591fbeee261ccfe29c0ad14729db WHIRLPOOL e8be3c90b18296caa09d109a3c217473896a6f6ba023ab6be47a1e3909dd7fc3acaa8d7b3222f1de7b466b45fbf9295b23a072a9407915cae5fa3ee8aebdecf8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlH7mt4ACgkQkKaRLQcq0GKOWQCfZnIZRElsnzW9rHUn+6HzqAfx -8oIAoKkKMkqWDmLVAlJ8JmcoNZ6h9LMT -=jWWz +iEYEAREIAAYFAlIBrb0ACgkQvFcC4BYPU0oduACZAQDfVpW2WyIHywcXzJ7IBGAt +dEoAoL4c19J5X72DN01DaVhZyrQ44/Yq +=m1Y2 -----END PGP SIGNATURE----- diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild index b0258bf11219..56c036799ab2 100644 --- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild +++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.27.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-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild,v 1.4 2013/08/02 11:35:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27.ebuild,v 1.5 2013/08/07 02:15:23 aballier Exp $ EAPI=5 inherit autotools eutils flag-o-matic multilib @@ -26,7 +26,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.0.19-missing-avutil.patch \ - "${FILESDIR}"/${PN}-1.0.23-automagic.patch + "${FILESDIR}"/${PN}-1.0.23-automagic.patch \ + "${FILESDIR}"/${PN}-1.0.27-ffmpeg-version-check.patch epatch_user diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch new file mode 100644 index 000000000000..6b9b698471d2 --- /dev/null +++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.27-ffmpeg-version-check.patch @@ -0,0 +1,13 @@ +Index: alsa-plugins-1.0.27/a52/pcm_a52.c +=================================================================== +--- alsa-plugins-1.0.27.orig/a52/pcm_a52.c ++++ alsa-plugins-1.0.27/a52/pcm_a52.c +@@ -27,7 +27,7 @@ + #include <alsa/pcm_plugin.h> + #include AVCODEC_HEADER + +-#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34 ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,34,0) + #include <libavutil/audioconvert.h> + #include <libavutil/mem.h> + #define USE_AVCODEC_FRAME |