fix build with ffmpeg git

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 144 insertions, 4 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index d3a27d47b6a2..77b93e280db6 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.285 2011/03/26 15:56:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.286 2011/05/17 19:29:07 aballier Exp $
+
+  17 May 2011; Alexis Ballier <aballier@gentoo.org> transcode-1.1.5-r2.ebuild,
+  +files/transcode-1.1.5-ffmpeg.patch:
+  fix build with ffmpeg git
 
   26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop unused useflags from metadata.xml
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 2b01342ffb9b..7a407dd7e196 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX transcode-1.0.6-imagemagick.patch 672 RMD160 2d1ab8cf8ca9846c8ca5de24033b358985050f85 SHA1 e2e2890f9217c068755d094fd1f656d8c344a69c SHA256 bd4d8aa5577fabac5becb03539db1e547e72cd2e4748cd53c62e8032acaf41ac
 AUX transcode-1.1.4-x264.patch 1837 RMD160 6ec8925ca714f688df06f5df229c741ca2076708 SHA1 6f54bbebc996e4576e31f16d22863f23de2ce2d9 SHA256 f1746212a2b2f2bfc01cce0e26c83c2392dbd776878a76e627f7ec809f5da0a9
+AUX transcode-1.1.5-ffmpeg.patch 6128 RMD160 7c21b8daf99b599f0b3005cd2b08ae5c894c4552 SHA1 2d3bb4486394ee55540e772f134e193874e5c2b4 SHA256 a0246b84d12d289a940468a289ad5471c29d7a35c8317293a0dc0c7428445487
 AUX transcode-1.1.5-jpeg-7.patch 460 RMD160 2e5f96ff0700890814e1af2338fe0d7dde147f04 SHA1 9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977 SHA256 f4807d5f598e387a7056c41bc0fefd29f61b75dcf946e2894c783481f6a627bd
 AUX transcode-1.1.5-mpa.patch 583 RMD160 6500b698ff0f46e2eeae47acd1d4e4c4c2f1cd4d SHA1 6f45d9167c3aa15a83cb29545749f55eb1f1e5a2 SHA256 9b31976d3104e024c3fd339d501575c48d3cbadc99bb3121e5934d48bc6fc193
 DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009
-EBUILD transcode-1.1.5-r2.ebuild 4024 RMD160 01b5e45675af39e7618795e7dbeb95dcad50c13a SHA1 2954fcc9bca6c49af2d4243e707dde319e6544c5 SHA256 883fca683d793d8860e5b163903205b1f80771488ea7c215ad5b88deae8d1242
-MISC ChangeLog 47765 RMD160 5934f2af5e7e5ac8d208c05293b431c7e84adadd SHA1 9abb4443ed568d02d5507f67f0308eed7c76deb0 SHA256 a96e05a1995533a88ba285b1ad9afb3909a473c11430e1283d9a328f85582b1b
+EBUILD transcode-1.1.5-r2.ebuild 4063 RMD160 699dbb697c19202c9faa7e63acca7f1fe4bb9f33 SHA1 51297a6ea89897202b9f2b97a9f790b05946cf13 SHA256 dfb9590283380a3f68cb492ee073ae9323f3ac4a98c91a0b6c9bc19df8064f1d
+MISC ChangeLog 47911 RMD160 bd2530544b4cc8f9f72af1aad202b8559ec47ce9 SHA1 d4a5590fc8468a990d60d0e1e3e26233ad42b51d SHA256 a482a7ec35fe3199e038e95ea8b24a8f7efb2a7ad230f9ffbf71fb91fb3110f8
 MISC metadata.xml 444 RMD160 af149b7604eda71e81265e34df694127e22d6614 SHA1 24254d62a1f342d7b5ca933da99f4fce5876da6d SHA256 aa72df101b5326a3ed9f47121b70546c60c45d486d70574d8f46bfc4e374ffdf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3SzIgACgkQvFcC4BYPU0p8TwCgyxN0ogmF42but6/3CUqaVXUD
+UcIAoIrOOUnBW6sVGzmQT/CvBYpy+71t
+=8ev/
+-----END PGP SIGNATURE-----
diff --git a/media-video/transcode/files/transcode-1.1.5-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.5-ffmpeg.patch
new file mode 100644
index 000000000000..86e8272e9d69
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.5-ffmpeg.patch
@@ -0,0 +1,124 @@
+Index: transcode-1.1.5/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.5.orig/encode/encode_lavc.c
++++ transcode-1.1.5/encode/encode_lavc.c
+@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa
+     /* 
+      * context *transcode* (not libavcodec) defaults
+      */
+-    pd->ff_vcontext.mb_qmin                 = 2;
+-    pd->ff_vcontext.mb_qmax                 = 31;
+     pd->ff_vcontext.max_qdiff               = 3;
+     pd->ff_vcontext.max_b_frames            = 0;
+     pd->ff_vcontext.me_range                = 0;
+@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri
+         //  handled by transcode core
+         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         //  handled by transcode core
+-        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+-        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
+         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+Index: transcode-1.1.5/export/aud_aux.c
+===================================================================
+--- transcode-1.1.5.orig/export/aud_aux.c
++++ transcode-1.1.5/export/aud_aux.c
+@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
+-    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
++    mpa_ctx.codec_type  = AVMEDIA_TYPE_AUDIO;
+     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
+     mpa_ctx.channels    = vob->dm_chan;            // channels
+     mpa_ctx.sample_rate = vob->a_rate;
+Index: transcode-1.1.5/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.5.orig/export/export_ffmpeg.c
++++ transcode-1.1.5/export/export_ffmpeg.c
+@@ -643,8 +643,6 @@ MOD_init
+ 
+     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
+     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
+-    lavc_venc_context->mb_qmin            = lavc_param_mb_qmin;
+-    lavc_venc_context->mb_qmax            = lavc_param_mb_qmax;
+     lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+     lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
+Index: transcode-1.1.5/import/decode_lavc.c
+===================================================================
+--- transcode-1.1.5.orig/import/decode_lavc.c
++++ transcode-1.1.5/import/decode_lavc.c
+@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode)
+ 
+       //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
+       do {
+-	  len = avcodec_decode_video(lavc_dec_context, &picture,
+-		  &got_picture, buffer+buf_len, mp4_size-buf_len);
++          AVPacket pkt;
++	  av_init_packet( &pkt );
++	  pkt.data = buffer+buf_len;
++	  pkt.size = mp4_size-buf_len;
++	  len = avcodec_decode_video2(lavc_dec_context, &picture,
++		  &got_picture, &pkt);
+ 
+ 	  if (len < 0) {
+ 	      tc_log_error(__FILE__, "frame decoding failed");
+Index: transcode-1.1.5/import/probe_ffmpeg.c
+===================================================================
+--- transcode-1.1.5.orig/import/probe_ffmpeg.c
++++ transcode-1.1.5/import/probe_ffmpeg.c
+@@ -47,7 +47,7 @@ static void translate_info(const AVForma
+     for (i = 0; i < ctx->nb_streams; i++) {
+         st = ctx->streams[i];
+ 
+-        if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
++        if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+             info->bitrate = st->codec->bit_rate / 1000;
+             info->width = st->codec->width;
+             info->height = st->codec->height;
+@@ -65,7 +65,7 @@ static void translate_info(const AVForma
+     for (i = 0; i < ctx->nb_streams; i++) {
+         st = ctx->streams[i];
+ 
+-        if (st->codec->codec_type == CODEC_TYPE_AUDIO
++        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
+          && j < TC_MAX_AUD_TRACKS) {
+             info->track[j].format = 0x1; /* known wrong */
+             info->track[j].chan = st->codec->channels;
+Index: transcode-1.1.5/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.5.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.5/export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@ int lavc_param_vme = 4;
+ //int lavc_param_vqscale = 0;
+ //int lavc_param_vqmin = 2;
+ //int lavc_param_vqmax = 31;
+-int lavc_param_mb_qmin = 2;
+-int lavc_param_mb_qmax = 31;
+ int lavc_param_lmin = 2;
+ int lavc_param_lmax = 31;
+ int lavc_param_vqdiff = 3;
+@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+-    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
+     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+Index: transcode-1.1.5/export/ffmpeg_cfg.h
+===================================================================
+--- transcode-1.1.5.orig/export/ffmpeg_cfg.h
++++ transcode-1.1.5/export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@ extern int lavc_param_vme;
+ //extern int lavc_param_vqscale;
+ //extern int lavc_param_vqmin;
+ //extern int lavc_param_vqmax;
+-extern int lavc_param_mb_qmin;
+-extern int lavc_param_mb_qmax;
+ extern int lavc_param_lmin;
+ extern int lavc_param_lmax;
+ extern int lavc_param_vqdiff;
diff --git a/media-video/transcode/transcode-1.1.5-r2.ebuild b/media-video/transcode/transcode-1.1.5-r2.ebuild
index afb9a4611339..d36237ff0a52 100644
--- a/media-video/transcode/transcode-1.1.5-r2.ebuild
+++ b/media-video/transcode/transcode-1.1.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5-r2.ebuild,v 1.8 2011/03/26 15:55:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5-r2.ebuild,v 1.9 2011/05/17 19:29:07 aballier Exp $
 
 EAPI=2
 
@@ -79,6 +79,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-jpeg-7.patch
 	epatch "${FILESDIR}"/${P}-mpa.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
 
 	eautoreconf
 }