From 28b13b7e8e6e1e4fa1593f0dfb1c37569f2f90a8 Mon Sep 17 00:00:00 2001 From: Parabola Date: Tue, 15 Nov 2011 14:34:01 +0000 Subject: Tue Nov 15 14:33:58 UTC 2011 --- staging/transcode/PKGBUILD | 78 ---------------- staging/transcode/transcode-1.1.5-ffmpeg.patch | 124 ------------------------- staging/transcode/transcode-1.1.5-jpeg-7.patch | 16 ---- staging/transcode/transcode-1.1.5-mpa.patch | 10 -- 4 files changed, 228 deletions(-) delete mode 100644 staging/transcode/PKGBUILD delete mode 100644 staging/transcode/transcode-1.1.5-ffmpeg.patch delete mode 100644 staging/transcode/transcode-1.1.5-jpeg-7.patch delete mode 100644 staging/transcode/transcode-1.1.5-mpa.patch (limited to 'staging/transcode') diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD deleted file mode 100644 index fd99a559d..000000000 --- a/staging/transcode/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: PKGBUILD 141640 2011-11-01 05:00:23Z eric $ -# Maintainer: -# Contributor: Sarah Hay -# Contributor: roberto - -pkgname=transcode -_sripver=0.3-4 -pkgver=1.1.5 -pkgrel=7 -pkgdesc="A video/DVD ripper and encoder for the terminal/console" -arch=('i686' 'x86_64') -url="http://tcforge.berlios.de/" -license=('GPL') -depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') -makedepends=('nasm') -options=('!libtool' '!makeflags') -source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch) -sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' - 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' - '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2' - '2d3bb4486394ee55540e772f134e193874e5c2b4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../transcode-1.1.5-jpeg-7.patch - patch -p1 < ../transcode-1.1.5-mpa.patch - patch -p1 < ../transcode-1.1.5-ffmpeg.patch - - # building from here - ./configure --prefix=/usr \ - --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ - --enable-lame --enable-ogg --enable-vorbis --enable-theora \ - --enable-libdv --enable-libxml2 --enable-v4l \ - --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ - --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ - --enable-xvid --enable-x264 --enable-alsa \ - --enable-libmpeg2 --enable-libmpeg2convert \ - --with-libxml2-prefix=/usr \ - --with-mjpegtools-prefix=/usr \ - --with-imagemagick-prefix=/usr \ - --with-libdv-includes=/usr \ - --with-libpostproc-includes=/usr/include/libpostproc \ - --with-ogg-prefix=/usr \ - --with-lame-libs=/usr \ - --with-lzo-libs=/usr/lib \ - --with-libavcodec-prefix=/usr \ - --with-libavcodec-includes=/usr/include \ - --with-libavcodec-libs=/usr/lib - - make - ############################################################################## - # this imports the latest subtitleripper sources and replaces the internal - mkdir contrib - mv "${srcdir}/subtitleripper" contrib/subrip - # removes dependency on libppm, make it dependend on netpbm just failed, argh... - cd contrib/subrip - sed -e 's|^\(.*lppm.*\)$|#\1|' \ - -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - cd contrib/subrip - install -m 755 pgm2txt "${pkgdir}/usr/bin/" - install -m 755 srttool "${pkgdir}/usr/bin/" - install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" - install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/" - install -m 755 vobsub2pgm "${pkgdir}/usr/bin/" -} diff --git a/staging/transcode/transcode-1.1.5-ffmpeg.patch b/staging/transcode/transcode-1.1.5-ffmpeg.patch deleted file mode 100644 index 86e8272e9..000000000 --- a/staging/transcode/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/staging/transcode/transcode-1.1.5-jpeg-7.patch b/staging/transcode/transcode-1.1.5-jpeg-7.patch deleted file mode 100644 index 288932a61..000000000 --- a/staging/transcode/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/staging/transcode/transcode-1.1.5-mpa.patch b/staging/transcode/transcode-1.1.5-mpa.patch deleted file mode 100644 index e7fb0fc1c..000000000 --- a/staging/transcode/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; -- cgit v1.2.3-54-g00ecf