Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=187e8ae4a2d014783a25c8999a9e375e4435e93a
commit 187e8ae4a2d014783a25c8999a9e375e4435e93a Author: James Buren <[email protected]> Date: Sun Oct 28 14:37:39 2012 -0500 transcode-1.1.7-1-x86_64 * version bump * remove old patch * import patch to fix FFMPEG compiling diff --git a/source/xapps-extra/transcode/FrugalBuild b/source/xapps-extra/transcode/FrugalBuild index 266d19c..076aa4d 100644 --- a/source/xapps-extra/transcode/FrugalBuild +++ b/source/xapps-extra/transcode/FrugalBuild @@ -4,22 +4,24 @@ pkgname=transcode _F_berlios_ext=".tar.bz2" _F_berlios_dirname="tcforge" -pkgver=1.1.5 -pkgrel=10 +pkgver=1.1.7 +pkgrel=1 Finclude berlios pkgdesc="A suite of command line utilities for transcoding various video, audio, and container formats." url="http://tcforge.berlios.de/"; -depends=('mjpegtools>=1.9.0-3' 'mpeg2dec>=0.4.1' 'imagemagick>=6.7.9_2-1' 'ffmpeg-0.6>=0.6.3-3' 'libdvdread>=4.1.3' 'libxv' 'libtheora' 'libfame' 'libraw1394>=2.0.4' 'x264>=20120904') -makedepends=('ffmpeg-0.6-compiletime') +depends=('mjpegtools>=1.9.0-3' 'mpeg2dec>=0.4.1' 'imagemagick>=6.7.9_2-1' 'ffmpeg>=1.0' 'libdvdread>=4.1.3' 'libxv' 'libtheora' 'libfame' 'libraw1394>=2.0.4' 'x264>=20120904') groups=('xapps-extra') archs=('i686' 'x86_64') license="GPL" options=('scriptlet') -sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26') +source=(https://bitbucket.org/france/transcode-tcforge/downloads/$pkgname-$pkgver.tar.bz2 ffmpeg.patch) +sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' \ + '4fecdf2c241b480851653e863484eface7068a09') build() { Fcd + Fpatchall Fautoreconf Fconf \ --enable-netstream \ diff --git a/source/xapps-extra/transcode/ffmpeg.diff b/source/xapps-extra/transcode/ffmpeg.diff deleted file mode 100644 index 8f695b7..0000000 --- a/source/xapps-extra/transcode/ffmpeg.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -aur transcode-1.0.5/filter/pp/filter_pp.c fw_transcode-1.0.5/filter/pp/filter_pp.c ---- transcode-1.0.5/filter/pp/filter_pp.c 2005-07-04 09:23:01.000000000 +0200 -+++ fw_transcode-1.0.5/filter/pp/filter_pp.c 2008-04-29 03:32:02.000000000 +0200 -@@ -35,7 +35,7 @@ - #include <ctype.h> - #include <inttypes.h> - --#include "postprocess.h" -+#include <libpostproc/postprocess.h> - - static pp_mode_t *mode[MAX_FILTER]; - static pp_context_t *context[MAX_FILTER]; - diff --git a/source/xapps-extra/transcode/ffmpeg.patch b/source/xapps-extra/transcode/ffmpeg.patch new file mode 100644 index 0000000..c33d8e2 --- /dev/null +++ b/source/xapps-extra/transcode/ffmpeg.patch @@ -0,0 +1,139 @@ +diff -ur a/export/export_ffmpeg.c b/export/export_ffmpeg.c +--- a/export/export_ffmpeg.c 2012-10-28 14:31:43.889475106 -0500 ++++ b/export/export_ffmpeg.c 2012-10-28 14:31:53.926481159 -0500 +@@ -180,7 +180,7 @@ + + + /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ +-#include <libavcodec/opt.h> ++#include <libavutil/opt.h> + #include <libavutil/avstring.h> + #include <libswscale/swscale.h> + +@@ -470,7 +470,6 @@ + } + + TC_LOCK_LIBAVCODEC; +- avcodec_init(); + avcodec_register_all(); + TC_UNLOCK_LIBAVCODEC; + +@@ -634,7 +633,6 @@ + lavc_param_rc_max_rate = 2516; + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; + + break; + +@@ -674,7 +672,6 @@ + + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; + + break; + +@@ -1252,7 +1249,7 @@ + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (lavc_venc_context->codec->encode2 == NULL) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " + "(lavc_venc_context->codec->encode == NULL)"); + return TC_EXPORT_ERROR; +diff -ur a/export/ffmpeg_cfg.c b/export/ffmpeg_cfg.c +--- a/export/ffmpeg_cfg.c 2012-10-28 14:31:43.888475105 -0500 ++++ b/export/ffmpeg_cfg.c 2012-10-28 14:32:17.386494685 -0500 +@@ -160,9 +160,7 @@ + {"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}, +- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -211,7 +209,6 @@ + #else + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, + #endif +- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -223,9 +220,6 @@ + {"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}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, +- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, +- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, +- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, + {"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}, +diff -ur a/filter/filter_pp.c b/filter/filter_pp.c +--- a/filter/filter_pp.c 2012-10-28 14:31:43.882475099 -0500 ++++ b/filter/filter_pp.c 2012-10-28 14:31:53.925481158 -0500 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + +diff -ur a/import/decode_lavc.c b/import/decode_lavc.c +--- a/import/decode_lavc.c 2012-10-28 14:31:43.874475091 -0500 ++++ b/import/decode_lavc.c 2012-10-28 14:31:53.925481158 -0500 +@@ -181,7 +181,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +diff -ur a/import/import_ffmpeg.c b/import/import_ffmpeg.c +--- a/import/import_ffmpeg.c 2012-10-28 14:31:43.877475094 -0500 ++++ b/import/import_ffmpeg.c 2012-10-28 14:31:53.925481158 -0500 +@@ -314,7 +314,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +diff -ur a/import/probe_ffmpeg.c b/import/probe_ffmpeg.c +--- a/import/probe_ffmpeg.c 2012-10-28 14:31:43.877475094 -0500 ++++ b/import/probe_ffmpeg.c 2012-10-28 14:31:53.926481159 -0500 +@@ -99,8 +99,8 @@ + + TC_INIT_LIBAVCODEC; + +- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, +- NULL, 0, NULL); ++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, ++ NULL, NULL); + if (ret != 0) { + tc_log_error(__FILE__, "unable to open '%s'" + " (libavformat failure)", +diff -ur a/libtc/tcavcodec.h b/libtc/tcavcodec.h +--- a/libtc/tcavcodec.h 2012-10-28 14:31:43.865475082 -0500 ++++ b/libtc/tcavcodec.h 2012-10-28 14:31:53.926481159 -0500 +@@ -53,7 +53,6 @@ + + #define TC_INIT_LIBAVCODEC do { \ + TC_LOCK_LIBAVCODEC; \ +- avcodec_init(); \ + avcodec_register_all(); \ + TC_UNLOCK_LIBAVCODEC; \ + } while (0) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
