fix build with ffmpeg-2

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

4 files changed, 219 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog
index 8e38eaf688b8..5ecd2bbdeaf8 100644
--- a/media-plugins/gst-plugins-libav/ChangeLog
+++ b/media-plugins/gst-plugins-libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/gst-plugins-libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.26 2013/07/28 17:36:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.27 2013/08/06 19:54:13 aballier Exp $
+
+*gst-plugins-libav-1.1.0_pre20130128-r1 (06 Aug 2013)
+
+  06 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  +gst-plugins-libav-1.1.0_pre20130128-r1.ebuild,
+  +files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch:
+  fix build with ffmpeg-2
 
   28 Jul 2013; Alexis Ballier <aballier@gentoo.org>
   gst-plugins-libav-1.1.0_pre20130128.ebuild:
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index f19cdca38408..a897b81187c5 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -3,19 +3,21 @@ Hash: SHA256
 
 AUX gst-plugins-libav-1.1.0_pre20130128-coma.patch 517 SHA256 3f2d856668aabf8872588a9bdfb6f28296b7b7f6cf5e9a2dd77cb3ee0ecddf4f SHA512 ab89eb9642ecb66a16503d136adf41c42bd41f1021546952580f2b6e8a558916234aebb35bce6af04de5b90e2ccd8695864ef0f44f0013eed904b06ec60c1a61 WHIRLPOOL e36c3ee9a663eb284b191a8bd83e45c346c685bfdc45d96dfe14a31a7918cd1e55aa11228139cb7cb811617e0563cc2f9d0c89fd68c3a37f0641330e045b5d37
 AUX gst-plugins-libav-1.1.0_pre20130128-compat.patch 1810 SHA256 e50bf0fcf9b9c3cac9e712832438642425d3180d085d3cee5bf3427093a3d789 SHA512 1f48b05b70aef81f0c1f190ff38a68fb0d9e95c525042d213ec8a34de48d72b164491cb27064643da080c37859922a2bce1c0161d13512a42afdb8fb774f271d WHIRLPOOL c2bfc6e64b7a2fe215d8e7c02664c4b7ed4ee5657ce264a7bbc0fa021aa9cc403b4c4b3629f73aea41c97e0143226233d5fd7d442ba87bd1b4cb869aa7380a90
+AUX gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch 5250 SHA256 51c20417417c797a703710eb27dcd7b9b2cd92321ee78c6dfea10ec77024b0b6 SHA512 7261dc865729c33b4d55953167e89118f2ddf7d9eaff0436d543e30f6d24127d74ccca9b5b2eb23faff28eac38beec343b5306eee70cea80dacd897b419ab0ed WHIRLPOOL 485e538cdee9dbbe88eebe1f6596b0d3f23618d19dccc80932e0a4a33a52c2f0a0a312646f4ce1281136aa60bf109b5f32eaea84e77802113c7f4abc83f796ea
 AUX gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch 1001 SHA256 120f5a118cfb71ed8eb03e015e49955ed38bf09a5dd7f9768054219a2e348e24 SHA512 7f29af719101821b88a19a46c2325021724e7f555260ff2a6448f45a87f39df303eae08aa1ef9509ccde467dc9f7e3f3cdcc2611ddd7d1b4f4cfb72f6f21364d WHIRLPOOL 987c420ea0be285c1a8c298080012f14ec8c4de31e5c653d0f312d2be40c32c935a6481e793922d969696dab70a90d9e1b45b74359775723fdceec5dcc9d19cc
 DIST gst-libav-1.0.3.tar.xz 4235032 SHA256 5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959 SHA512 b59b2abe3e841712948b2f3b3b78ce49573e0623880a4f11089a636c89268d3f79863c1a0975cd7e5bf4bf40a86f0d2370cf03511e2751d2cd39887733524be8 WHIRLPOOL 8b98829ccb9f160c8209f22fd44c5776d156a6d7e9b3d5526149521ed4b02a319ef7cd4d9df550133714433d93eb2dba211dfe83e1c03776885844ae71c1e518
 DIST gst-libav-1.0.5.tar.xz 4234992 SHA256 aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5 SHA512 36d5147ddf41caac34db4c5095499e84f8f832cd87c8b6fdf99055d2703e899c945494d0478cbc77b37a6dd62f71d614f033bde566b1658831f5fc286cee4ba3 WHIRLPOOL c5163259734d89f0fc1b15bebbe87cf49fd4611ba831a7f0d98086cc9afe17bdb0fb14e718e6852dd94f72c0a0e8d1290bf047d903e3f0bc7350d55c6190f6f0
 DIST gst-libav-1.1.0_pre20130128.tar.xz 477668 SHA256 c746d093b5ad4a6d325361217c49b35817ab0a257504d54b92ef0302820f66b4 SHA512 525d393b1fe665652798bd50859f6e5317b164c3edf7e20f4bc66a2d2c09e6345c2aacf80f8592306da0945325e7a22b0238bb868393df304fbdb4c8956cf338 WHIRLPOOL bb10a0d741997212556e88f2cec32bc93375e5a8c89b3b6ef3bc598a2c9ab8f8985b42b0585d5c2ff3ca08433276f094dca7194e1b660f8199fd276d2e531a8c
 EBUILD gst-plugins-libav-1.0.3.ebuild 1426 SHA256 e6252d25cc95b2458c2be728d8b208bc580018e7bf4c042e402a3052e1a1d2c4 SHA512 964446d48b00e71211a990270e1f6668a36610e9730f0a0207a9393a4c747c388541fc84413f298e59adfc4167ef026efba74fd6320ef5dfd6343e9b74aa1ae0 WHIRLPOOL e0ffb819e0239c215b10f817edf86e985aa5c3743c0fc3ee166dfc3aecd46dbb6f705e74d41d14fcb427b7e3a5ccef7cf134bc08f98813bc24e9274acf2e0644
 EBUILD gst-plugins-libav-1.0.5.ebuild 1515 SHA256 227e17ed476e86b41848a9b9646b8eb64686eb5a9b04f9a4291aba3b1c0d6a22 SHA512 620cea71643b430815994a22341c0513cb5293f68b30cf593406f0f44036dfb14ea34a58b894e068e62ebebf8324f09c12769637ca593654610f688d21c166f7 WHIRLPOOL 94589dc577fbd348e52c7b5c31d2c85b5aaa9b22bf1ce7801960bdf495eb81efdf8f32c2338220817fb4a8d15dd791f23740c843662945e0de4e737c0f8a9e66
+EBUILD gst-plugins-libav-1.1.0_pre20130128-r1.ebuild 2526 SHA256 8d8e1db2d42095491d660efed6343b60d4df9ef1cd44a18615443f5f5ae93861 SHA512 5746831dbdbcc5c7c99471a4098b63d82274fcbb221903dd15c73a7169219615836f8200e10aa484ec3840628fc7da64ff5381ba3a5e2277450575f4de7551c1 WHIRLPOOL 5fdc70800b7380cae81501a366643b5b0bc859bc9171cb6d552c978af62131bf61863cb1b746cc3e374ebc580282efc27817bc2d7413f9351e902e6e3c829024
 EBUILD gst-plugins-libav-1.1.0_pre20130128.ebuild 2100 SHA256 1be12415700d631430093688b13c371bd1344646b55f407c3bd677d2d327f252 SHA512 4775aa2ceb65bce40eaed69d0175d002dea5f8ccf8e7180e88cf52138c73614aad70dd95cf9c0547bc7ee5c7b5aeeb022b98a9225d6e23200657539a8ba1028c WHIRLPOOL aa0b9a9460d6305d58e2c02a71bef23aa70e0ae7e3d09cd462248754857e291acea3c22fff9285c8a45cb09d0f8b2fcf30636ae580e128116b0ac5dc20a9cadf
-MISC ChangeLog 4213 SHA256 b693eb51e8e235312e9e0ee51678869f23e14bbb383993f196881e96ff6bdea7 SHA512 dadd843bc85cc3788c7b871d76ab1db5a7a8d9fa7812b112c97b1ee7d78f7c73c2a3d15294fe93be312c615e6ab229600653943008d57028186fd0f150a7a2fa WHIRLPOOL c1a63a4ee598364268c434001819d2c9eee928ffb8ba1d53a45bc4e4699fc85c5b1d0f359a58fe58256b2985309afb3a318102cba1ad7279720c61b137cfbf75
+MISC ChangeLog 4457 SHA256 aeb2a9dbbc3196213a2d5b570b47032d54d819add57f811afb2031d912ed7893 SHA512 fc45bc70898fc5e2e40bf99b9eda5b308d1742fb4d48628b8210912e593bec1ec1d97f3014b233830c36303d6da27dbc51f4b0eb1c9fec243bffe55773746e07 WHIRLPOOL 82ace4b2dcfb9a95a4ed5401d74bcedd503987778b7ae9628f8a887f7b65b72072da245b4ea86df074a4540ac4cc4124a86bb198b061537b4177ea8a0a4c9211
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH1Vp4ACgkQvFcC4BYPU0q+cgCeNyddV9BoDtb7QxoeFLlZKhXo
-8nQAn2E3dxMKBJO5Zboogita7Q+UuB8H
-=B8Kl
+iEYEAREIAAYFAlIBVGYACgkQvFcC4BYPU0pWHwCgnXxymmEVRSJehAqEwGe9LrbH
+JuoAoMTaEmF958ehjQhJMsXV2AnZvy4c
+=rMXN
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch
new file mode 100644
index 000000000000..66b965afd833
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-ffmpeg2.patch
@@ -0,0 +1,121 @@
+Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavauddec.c
+===================================================================
+--- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavauddec.c
++++ gst-libav-1.1.0_pre20130128/ext/libav/gstavauddec.c
+@@ -420,7 +420,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA
+     GstBuffer ** outbuf, GstFlowReturn * ret)
+ {
+   gint len = -1;
+-  gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++  gint have_data = 0;
+   AVPacket packet;
+   AVFrame frame;
+ 
+Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavaudenc.c
+===================================================================
+--- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavaudenc.c
++++ gst-libav-1.1.0_pre20130128/ext/libav/gstavaudenc.c
+@@ -266,7 +266,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
+   ffmpegaudenc->context->coder_type = 0;
+   ffmpegaudenc->context->context_model = 0;
+   ffmpegaudenc->context->scenechange_threshold = 0;
+-  ffmpegaudenc->context->inter_threshold = 0;
+ 
+   /* fetch pix_fmt and so on */
+   gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context);
+Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavcfg.c
+===================================================================
+--- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavcfg.c
++++ gst-libav-1.1.0_pre20130128/ext/libav/gstavcfg.c
+@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void)
+       {FF_IDCT_INT, "JPEG reference Integer", "int"},
+       {FF_IDCT_SIMPLE, "Simple", "simple"},
+       {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"},
+-      {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"},
+       {FF_IDCT_ARM, "ARM", "arm"},
+       {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"},
+       {FF_IDCT_SH4, "SH4", "sh4"},
+       {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"},
+-      {FF_IDCT_H264, "H264", "h264"},
+-      {FF_IDCT_VP3, "VP3", "vp3"},
+       {FF_IDCT_IPP, "IPP", "ipp"},
+       {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"},
+       {0, NULL, NULL},
+@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void)
+           "global-headers"},
+       {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction",
+           "aic"},
+-      {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"},
+-      {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection",
+-          "qp-rd"},
+       {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"},
+       {0, NULL, NULL},
+     };
+@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void)
+       -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+   gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL);
+ 
+-  pspec = g_param_spec_int ("luma-elim-threshold",
+-      "Luma Elimination Threshold",
+-      "Luma Single Coefficient Elimination Threshold",
+-      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+-  gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL);
+-
+-  pspec = g_param_spec_int ("chroma-elim-threshold",
+-      "Chroma Elimination Threshold",
+-      "Chroma Single Coefficient Elimination Threshold",
+-      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+-  gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL);
+-
+   pspec = g_param_spec_float ("lumi-masking", "Luminance Masking",
+       "Luminance Masking", -1.0f, 1.0f, 0.0f,
+       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavcodecmap.c
+===================================================================
+--- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavcodecmap.c
++++ gst-libav-1.1.0_pre20130128/ext/libav/gstavcodecmap.c
+@@ -797,13 +797,11 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
+           break;
+       }
+ 
+-      /* FIXME: context->sub_id must be filled in during decoding */
+       caps =
+           gst_ff_vid_caps_new (context, NULL, codec_id, encode,
+           "video/x-pn-realvideo", "systemstream", G_TYPE_BOOLEAN, FALSE,
+           "rmversion", G_TYPE_INT, version, NULL);
+       if (context) {
+-        gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL);
+         if (context->extradata_size >= 8) {
+           gst_caps_set_simple (caps,
+               "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata),
+@@ -2855,18 +2853,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod
+     }
+       break;
+ 
+-    case AV_CODEC_ID_RV10:
+-    case AV_CODEC_ID_RV20:
+-    case AV_CODEC_ID_RV30:
+-    case AV_CODEC_ID_RV40:
+-    {
+-      gint format;
+-
+-      if (gst_structure_get_int (str, "format", &format))
+-        context->sub_id = format;
+-
+-      break;
+-    }
+     case AV_CODEC_ID_COOK:
+     case AV_CODEC_ID_RA_288:
+     case AV_CODEC_ID_RA_144:
+Index: gst-libav-1.1.0_pre20130128/ext/libav/gstavvidenc.c
+===================================================================
+--- gst-libav-1.1.0_pre20130128.orig/ext/libav/gstavvidenc.c
++++ gst-libav-1.1.0_pre20130128/ext/libav/gstavvidenc.c
+@@ -332,7 +332,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc
+   ffmpegenc->context->coder_type = 0;
+   ffmpegenc->context->context_model = 0;
+   ffmpegenc->context->scenechange_threshold = 0;
+-  ffmpegenc->context->inter_threshold = 0;
+ 
+   /* and last but not least the pass; CBR, 2-pass, etc */
+   ffmpegenc->context->flags |= ffmpegenc->pass;
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild
new file mode 100644
index 000000000000..8d46334f9e40
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild
@@ -0,0 +1,84 @@
+# 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-libav/gst-plugins-libav-1.1.0_pre20130128-r1.ebuild,v 1.1 2013/08/06 19:54:13 aballier Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=virtual/ffmpeg-0.10
+	orc? ( >=dev-lang/orc-0.4.16 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# allow building with gstreamer-1.0.x
+	sed -e 's/REQ=1.1.0/REQ=1.0.0/' -i configure.ac configure || die
+	# Disable GBR color support; it requires >=gst-plugins-base-1.1
+	epatch -R "${FILESDIR}/${P}-gbr-color.patch"
+	# Let it be compatible with older ffmpeg/libav releases, add the compat glue
+	epatch "${FILESDIR}/${P}-compat.patch"
+	# Some muxers contains coma too.
+	epatch "${FILESDIR}/${P}-coma.patch"
+	# compatibility with recent releases 
+	# TODO: likely apply them with libav-10 when it's out but there will
+	# probably be an upstream gst-libav release compatible at that time.
+	if has_version '>=media-video/ffmpeg-2.0' ; then
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/libav/*.{c,h} || die
+		epatch "${FILESDIR}/${P}-ffmpeg2.patch"
+	fi
+}
+
+src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="http://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	if has_version "media-video/ffmpeg"; then
+		elog "Please note that upstream uses media-video/libav"
+		elog "rather than media-video/ffmpeg. If you encounter any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}