Support libav-11 too (#509326 by Nikoli, mudler and others).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 205 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index d7ec6f3a6b14..04add0b628f1 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.196 2015/03/29 10:53:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.197 2015/05/30 15:35:59 pacho Exp $
+
+*gst-plugins-ffmpeg-0.10.13_p201211-r4 (30 May 2015)
+
+  30 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/0.10.13_p201211-audioresample.patch,
+  +files/0.10.13_p201211-r_frame_rate.patch,
+  +files/0.10.13_p201211-snow-codec.patch,
+  +gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild:
+  Support libav-11 too (#509326 by Nikoli, mudler and others).
 
   29 Mar 2015; Jeroen Roovers <jer@gentoo.org>
   gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 9069906d7b4d..fb8d73ec85c5 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.10.13_p201211-audioresample.patch 2957 SHA256 dd3800d3671855f479a8798151e653fb0dce4eea2363f58ae267cd0b773b29f9 SHA512 8d982e0e47280b87ed81369f20bd03d96414daeac138c4ca0d0a4f408ceaaa5986a128f33ce9dcc9dad59e7c88bfc621ea6870ce00ba84d8fee4fa75cb2df185 WHIRLPOOL 0c4e774bb87826abf6f200465293d5ebf31d3b32d5a58af6b21a2091869fe09b06a84aaf58edb1804234871588f1207e7981d9a0191cefeda0e3b14059ee042f
 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-ffmpeg2.patch 5863 SHA256 d29094aa9881b372c7d18cf5ae1e8cc6bf4126164d904445de1f948da5d32ac1 SHA512 4c6b3c40a73cc672600feb2266c3c0177504ce65fde9d3e30cc06c55d4538525f7b8caf3a37a5cc65236f6cce4b8cee987054161befeaf0a670a8999d899c95c WHIRLPOOL d128f1fbf8cb1b4f2090b591716f7ec2b99dff2ec719e745b8cbd170ae5252dda8ecf7fce9c01f4f67b561d2697a21b36604ea56d9066e708370534cef83b0ce
 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.13_p201211-planaraudio.patch 6359 SHA256 99767dfcf8fd00576a6141bab6c45a59c1ac8a310362b64526209ee952c02beb SHA512 38f6d1e5c9e5866d52345e9d775813b182dec4b8632879fd22583636ce025de88d64aa5a6ffbd97926d5de40344f503b0e3f427ff139e3eaf55cc6bc2f0e58d5 WHIRLPOOL b29e68d12f9ef3fc82603a288742fc0ea19079884d44c3795745d8d00220769f3f014e11589a7b189a81b2c244cf18aabc7b1087e2aadded04f71eb6be26611c
+AUX 0.10.13_p201211-r_frame_rate.patch 1178 SHA256 9b3f0fd088e71625040ae6452320f1840fb5296cd11f9892fb7a66b1bac0bed8 SHA512 f7aa4e6af59dcfc314fa90b4b2099a0053b2470233d8befdab444badf372c93459adf7662f2281a052c9a0a9b7e84c1346b5f62a6634b5b55b42184e85335e5f WHIRLPOOL b1dc25b56fa90faa6c34f34a35780d113c2a75e0deea5033a01cc305345038fc21728dee4d756b0e9b600f413086c25a060bd5f69fc1f98f86684fa637681e0d
+AUX 0.10.13_p201211-snow-codec.patch 422 SHA256 6a833a141ffcb02c840033093e9bc37f7234ae74969b3148b101a1498ab47fa3 SHA512 dc44e8f419e2e4f73d5c6a3e1ffe2d6db8eb13fe838081e73d28edeb8f9b2c2488012cf7049bd5522f1a3048c1ad2f67757d9262717f07798ce85dea22a115d4 WHIRLPOOL 8e35d4006237777a4e2d34463a1b37ceb3d2b6d1b3f2c67ed220509e736aa3fff91208e3c68fbd9afac80f340eb2ff4652dbfbe32c09319d18e4e122586461a1
 DIST gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz 14076 SHA256 5afa627ccbbedc1c80bfd419cb497c746aea0f27e0165a49c41947eba31774ee SHA512 cd12490600c0e56a85ec7436ec6152be8962c0e949ee9925ad64c114c60d7a72958f7c5ac98a3bdc6988bce707a2c40060e3a20b899ef2a95a30b4166bfb8145 WHIRLPOOL a7f17fd32112ba9df89ef80717946a50cc81e02e608c7cc15066987cd0e3556a1971ef5360ac50089d7c883aae5eb9d36ed3d7834fb7a075a816ceb16fa2b960
 DIST gst-ffmpeg-0.10.13_p201211.tar.xz 4285300 SHA256 cc15841b9972d1b60c9aaa3ffae14f3dbf44c0b08c14bb9319fb8956c89864c6 SHA512 9067aa92ef7613b08a51957d35d1de80897c28cb959522d9b523de6f482635dac3fe421015febb88ece624b7baee0216dd4b72e770bf92c05d8994f186d2f396 WHIRLPOOL 88ba2ce647ca821ef8f7aa22d64cf39397e30d8f34eadec475e6b627472c4baf6c7de6c60d4ca86527a67c710193dc00eb6534fe8bc92f73cc26db1f8e404a49
 EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild 2619 SHA256 920b91dbfa6b7cdf22430022d807e0b4975a9d7dcf95aa9e7783ec87d5f909f9 SHA512 41b032d6478ef6b5e238ead218ee8e5cfeb6532c4c55d0b2b65447b79288d0dbe299db8c6b6dd4160783114dccc8696be20230453c340df0f25f73a69cba4aa5 WHIRLPOOL 6f077c7c4ed65ec863f0f90d479970da3ed9c37d4a782c8d410e71231f5d083e5449ef9d58b7511bafe7a7ee9231992e46f8e054efe2cf7189be7536f57190c2
 EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild 2441 SHA256 41d54de419a26bec71cc4e1ae9e58bf743864e258c4473542fe5349bde4edb89 SHA512 2aad8850c7fc771d980cc0602b421f65d36f15d95329d022ba58a7618c8ec18723225b73697ed41dd4f149588c1cbcd84eb60f58cc9ab886be5820d216725a48 WHIRLPOOL c27febb6ea25a5a262e6d9beace8538abaffc9f4f2c988b85636b0c0c3755fc59c085458dad5935e45187450467a09240364acaf96c3a193152f3406f2974363
-MISC ChangeLog 30239 SHA256 28b157ea9bb7b2b6e79c35b1fff95f5fcb7c38b3760f116a436c1d3b3f27d7e1 SHA512 94277e72e53b18d40e5b61299888c49c558aeaac56399b9ee461563dab8b3e95d44369dbf204a9a8b3e4bd19b50984fbafd299d6f9b39e53e4ca0a8ae78a9f78 WHIRLPOOL 97e1e507328cfa16d09d9ae45b4b99e1711af4199f3a81264cac9e59e875104b8ac1abd7d4f9244daa224fa62db216ab3c2e8f2c8868ffc5e7a4ceb9c4ea5223
+EBUILD gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild 2565 SHA256 7d21d3b89bed2e9706c7e7e4a3285df1856704d7870f9cece8dfea2468ff3ee0 SHA512 c1d001089dfdd102d9625f40f632a7a75f631477db5010297298bf649c4020922eabca580ffc4fb744d70198795a507dd99354a1925f56768effe31a8f80dda4 WHIRLPOOL 7e29b21ef980fe26c3ee969c6a1d1ec0ed3bdda1432c7f3775d802f4b18f651ce952cf4b95c6bef882cd8f52db3f61ac18fa117aa1353ac97252e2c573aca5b9
+MISC ChangeLog 30588 SHA256 6c5d264217235d2fb57cc91f7889681fb47fdd3edb834e739ece18e55a4de478 SHA512 714cf0aa7079c8431232a3a7f6ce52c7bc74fa248cdae92aff807a70876f57a0bb15e692e715e0cee6d798d6c5353f489f881c580c56ae236039c074df4fe0ee WHIRLPOOL ca8eca7cd4aa31e3909a7b4f809596fb55d2a7a4aa8c727faf781280b1189823d64e9dea56cc1e2388a03ffee13ca894d5fc87a97f27cfad08fb83e926f09dd5
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUX2Z4ACgkQVWmRsqeSphMYrQCfVsNkNPKe3M8EkDRmdU2X7t9L
-/VUAnRCE2TUbJdV5Vohp3M5p8d7rnK0d
-=tV3Y
+iEYEAREIAAYFAlVp2OAACgkQCaWpQKGI+9RAQACfd89b8H5+rrroBbcXo5fBgE7M
+VTcAnRIrtY1vKYbgmr1JU8rk1F+nQL7t
+=lIr+
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-audioresample.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-audioresample.patch
new file mode 100644
index 000000000000..3c115d7b45c5
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-audioresample.patch
@@ -0,0 +1,71 @@
+--- ext/ffmpeg/gstffmpegaudioresample.c~	2015-05-29 11:38:03.639001637 +0200
++++ ext/ffmpeg/gstffmpegaudioresample.c	2015-05-29 20:08:24.744107000 +0200
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <libavresample/avresample.h>
+ #ifdef HAVE_FFMPEG_UNINSTALLED
+ #include <avcodec.h>
+ #else
+@@ -37,6 +38,60 @@
+ #include "gstffmpeg.h"
+ #include "gstffmpegcodecmap.h"
+ 
++struct AudioData {
++    const AVClass *class;               /**< AVClass for logging            */
++    uint8_t *data[AVRESAMPLE_MAX_CHANNELS]; /**< data plane pointers        */
++    uint8_t *buffer;                    /**< data buffer                    */
++    unsigned int buffer_size;           /**< allocated buffer size          */
++    int allocated_samples;              /**< number of samples the buffer can hold */
++    int nb_samples;                     /**< current number of samples      */
++    enum AVSampleFormat sample_fmt;     /**< sample format                  */
++    int channels;                       /**< channel count                  */
++    int allocated_channels;             /**< allocated channel count        */
++    int is_planar;                      /**< sample format is planar        */
++    int planes;                         /**< number of data planes          */
++    int sample_size;                    /**< bytes per sample               */
++    int stride;                         /**< sample byte offset within a plane */
++    int read_only;                      /**< data is read-only              */
++    int allow_realloc;                  /**< realloc is allowed             */
++    int ptr_align;                      /**< minimum data pointer alignment */
++    int samples_align;                  /**< allocated samples alignment    */
++    const char *name;                   /**< name for debug logging         */
++};
++
++typedef struct AudioData AudioData;
++
++struct ReSampleContext {
++    AVAudioResampleContext *avr;
++    AudioData *buffer;
++    uint8_t *filter_bank;
++    int filter_length;
++    int ideal_dst_incr;
++    int dst_incr;
++    unsigned int index;
++    int frac;
++    int src_incr;
++    int compensation_distance;
++    int phase_shift;
++    int phase_mask;
++    int linear;
++    enum AVResampleFilterType filter_type;
++    int kaiser_beta;
++    void (*set_filter)(void *filter, double *tab, int phase, int tap_count);
++    void (*resample_one)(struct ResampleContext *c, void *dst0,
++                         int dst_index, const void *src0,
++                         unsigned int index, int frac);
++    void (*resample_nearest)(void *dst0, int dst_index,
++                             const void *src0, unsigned int index);
++    int padding_size;
++    int initial_padding_filled;
++    int initial_padding_samples;
++    int final_padding_filled;
++    int final_padding_samples;
++};
++
++typedef struct ReSampleContext ReSampleContext;
++
+ typedef struct _GstFFMpegAudioResample
+ {
+   GstBaseTransform element;
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-r_frame_rate.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-r_frame_rate.patch
new file mode 100644
index 000000000000..5c34257b867f
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-r_frame_rate.patch
@@ -0,0 +1,25 @@
+From: Ettore Di Giacinto <mudler@sabayonlinux.org>
+--- ext/ffmpeg/gstffmpegdemux.c~	2015-05-29 00:52:07.601606544 +0200
++++ ext/ffmpeg/gstffmpegdemux.c	2015-05-29 01:18:18.533113323 +0200
+@@ -781,8 +781,8 @@
+           break;
+         case GST_FORMAT_DEFAULT:
+           gst_query_set_position (query, GST_FORMAT_DEFAULT,
+-              gst_util_uint64_scale (timeposition, avstream->r_frame_rate.num,
+-                  GST_SECOND * avstream->r_frame_rate.den));
++              gst_util_uint64_scale (timeposition, avstream->avg_frame_rate.num,
++                  GST_SECOND * avstream->avg_frame_rate.den));
+           res = TRUE;
+           break;
+         case GST_FORMAT_BYTES:
+@@ -818,8 +818,8 @@
+           break;
+         case GST_FORMAT_DEFAULT:
+           gst_query_set_duration (query, GST_FORMAT_DEFAULT,
+-              gst_util_uint64_scale (timeduration, avstream->r_frame_rate.num,
+-                  GST_SECOND * avstream->r_frame_rate.den));
++              gst_util_uint64_scale (timeduration, avstream->avg_frame_rate.num,
++                  GST_SECOND * avstream->avg_frame_rate.den));
+           res = TRUE;
+           break;
+         case GST_FORMAT_BYTES:
diff --git a/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-snow-codec.patch b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-snow-codec.patch
new file mode 100644
index 000000000000..7e54f929f674
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/files/0.10.13_p201211-snow-codec.patch
@@ -0,0 +1,11 @@
+From: Ettore Di Giacinto <mudler@sabayonlinux.org>
+--- ext/ffmpeg/gstffmpegcodecmap.c~	2015-05-29 10:50:06.207840323 +0200
++++ ext/ffmpeg/gstffmpegcodecmap.c	2015-05-29 10:50:25.638042896 +0200
+@@ -1307,7 +1307,6 @@
+     case AV_CODEC_ID_FLIC:
+     case AV_CODEC_ID_VMDVIDEO:
+     case AV_CODEC_ID_VMDAUDIO:
+-    case AV_CODEC_ID_SNOW:
+     case AV_CODEC_ID_VIXL:
+     case AV_CODEC_ID_QPEG:
+     case AV_CODEC_ID_PGMYUV:
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild
new file mode 100644
index 000000000000..60f3d4f4614f
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 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-r4.ebuild,v 1.1 2015/05/30 15:35:59 pacho Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-ffmpeg"
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="
+	>=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
+
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
+	libav? (
+		>=media-video/libav-11.3:0=[${MULTILIB_USEDEP}]
+		>=media-libs/libpostproc-10.20140517-r1:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
+"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# libav-9 support backported from gst-plugins-libav-1.1.0
+	epatch ../${MY_P}-libav-9-patches/*.patch
+
+	# compat bits for older ffmpeg/libav releases
+	epatch "${FILESDIR}/${PV}-channel_layout.patch" \
+		"${FILESDIR}/${PV}-iscodec.patch" \
+		"${FILESDIR}/${PV}-coma.patch" \
+		"${FILESDIR}/${PV}-gstffmpegpipe_redef.patch"
+
+	# compatibility with recent releases
+	if has_version '>=media-video/ffmpeg-1.1' || has_version '>=media-video/libav-9' ; then
+		epatch "${FILESDIR}/${PV}-planaraudio.patch"
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/ffmpeg/*.{c,h}
+		epatch "${FILESDIR}/${PV}-ffmpeg2.patch"
+	fi
+
+	# libav 11 migration 	
+	epatch "${FILESDIR}/${PV}-r_frame_rate.patch"
+	epatch "${FILESDIR}/${PV}-audioresample.patch"
+	epatch "${FILESDIR}/${PV}-snow-codec.patch"
+}
+
+multilib_src_configure() {
+	# always use system ffmpeg if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-system-ffmpeg \
+		$(use_enable orc)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}