punt unused files, leftovers...

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

6 files changed, 7 insertions, 213 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index ca7ad16f7095..a1edf53493c8 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.303 2012/07/05 15:12:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.304 2012/09/06 05:02:42 ssuominen Exp $
+
+  06 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/transcode-1.0.6-imagemagick.patch, -files/transcode-1.1.4-x264.patch,
+  -files/transcode-1.1.5-ffmpeg.patch, -files/transcode-1.1.5-jpeg-7.patch,
+  -files/transcode-1.1.5-mpa.patch:
+  old
 
   05 Jul 2012; Alexis Ballier <aballier@gentoo.org> +transcode-1.1.7-r1.ebuild,
   +files/transcode-1.1.7-ffmpeg-0.11.patch,
diff --git a/media-video/transcode/files/transcode-1.0.6-imagemagick.patch b/media-video/transcode/files/transcode-1.0.6-imagemagick.patch
deleted file mode 100644
index 3e0c0198afa9..000000000000
--- a/media-video/transcode/files/transcode-1.0.6-imagemagick.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: transcode-1.0.6/configure.in
-===================================================================
---- transcode-1.0.6.orig/configure.in
-+++ transcode-1.0.6/configure.in
-@@ -1247,7 +1247,7 @@ dnl
- IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS -lz -lm"
- dnl MagickWand libraries/headers always (?) are a superset of MagickCore ones.
- TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, Wand-config, [magick/api.h],
-- Magick, InitializeMagick, Wand, [http://www.imagemagick.org/])
-+ MagickWand, InitializeMagick, Wand, [http://www.imagemagick.org/])
- TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
- if test x"$have_imagemagick" = x"yes" ; then
-   AC_CHECK_HEADER([wand/magick-wand.h],
diff --git a/media-video/transcode/files/transcode-1.1.4-x264.patch b/media-video/transcode/files/transcode-1.1.4-x264.patch
deleted file mode 100644
index 133f70788c40..000000000000
--- a/media-video/transcode/files/transcode-1.1.4-x264.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream status: Mailed to Francesco on 26/10/2009
-
-Index: transcode-1.1.4/encode/encode_x264.c
-===================================================================
---- transcode-1.1.4.orig/encode/encode_x264.c
-+++ transcode-1.1.4/encode/encode_x264.c
-@@ -166,7 +166,11 @@ static TCConfigEntry conf[] ={
-     /* How often B-frames are used */
-     OPT_RANGE(i_bframe_bias,              "b_bias",       -90,   100)
-     /* Keep some B-frames as references */
-+#if X264_BUILD >= 78
-+    OPT_RANGE(i_bframe_pyramid,           "b_pyramid",      0,     2)
-+#else
-     OPT_FLAG (b_bframe_pyramid,           "b_pyramid")
-+#endif
- 
-     /* Use deblocking filter */
-     OPT_FLAG (b_deblocking_filter,        "deblock")
-@@ -949,7 +953,11 @@ static int x264_encode_video(TCModuleIns
-      * done? */
-     pic.i_pts = (int64_t) pd->framenum * pd->x264params.i_fps_den;
- 
-+#if X264_BUILD >= 76
-+    if (x264_encoder_encode(pd->enc, &nal, &nnal, &pic, &pic_out) < 0) {
-+#else
-     if (x264_encoder_encode(pd->enc, &nal, &nnal, &pic, &pic_out) != 0) {
-+#endif
-         return TC_ERROR;
-     }
- 
-@@ -962,6 +970,10 @@ static int x264_encode_video(TCModuleIns
-             tc_log_error(MOD_NAME, "output buffer overflow");
-             return TC_ERROR;
-         }
-+#if X264_BUILD >= 76
-+	memcpy(outframe->video_buf + outframe->video_len, nal[i].p_payload, nal[i].i_payload); 
-+	outframe->video_len += nal[i].i_payload;
-+#else
-         ret = x264_nal_encode(outframe->video_buf + outframe->video_len,
-                               &size, 1, &nal[i]);
-         if (ret < 0 || size > outframe->video_size - outframe->video_len) {
-@@ -969,6 +981,7 @@ static int x264_encode_video(TCModuleIns
-             break;
-         }
-         outframe->video_len += size;
-+#endif
-     }
- 
-     /* FIXME: ok, that sucks. How to reformat it ina better way? -- fromani */
diff --git a/media-video/transcode/files/transcode-1.1.5-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.5-ffmpeg.patch
deleted file mode 100644
index 86e8272e9d69..000000000000
--- a/media-video/transcode/files/transcode-1.1.5-ffmpeg.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-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/files/transcode-1.1.5-jpeg-7.patch b/media-video/transcode/files/transcode-1.1.5-jpeg-7.patch
deleted file mode 100644
index 288932a6159c..000000000000
--- a/media-video/transcode/files/transcode-1.1.5-jpeg-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=294488
-
-Patch by: Salah Coronya
-
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
---- export/export_jpg.c
-+++ export/export_jpg.c
-@@ -91,6 +91,7 @@
- 
-   jpeg_set_quality(&encinfo, quality, TRUE);
-   encinfo.raw_data_in = TRUE;
-+  encinfo.do_fancy_downsampling = FALSE;
-   encinfo.in_color_space = JCS_YCbCr;
- 
-   encinfo.comp_info[0].h_samp_factor = 2;
diff --git a/media-video/transcode/files/transcode-1.1.5-mpa.patch b/media-video/transcode/files/transcode-1.1.5-mpa.patch
deleted file mode 100644
index e7fb0fc1c2ef..000000000000
--- a/media-video/transcode/files/transcode-1.1.5-mpa.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- transcode-1.1.5-old/export/aud_aux.c	2010-07-04 12:44:31.867550180 -0500
-+++ transcode-1.1.5/export/aud_aux.c	2010-07-04 13:41:01.253292529 -0500
-@@ -347,6 +347,7 @@
-     //-- 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.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;