fixes for compatibility with older ffmpeg/libav (same as done for gst-libav)

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 91 insertions, 12 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 7e496716f121..e850c5e56157 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.152 2013/02/11 07:34:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.153 2013/02/15 18:25:45 aballier Exp $
+
+  15 Feb 2013; Alexis Ballier <aballier@gentoo.org>
+  +files/0.10.13_p201211-channel_layout.patch,
+  +files/0.10.13_p201211-coma.patch, +files/0.10.13_p201211-iscodec.patch,
+  gst-plugins-ffmpeg-0.10.13_p201211.ebuild:
+  fixes for compatibility with older ffmpeg/libav (same as done for gst-libav)
 
 *gst-plugins-ffmpeg-0.10.13_p201211 (11 Feb 2013)
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index b65168a56157..9de19a643eb5 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -2,6 +2,9 @@
 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-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
 AUX 0.10.5/system-ffmpeg-warning.patch 3567 SHA256 73c9cfa1006c6bca43d677a60ca8b2e30bca3b17c9855d11812afffa35542568 SHA512 59d711430c23c7db8b95aa4447d2763f38955f86a8f55992ba0f8a3fd3557f4bb461055e55f76d1b36414bd4f0be6c6fa5b0b956a9ee26e3ef5548979efd88aa WHIRLPOOL fd047c50c504ebf02a3accf9f1d1e04d52361d1b61c42e84816c1be1467e7d3e652e0d162585528b0f0aa05eed59593fd2a0f21a9ad67edb08c15dbb13ce7cfe
@@ -13,17 +16,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 1871 SHA256 77a59c38aacb959af92fcac1e2644b44a460197722b63f84d179dd5208b1956b SHA512 33f7bf26ec62c3ce704a66795667b789a0318699dfc4eb24d361d36c6d1e6dd421e5f8e9bb81f6aa32433475b34541bf525f2b8e50e1ce1dd86e0e664c2a6d69 WHIRLPOOL e45fcef1bff5e8b9e7fed8c3985a628991d550a0ca426cb238ff57f8a502073da4c44cda30802f43518641c6cd307c1b5cb754db150eff8539a64924106d3c75
-MISC ChangeLog 23466 SHA256 5e61240f07a7e23ca8083c65021dc910240af03bc3909bd6d67b11c4dd6d647c SHA512 03a16a7c8ec08bcdff899cb3d84ca600931a9bc54334d9d9b603b9f4e95f6f436723d935749182af431b6588a8a69db15fb457b31d3b451d4a7a3646746aa0c7 WHIRLPOOL edf7749af88c9024b6e4a9ade4175dfcb81923bfcd56bf84d954829103e0c98e73e93316120772e830c7a9d841e761d61013863efe6c0399de430a659fad9497
+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
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRGJ77AAoJEJ0WA1zPCt1hQkMIAKTphYJgZO1Ikdc6+iuqt9RV
-q04HX5JGFGUJgGVUI8U/mcdrHyZH/cH+YAhRo1FmaHi6AYFMBPxGDGELHtKGYqkL
-9uuJKcNAglGehsbmxiWrIQY3KiiIhZnNYNyJ3fEO8v5viH0u9TfQ2PN9f19SYvJa
-HQUvh822Hv5XEa747kHMQzS2w/yMyi3Qb5hWCtdUAT6YTjyDkWKd19wvZnfs7OCG
-RjS3RDW1aXqDKm1VTNo3RSPKWiSAtO/z/5/yTwKqhpXiCiY73gdcvbDetECSuQI1
-hzfdtv8XU562Tf4VfAC6VDO2VwHpoIUKneckchUr5dpCdKDYOv8oU4VG1EV3MjU=
-=q68B
+iEYEAREIAAYFAlEefasACgkQvFcC4BYPU0q/jwCglam6umvFrte/KAk7oL2htN03
+NYcAoMrrK4hrhcz/MIsSoTybZjC+haeQ
+=g92/
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-channel_layout.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-channel_layout.patch
new file mode 100644
index 000000000000..9358f76153ca
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-channel_layout.patch
@@ -0,0 +1,29 @@
+Include correct header with correct version. Fixes build with ffmpeg-0.10.
+
+
+Index: gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegcodecmap.c
+===================================================================
+--- gst-ffmpeg-0.10.13_p201211.orig/ext/ffmpeg/gstffmpegcodecmap.c
++++ gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegcodecmap.c
+@@ -25,10 +25,20 @@
+ #include <gst/gst.h>
+ #ifdef HAVE_FFMPEG_UNINSTALLED
+ #include <avcodec.h>
+-#include <channel_layout.h>>
++#include <avutil.h>
++#if (LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,6,0) || (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,2,0)))
++#include <channel_layout.h>
++#else
++#include <audioconvert.h>
++#endif
+ #else
+ #include <libavcodec/avcodec.h>
++#include <libavutil/avutil.h>
++#if (LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,6,0) || (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52,2,0)))
+ #include <libavutil/channel_layout.h>
++#else
++#include <libavutil/audioconvert.h>
++#endif
+ #endif
+ #include <string.h>
+ 
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-coma.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-coma.patch
new file mode 100644
index 000000000000..0426d00301c5
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-coma.patch
@@ -0,0 +1,16 @@
+Some muxers come with a ',' in their name, replace it by '_' as in the other
+places.
+
+Index: gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegmux.c
+===================================================================
+--- gst-ffmpeg-0.10.13_p201211.orig/ext/ffmpeg/gstffmpegmux.c
++++ gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegmux.c
+@@ -936,7 +936,7 @@ gst_ffmpegmux_register (GstPlugin * plug
+     p = type_name;
+ 
+     while (*p) {
+-      if (*p == '.')
++      if (*p == '.' || *p == ',')
+         *p = '_';
+       p++;
+     }
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-iscodec.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-iscodec.patch
new file mode 100644
index 000000000000..ef198cc33b55
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-iscodec.patch
@@ -0,0 +1,24 @@
+Provide replacement for these functions when not available.
+(e.g ffmpeg-0.10)
+
+Index: gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegutils.h
+===================================================================
+--- gst-ffmpeg-0.10.13_p201211.orig/ext/ffmpeg/gstffmpegutils.h
++++ gst-ffmpeg-0.10.13_p201211/ext/ffmpeg/gstffmpegutils.h
+@@ -99,4 +99,16 @@ av_smp_format_depth(enum AVSampleFormat
+ GstBuffer *
+ new_aligned_buffer (gint size, GstCaps * caps);
+ 
++#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,7,0) || (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,8,0)))
++static inline int av_codec_is_encoder(AVCodec *codec)
++{
++  return codec && (codec->encode || codec->encode2);
++}
++
++static inline int av_codec_is_decoder(AVCodec *codec)
++{
++  return codec && codec->decode;
++}
++#endif
++
+ #endif /* __GST_FFMPEG_UTILS_H__ */
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 dcf6c83454d7..ab54484282ea 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.1 2013/02/11 07:34:18 tetromino Exp $
+# $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 $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ S=${WORKDIR}/${MY_P}
 
 RDEPEND=">=media-libs/gstreamer-0.10.31:0.10
 	>=media-libs/gst-plugins-base-0.10.31:0.10
-	>=virtual/ffmpeg-9
+	>=virtual/ffmpeg-0.10
 	|| ( media-video/ffmpeg media-libs/libpostproc )
 	orc? ( >=dev-lang/orc-0.4.6 )"
 DEPEND="${RDEPEND}
@@ -41,6 +41,11 @@ src_prepare() {
 
 	# monkey's audio requires planar audio support to be backported
 	sed -e 's#[ \t]elements/ffdemux_ape[^ ]*##' -i tests/check/Makefile.{am,in} || die
+
+	# compat bits for older ffmpeg/libav releases
+	epatch "${FILESDIR}/${PV}-channel_layout.patch" \
+		"${FILESDIR}/${PV}-iscodec.patch" \
+		"${FILESDIR}/${PV}-coma.patch"
 }
 
 src_configure() {