diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-03-09 14:12:17 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-03-09 14:12:17 +0000 |
| commit | 494cf132f5f756e1e83a752cbb5d4b5c0f807268 (patch) | |
| tree | b1d1a5c541fec4600aef151c6eff0e46893e9415 /media-plugins | |
| parent | Version bumps (diff) | |
| download | historical-494cf132f5f756e1e83a752cbb5d4b5c0f807268.tar.gz historical-494cf132f5f756e1e83a752cbb5d4b5c0f807268.tar.bz2 historical-494cf132f5f756e1e83a752cbb5d4b5c0f807268.zip | |
Do not typedef GstFFMpegPipe twice, fixes bug #460208
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-plugins')
4 files changed, 31 insertions, 8 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog index e850c5e56157..a044630696bc 100644 --- a/media-plugins/gst-plugins-ffmpeg/ChangeLog +++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/gst-plugins-ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.153 2013/02/15 18:25:45 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.154 2013/03/09 14:12:13 aballier Exp $ + + 09 Mar 2013; Alexis Ballier <aballier@gentoo.org> + +files/0.10.13_p201211-gstffmpegpipe_redef.patch, + gst-plugins-ffmpeg-0.10.13_p201211.ebuild: + Do not typedef GstFFMpegPipe twice, fixes bug #460208 15 Feb 2013; Alexis Ballier <aballier@gentoo.org> +files/0.10.13_p201211-channel_layout.patch, diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest index 9de19a643eb5..5cd0d6e61f8f 100644 --- a/media-plugins/gst-plugins-ffmpeg/Manifest +++ b/media-plugins/gst-plugins-ffmpeg/Manifest @@ -4,6 +4,7 @@ Hash: SHA256 AUX 0.10.13-gcc-4.7.patch 1982 SHA256 25b4072e5269e019d4a10b8ecbe77987f63be29a9424863c7ed3342103ad25fa SHA512 bee06c1bc96f10e0feebe311f39f0c691dedf36c453d1d8613ec70c75a8d985a08dfc99eb984719e8e35fd631b9d1a89c6e5911dbe66110dfbee8f6043fd16da WHIRLPOOL 12e11b886c3944c963a41eb063a2484d4b164b5a29a587b8e19661ef93c1225356eae748d9672ab822115b7cf9615a62435f12692a40af09519e810d38081b33 AUX 0.10.13_p201211-channel_layout.patch 1028 SHA256 7650f22a13d36c2d6b5e6a386c36663e7a0b68c7b0a3608dccf9d250ab661910 SHA512 b49c139cc28954de5727da2bed6e998785e51d10a7a47f83dd6389af6a3ef30902ca8e39c0498eea4361a2b797da043726d6d0d7cb07652e5e3bc9b2af62e2ce WHIRLPOOL aa4d34454478f94ee96f80bd3902a4ac9f422099593415de7866604bdb76a8a842f9ed75f6d7f4bfa83cf20ff02be5d5a85d6cc7a8fed11b98bf9ca3ca721e60 AUX 0.10.13_p201211-coma.patch 529 SHA256 cbd596623bd4aadd4f8d403e9ffbbdcaabb6a4a8a83e8d23aab379d0be154ec6 SHA512 186f0260e210326c1ce70a140b8f9c08bedb3ca723e7d02d539d845cdfca1a6028612d624817ad360712b41dcf0308ce703301ce0a739cce7a481ba732d36fa3 WHIRLPOOL 73391355a90538bb5a4519362bece3aae2245b2920e9bd89a0c0d41cb3f0a42ab2cfb2d396975de130b63c4afe83b116c9594c4ec6cfe64bc1e7dbdef1da1dbe +AUX 0.10.13_p201211-gstffmpegpipe_redef.patch 599 SHA256 25921c2c33077a5da1374ba0ea1055c7c321f9280526e313b17c5b432825f1f1 SHA512 8086616eb8ed6bb993f10cc2c7d5fff35fbaadd8a14e4d2339909176b5aedcc840cfe7807887b2fd6884e2e53a6e5bd579dfdb0cd1bde79b34a7fedd33b7602c WHIRLPOOL 60425db1b803f53e7f85e639b645b3782162bc1676a29d2dabbf9e809680392dba1153a47a675c554e839518258ff59d2dd6493288e66138f342fb8534a1a2ce AUX 0.10.13_p201211-iscodec.patch 857 SHA256 36e5a9ecce08ce92c99bb6fca8e1989de535a135685c66631e21d83d1d901b1d SHA512 40d051dcb2ec9b27986ba3424dc22e4cfd0f905b8e743d4fe47bf366ef9b06ace756c7d65658157f2333055bb4a7f2e7f6d0e9d8d3ef8017db34f15bf2a01bca WHIRLPOOL a64e4077141ace9f3d526b8baa36c37f57ae45eb2ee8060928088dd35a79b932e897107f8db699f6719292cc4a7a8b219542a94efc9f393cc5330a7d214e9f4f AUX 0.10.5/lavc.patch 8765 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad SHA512 6936bdcef2f72d0d51edef262c0197f1d8efb781913abe750e35ea13958dfe0c4c0d2ec758163b1b44b4b0b33a24d0b1b94fd4f204b4a6cdb12fd39a96fbc272 WHIRLPOOL a514482d61691eea95425911458bf58d1d1370bb5be57bed02d23196e71ec2e737798eaf1e88036b0107a18c9b14e392ef91950eadc8d203845a636e1c6e2565 AUX 0.10.5/offset.patch 525 SHA256 dd5ccdb6cc16d72f7dd94e89f549c32fe09a483b503369fa06e3b673d89d6d33 SHA512 f659a29c1fc97f157ab9de3c2a959a3c348dbc6d4a8ead6e27ea1748e63bc162c7ef2e050f04f008b110c6817b53eb4d24f8604e17f22501ceab544d3facd1cb WHIRLPOOL b48624958cbb429d1e4f11ec5dd9d92bb223d1327c6a99ca1a6e0f40a4ef899100253652c3c8dbb0208e17dd5877733ad070fe0e00f811f92d73fe9c49e0678e @@ -16,13 +17,13 @@ DIST gst-ffmpeg-0.10.13_p201211.tar.xz 4285300 SHA256 cc15841b9972d1b60c9aaa3ffa EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1153 SHA256 2dd65f12f7d5c6d346fc85b1feb57368933d3665a056c0563bed155c0b8835f6 SHA512 ebea81241dfea1ce1fdcbca209fc1c897d787036f0c8eb9ae5691c7c5c3a97352ec908319e59a612ee3612e65d13a9cb8bc5f6f6cce811723766fedf3b5cada2 WHIRLPOOL 1875ecff2d564f6a580af70de116a70d63f4fb76ee67d1932c261d4c1706a5e68a237808e63376a8536576b6af759e6530f5680816672cb09e8436d0d4e24c50 EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1252 SHA256 ba3b58b3b57694f50ddcc307efd17db0cfb1e625d16b5e61a51778a1cc9e6ae0 SHA512 ff0af7a595028cfd5e60bd479be4ef80a52de190fb56a13afe2c22d6e9f2fcdfebfd8338d313697c4d0effa19dbeb907f64d0ac7e52dc6aedf1628114bcbb88a WHIRLPOOL fb173a20cbddff4891a33bb45a15be1dd49ca19bd1a2b215454952662fc4b6109e57c664952c2a49b1400a3071af3e5e5da29a3eeab453acd06724e1895088d2 EBUILD gst-plugins-ffmpeg-0.10.13-r2.ebuild 1398 SHA256 966e7046a88d0433f98d83d5cf934447f506a659146fddc0ec3a47756882ae57 SHA512 3396fd11db439d5ac4c019fd17ab494b4c56b7162a9fb51b202059e8bbeee97f1d343d0618795918cdee8c8fdcddf58dc92733f67cdbcc36afe3622c05f750cc WHIRLPOOL 8a9602ee9d791b5acc401c5f4a8357b3aa4144b05d0047c17da1119cf86b46dcc2960a115c6ac3d8dcb515bc53bcf3ce686ef2c96de4bd2c5db4179f4f3b0ad5 -EBUILD gst-plugins-ffmpeg-0.10.13_p201211.ebuild 2043 SHA256 56b8796ccf3200583c58bb5a0b7c43b3e360b2aee7cf666f9062541c44623e0a SHA512 d3f1b8a8511b6653954e3a5ce7f5cc62c9d3f3a060f3c51bfc37e5e2a66cedf7f76ae33f1a3e0a3adfa6a307765fd905501cc9634b1964991bf2de3c92cee068 WHIRLPOOL a2a2a895ad59c6fc96fc8bc19043b4e22fc91eba78ceed3b069ca3406060c0ca6bec5bada6ce146484d3d716c4f21ff73eee0b0518de39d4839e98055f207a97 -MISC ChangeLog 23764 SHA256 9cfd847fddf44767fbad6fb7cbf640e688e5a739a9728d4ffa861127722bcc35 SHA512 766ea62b208e92ec1ce978fa9aec715e1c5961651c1d3da907d7c7cf3649a6bbd0ecaede590c323ec0ddc53f1a01e0d61221204963dad4a6d515d58b45aabd7f WHIRLPOOL 71c9686f0ff0c73dae6d2984ded92c9d8f50bc507da55cb230f9c3da635e61732305f92d5027ee0ecb0dd253167b099cc925d9e4a125780b92c90749b51cd549 +EBUILD gst-plugins-ffmpeg-0.10.13_p201211.ebuild 2093 SHA256 071ab2ee96651db368ad725b5a71977c47154db09a69282493f5e828b51f0f54 SHA512 19fff2c883581e0275f3783d161e40f13df665c3b45a166dc937ae28f9233cc8f56d34737cab39f9cdae845b627e3f321e7c9e602de2ede3dab1c112ea3a83cf WHIRLPOOL 563e655f8c4c4659dfb3ac27868f7bc70b73d9e1e4a672ad9cdb43ff74b3b509d623e919d1d4b109ef6f7ae6095896c989dda77c2e885e82df04b9a9375ed1f5 +MISC ChangeLog 23970 SHA256 6dd34d275501f7a38f4738806ed625f2c4b9c5588a7e0405eb24c153dd4b90b2 SHA512 f71072c24460e5161ac750729df9cc874f9c0b46635c35aeaf6ae39ac43b24aa986484121ca4f536ee784494813c77cb5368aa033afa2e20ae0462bd04749d46 WHIRLPOOL cdbaaa26904ae7f1db0e786eadc88d148efb05307f71543a5c6fe4b57ae23162fc2b9cedc9da1b825ccd7f6bf882e1627661282ff7c00faca4b0039c0100ee3f MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEefasACgkQvFcC4BYPU0q/jwCglam6umvFrte/KAk7oL2htN03 -NYcAoMrrK4hrhcz/MIsSoTybZjC+haeQ -=g92/ +iEYEAREIAAYFAlE7Qz4ACgkQvFcC4BYPU0o2kwCgmZt3JJLgHMelDKLFizU6B7fT +I7QAniLaeI76EFkAU3Oqlpz1fKY6EbKZ +=LArp -----END PGP SIGNATURE----- diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-gstffmpegpipe_redef.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-gstffmpegpipe_redef.patch new file mode 100644 index 000000000000..f76d72affde8 --- /dev/null +++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-gstffmpegpipe_redef.patch @@ -0,0 +1,16 @@ +This is already typedef'ed like that in gstffmpeg.h, included from this file. +https://bugs.gentoo.org/show_bug.cgi?id=460208 + +Index: gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegpipe.h +=================================================================== +--- gst-ffmpeg-0.10.13_p201211.orig/ext/ffmpeg/gstffmpegpipe.h ++++ gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegpipe.h +@@ -48,8 +48,6 @@ G_BEGIN_DECLS + g_cond_signal (m->cond); \ + } G_STMT_END + +-typedef struct _GstFFMpegPipe GstFFMpegPipe; +- + struct _GstFFMpegPipe + { + /* lock for syncing */ diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild index ab54484282ea..25b7477d6ee8 100644 --- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild +++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.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/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild,v 1.2 2013/02/15 18:25:45 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild,v 1.3 2013/03/09 14:12:13 aballier Exp $ EAPI=5 @@ -45,7 +45,8 @@ src_prepare() { # compat bits for older ffmpeg/libav releases epatch "${FILESDIR}/${PV}-channel_layout.patch" \ "${FILESDIR}/${PV}-iscodec.patch" \ - "${FILESDIR}/${PV}-coma.patch" + "${FILESDIR}/${PV}-coma.patch" \ + "${FILESDIR}/${PV}-gstffmpegpipe_redef.patch" } src_configure() { |