[arch-commits] Commit in transcode/trunk (4 files)
Eric Bélanger
eric at nymeria.archlinux.org
Sat Jul 13 23:08:01 UTC 2013
Date: Sunday, July 14, 2013 @ 01:07:58
Author: eric
Revision: 190064
upgpkg: transcode 1.1.7-10
Rebuild against ffmpeg 2.0 and x264 20130702, Add prepare function
Added:
transcode/trunk/04_ffmpeg_options.patch
transcode/trunk/transcode-1.1.7-libav-9.patch
transcode/trunk/transcode-ffmpeg.patch
Modified:
transcode/trunk/PKGBUILD
-------------------------------+
04_ffmpeg_options.patch | 26 +++++++++
PKGBUILD | 44 +++++++++------
transcode-1.1.7-libav-9.patch | 31 ++++++++++
transcode-ffmpeg.patch | 115 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 200 insertions(+), 16 deletions(-)
Added: 04_ffmpeg_options.patch
===================================================================
--- 04_ffmpeg_options.patch (rev 0)
+++ 04_ffmpeg_options.patch 2013-07-13 23:07:58 UTC (rev 190064)
@@ -0,0 +1,26 @@
+Description: Remove "-vpre medium" from ffmpeg's command-line arguments list.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25
+---
+ export/ffmpeg_cfg.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- transcode.orig/export/ffmpeg_cfg.c
++++ transcode/export/ffmpeg_cfg.c
+@@ -126,7 +126,7 @@ int lavc_param_gmc = 0;
+ //int lavc_param_atag = 0;
+ //int lavc_param_abitrate = 224;
+
+-char *lavc_param_video_preset = "medium";
++char *lavc_param_video_preset = NULL;
+ char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
+
+ TCConfigEntry lavcopts_conf[]={
+@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={
+ {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+ {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+ {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
+- {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0},
+ {NULL, NULL, 0, 0, 0, 0}
+ };
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-13 18:59:27 UTC (rev 190063)
+++ PKGBUILD 2013-07-13 23:07:58 UTC (rev 190064)
@@ -6,29 +6,47 @@
pkgname=transcode
_sripver=0.3-4
pkgver=1.1.7
-pkgrel=9
+pkgrel=10
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')
+ 'libmpeg2' 'libxaw' 'libxv' 'a52dec')
makedepends=('nasm')
options=('!libtool')
source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
- ffmpeg-0.11.patch)
+ ffmpeg-0.11.patch transcode-1.1.7-libav-9.patch 04_ffmpeg_options.patch transcode-ffmpeg.patch)
sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
'591943a33235342a66c3df0625a164a1479c09ae'
- '3d2dcdc23f14938e87d14cfc03000bb3b649b85e')
+ '3d2dcdc23f14938e87d14cfc03000bb3b649b85e'
+ 'ef1cccd35317d3a28443b654da49de731cdf1766'
+ '00938db9aebde719799c11116ed9fe85a9cc4bdd'
+ '6d1774e202cca689c4e417def982452990b8e7e4')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}/ffmpeg-0.11.patch"
+ patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch"
+ patch -p1 -i "${srcdir}/04_ffmpeg_options.patch"
+ patch -p1 -i "${srcdir}/transcode-ffmpeg.patch"
+
+ cd ../subtitleripper
+ patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
+ patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
+ sed -e 's|^\(.*lppm.*\)$|#\1|' \
+ -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+ -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+ -i Makefile
+}
+
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
--disable-sse --disable-sse2 --disable-altivec --enable-mmx \
--enable-lame --enable-ogg --enable-vorbis --enable-theora \
@@ -38,21 +56,15 @@
--enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
make
- cd "${srcdir}/subtitleripper"
- patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
- patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
- sed -e 's|^\(.*lppm.*\)$|#\1|' \
- -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
- -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
- -i Makefile
+ cd ../subtitleripper
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- cd "${srcdir}/subtitleripper"
+ cd ../subtitleripper
install -m 755 pgm2txt "${pkgdir}/usr/bin/"
install -m 755 srttool "${pkgdir}/usr/bin/"
install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
Added: transcode-1.1.7-libav-9.patch
===================================================================
--- transcode-1.1.7-libav-9.patch (rev 0)
+++ transcode-1.1.7-libav-9.patch 2013-07-13 23:07:58 UTC (rev 190064)
@@ -0,0 +1,31 @@
+--- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200
++++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200
+@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
+ return;
+ }
+
+- ret = av_find_stream_info(lavf_dmx_context);
++ ret = avformat_find_stream_info(lavf_dmx_context, NULL);
+ if (ret < 0) {
+ tc_log_error(__FILE__, "unable to fetch informations from '%s'"
+ " (libavformat failure)",
+--- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200
++++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200
+@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
+
+ // Set these to the expected values so that ffmpeg's decoder can
+ // properly detect interlaced input.
+- lavc_dec_context = avcodec_alloc_context();
++ lavc_dec_context = avcodec_alloc_context3(NULL);
+ if (lavc_dec_context == NULL) {
+ tc_log_error(__FILE__, "Could not allocate enough memory.");
+ goto decoder_error;
+@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
+ lavc_dec_context->error_concealment = 3;
+ lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
+
+- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
+ tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
+ codec->name);
+ goto decoder_error;
Added: transcode-ffmpeg.patch
===================================================================
--- transcode-ffmpeg.patch (rev 0)
+++ transcode-ffmpeg.patch 2013-07-13 23:07:58 UTC (rev 190064)
@@ -0,0 +1,115 @@
+diff -Naur transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
+--- transcode-1.1.7-orig/encode/encode_lavc.c 2013-07-13 18:41:25.441796991 -0400
++++ transcode-1.1.7/encode/encode_lavc.c 2013-07-13 18:45:21.042465999 -0400
+@@ -977,8 +977,6 @@
+ pd->ff_vcontext.mpeg_quant = 0;
+ pd->ff_vcontext.rc_initial_cplx = 0.0;
+ pd->ff_vcontext.rc_qsquish = 1.0;
+- pd->ff_vcontext.luma_elim_threshold = 0;
+- pd->ff_vcontext.chroma_elim_threshold = 0;
+ pd->ff_vcontext.strict_std_compliance = 0;
+ pd->ff_vcontext.dct_algo = FF_DCT_AUTO;
+ pd->ff_vcontext.idct_algo = FF_IDCT_AUTO;
+@@ -1150,8 +1148,6 @@
+ { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+ // { "vrc_init_occupancy", }, // not yet supported
+ { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+ { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+ { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
+ { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1182,7 +1178,7 @@
+ { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+
+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 0x04000000 },
+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+diff -Naur transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
+--- transcode-1.1.7-orig/export/export_ffmpeg.c 2013-07-13 18:41:25.438463695 -0400
++++ transcode-1.1.7/export/export_ffmpeg.c 2013-07-13 18:48:46.263478358 -0400
+@@ -835,8 +835,6 @@
+ lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
+ lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
+ lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
+- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
+- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
+ lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ if (lavc_param_packet_size)
+@@ -867,7 +865,6 @@
+ lavc_venc_context->context_model = lavc_param_context;
+ lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+ lavc_venc_context->noise_reduction = lavc_param_noise_reduction;
+- lavc_venc_context->inter_threshold = lavc_param_inter_threshold;
+ lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
+ lavc_venc_context->skip_top = lavc_param_skip_top;
+ lavc_venc_context->skip_bottom = lavc_param_skip_bottom;
+diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
+--- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2013-07-13 18:41:25.438463695 -0400
++++ transcode-1.1.7/export/ffmpeg_cfg.c 2013-07-13 18:48:34.633609112 -0400
+@@ -50,8 +50,6 @@
+ //int lavc_param_vpass = 0;
+ int lavc_param_vrc_strategy = 2;
+ int lavc_param_vb_strategy = 0;
+-int lavc_param_luma_elim_threshold = 0;
+-int lavc_param_chroma_elim_threshold = 0;
+ int lavc_param_packet_size= 0;
+ int lavc_param_strict= 0;
+ int lavc_param_data_partitioning= 0;
+@@ -105,7 +103,6 @@
+ int lavc_param_mv0= 0;
+ int lavc_param_noise_reduction= 0;
+ int lavc_param_qp_rd= 0;
+-int lavc_param_inter_threshold= 0;
+ int lavc_param_sc_threshold= 0;
+ int lavc_param_ss= 0;
+ int lavc_param_top= -1;
+@@ -156,8 +153,6 @@
+ {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+ {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+ {"vb_qoffset", &lavc_param_vb_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+- {"vlelim", &lavc_param_luma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+- {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+ {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+ {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+ // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+@@ -215,13 +210,12 @@
+ {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+ {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 0x04000000},
+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
+ {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 0x08000000},
+ {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
+- {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
+ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
+diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.h transcode-1.1.7/export/ffmpeg_cfg.h
+--- transcode-1.1.7-orig/export/ffmpeg_cfg.h 2013-07-13 18:41:25.438463695 -0400
++++ transcode-1.1.7/export/ffmpeg_cfg.h 2013-07-13 18:49:04.169944470 -0400
+@@ -29,8 +29,6 @@
+ //extern int lavc_param_vpass;
+ extern int lavc_param_vrc_strategy;
+ extern int lavc_param_vb_strategy;
+-extern int lavc_param_luma_elim_threshold;
+-extern int lavc_param_chroma_elim_threshold;
+ extern int lavc_param_packet_size;
+ extern int lavc_param_strict;
+ extern int lavc_param_data_partitioning;
+@@ -84,7 +82,6 @@
+ extern int lavc_param_mv0;
+ extern int lavc_param_noise_reduction;
+ extern int lavc_param_qp_rd;
+-extern int lavc_param_inter_threshold;
+ extern int lavc_param_sc_threshold;
+ extern int lavc_param_ss;
+ extern int lavc_param_top;
More information about the arch-commits
mailing list