summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-03-30 13:38:24 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-03-30 13:38:24 +0000
commit35a3ee7854e6b7af9806d6d28469ae26fe507cc5 (patch)
tree11daba98848c94b9d176ce39237cc722c23b22b1 /media-plugins/alsa-plugins
parentInstall non-binary files even for the non-default ABI, bug#407687 (diff)
downloadhistorical-35a3ee7854e6b7af9806d6d28469ae26fe507cc5.tar.gz
historical-35a3ee7854e6b7af9806d6d28469ae26fe507cc5.tar.bz2
historical-35a3ee7854e6b7af9806d6d28469ae26fe507cc5.zip
fix build with ffmpeg git
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'media-plugins/alsa-plugins')
-rw-r--r--media-plugins/alsa-plugins/ChangeLog6
-rw-r--r--media-plugins/alsa-plugins/Manifest13
-rw-r--r--media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild3
-rw-r--r--media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch31
4 files changed, 45 insertions, 8 deletions
diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 7c2b0f6b9ee0..7cf1cdb3e59d 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.147 2012/03/15 22:12:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.148 2012/03/30 13:38:24 aballier Exp $
+
+ 30 Mar 2012; Alexis Ballier <aballier@gentoo.org>
+ alsa-plugins-1.0.25-r1.ebuild, +files/alsa-plugins-1.0.25-avcodec54.patch:
+ fix build with ffmpeg git
15 Mar 2012; Markus Meier <maekke@gentoo.org> alsa-plugins-1.0.25-r1.ebuild:
arm stable, bug #406101
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 3efcb5a0786c..bd51b90eadf7 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -5,20 +5,21 @@ AUX 51-pulseaudio-probe.conf 437 RMD160 6c481be7345f023efa92536c4ca0759890a580f4
AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a
AUX alsa-plugins-1.0.21-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5
AUX alsa-plugins-1.0.23-automagic.patch 346 RMD160 59875c0f8372c16e38a232b05a9681c5d9b463ae SHA1 b05aca9232383e21c79915d096aafe357c9cab08 SHA256 fe30d4011c06c37a84ff74f467f37d3c6e7a43c01b436de49addf9a36f794840
+AUX alsa-plugins-1.0.25-avcodec54.patch 1041 RMD160 0d27b57784a93331532049165ee4c93b999b342a SHA1 a1c90ae74155b04ad04026f2abc6a2f4fceddb04 SHA256 8d1ae7cf337b2081b2501bf7e1fa45fa779fbc53e9fdd00d65777081ec1162a5
AUX pulse-alsa.conf 435 RMD160 4de093dbba575a3c1fa15fec4a0614fc2d064916 SHA1 579ad8059e1f0a772add0469f6408a1a9b71b253 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef
AUX pulse-default.conf 196 RMD160 8d6eda7a28dab00200fff54e2915c7a45ab1aa2f SHA1 ab25eb9d11357e220cbcf542f2ba384b9ebb29ac SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f
AUX pulse.conf 433 RMD160 6fa0c0dc8a33d4cd757a70e69b20d47bba2c7afa SHA1 4ec0c6521cb126b29f00f82555d92b78dfccfe10 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57
DIST alsa-plugins-1.0.24.tar.bz2 329502 RMD160 70f14c04805a2c1ac34a23e507d6ffd031c12bad SHA1 3f8680de2e3f14ee74027f7e070b3fe416e19dd4 SHA256 fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263
DIST alsa-plugins-1.0.25.tar.bz2 331568 RMD160 757f19af4d86557568188e481391b77f36ab320e SHA1 ab66de081c5b0137943658a2991ba3d5efe91573 SHA256 a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
EBUILD alsa-plugins-1.0.24.ebuild 2335 RMD160 886dae3850939462b90cb54c07abef22819fa8af SHA1 288dcb27a03e12fd1ef58776c58feb39feb5b12d SHA256 d0f9593535dffb8675ec66d5eecbc76c0642ca3825dbf9d15067f29d8164d03b
-EBUILD alsa-plugins-1.0.25-r1.ebuild 2523 RMD160 457d3109cda77a28a32cd62664831cfc2e1b81e6 SHA1 70d19c3212965a43edee0b7f28787c8bf61a2998 SHA256 e767336a0451485394eaa2130606746ac4f023eac0cc026c5ecb23a93a82ddca
+EBUILD alsa-plugins-1.0.25-r1.ebuild 2569 RMD160 9578e7575f3e7493971ac38ad67056eaafb126d5 SHA1 0a3856986717df09746dc3d55e588d25b71bc658 SHA256 26d95c9e87e6e273b740c7d4b4d35ab3ae61ca07277008cff37c71b065877676
EBUILD alsa-plugins-1.0.25.ebuild 2164 RMD160 592a5ec1f3ae0a79e665d0bb4bbcf9c5d845573f SHA1 9cb2ce1808efe1ce956b0fdc237a1065526e39ec SHA256 751995a316050ab188fc934aa869775fe7e630df70b7e1eb4d82e40ab8e510ea
-MISC ChangeLog 22378 RMD160 2b54b8b19c5e00535061252a9a0898d3642a7a61 SHA1 f8d131ead71bab5c9d31e9ec245278e997ff7eb3 SHA256 32f23c747b9019d074387f63cc078563596e53e9a06eb09d545b404fc9f861c0
+MISC ChangeLog 22538 RMD160 0e3c6566c1ec22e28c7d38da6c62278a0f3f3378 SHA1 f9e1005ab9ea0f1e04361c205e1dffb64891ed87 SHA256 b4d873c5c8e60511f2cc3d03dfb29639ed276b3cfa529b3463bbf67c99cd97ed
MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk9iaesACgkQkKaRLQcq0GKjXQCgh6jfinw1tAqqxwmzaIFCx0Kr
-BTsAn1MuEF9Ffdact2Vz4Jv7Vc4ca4k9
-=bSpW
+iEYEARECAAYFAk91t1UACgkQvFcC4BYPU0rF/gCgoBLaO8T1U8G1RPgsQykfhfog
+KU4AoK+HSyiD5iW01+jtplV2+97ZQNpI
+=A6Y2
-----END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
index 9f4b8ffde53f..f2c01982c40a 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.25-r1.ebuild,v 1.6 2012/03/15 22:12:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild,v 1.7 2012/03/30 13:38:24 aballier Exp $
EAPI=3
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.0.19-missing-avutil.patch"
"${FILESDIR}/${PN}-1.0.23-automagic.patch"
+ "${FILESDIR}/${PN}-1.0.25-avcodec54.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch
new file mode 100644
index 000000000000..f9e33340af74
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-avcodec54.patch
@@ -0,0 +1,31 @@
+Index: alsa-plugins-1.0.25/a52/pcm_a52.c
+===================================================================
+--- alsa-plugins-1.0.25.orig/a52/pcm_a52.c
++++ alsa-plugins-1.0.25/a52/pcm_a52.c
+@@ -444,13 +444,13 @@ static int a52_prepare(snd_pcm_ioplug_t
+ #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
+ switch (io->channels) {
+ case 2:
+- rec->avctx->channel_layout = CH_LAYOUT_STEREO;
++ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ break;
+ case 4:
+- rec->avctx->channel_layout = CH_LAYOUT_QUAD;
++ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
+ break;
+ case 6:
+- rec->avctx->channel_layout = CH_LAYOUT_5POINT1;
++ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
+ break;
+ default:
+ break;
+@@ -702,7 +702,9 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
+ rec->channels = channels;
+ rec->format = format;
+
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,0,0)
+ avcodec_init();
++#endif
+ avcodec_register_all();
+
+ rec->codec = avcodec_find_encoder_by_name("ac3_fixed");