diff options
Diffstat (limited to 'testing/transcode')
-rw-r--r-- | testing/transcode/PKGBUILD | 61 | ||||
-rw-r--r-- | testing/transcode/ffmpeg-0.11.patch | 141 | ||||
-rw-r--r-- | testing/transcode/subtitleripper-0.3.4-linkingorder.patch | 28 | ||||
-rw-r--r-- | testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch | 28 |
4 files changed, 0 insertions, 258 deletions
diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD deleted file mode 100644 index 7fb798ef7..000000000 --- a/testing/transcode/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 169649 2012-10-25 01:35:43Z eric $ -# Maintainer: -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: roberto <roberto@archlinux.org> - -pkgname=transcode -_sripver=0.3-4 -pkgver=1.1.7 -pkgrel=6 -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') -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) -sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' - 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae' - '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" - ./configure --prefix=/usr \ - --disable-sse --disable-sse2 --disable-altivec --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 - 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 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/subtitleripper" - 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/testing/transcode/ffmpeg-0.11.patch b/testing/transcode/ffmpeg-0.11.patch deleted file mode 100644 index b5601fe2f..000000000 --- a/testing/transcode/ffmpeg-0.11.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c ---- transcode-1.1.7/export/export_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/export_ffmpeg.c 2012-07-05 16:22:41.095346080 -0400 -@@ -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 +673,6 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c ---- transcode-1.1.7/export/ffmpeg_cfg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/ffmpeg_cfg.c 2012-07-05 15:26:29.112103273 -0400 -@@ -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 +211,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 +223,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 -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c ---- transcode-1.1.7/filter/filter_pp.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/filter/filter_pp.c 2012-07-05 15:26:28.945436613 -0400 -@@ -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 -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c ---- transcode-1.1.7/import/decode_lavc.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/decode_lavc.c 2012-07-05 15:26:28.842103278 -0400 -@@ -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 -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c ---- transcode-1.1.7/import/import_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/import_ffmpeg.c 2012-07-05 15:26:28.848769946 -0400 -@@ -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 -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c ---- transcode-1.1.7/import/probe_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/probe_ffmpeg.c 2012-07-05 15:26:28.838769947 -0400 -@@ -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 -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h ---- transcode-1.1.7/libtc/tcavcodec.h 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/libtc/tcavcodec.h 2012-07-05 15:26:28.828769951 -0400 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) ---- transcode-1.1.7/export/export_ffmpeg.c.orig 2012-10-19 23:25:16.442303175 -0400 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-10-19 23:26:23.904268733 -0400 -@@ -1249,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 --git a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch b/testing/transcode/subtitleripper-0.3.4-linkingorder.patch deleted file mode 100644 index 7efe22346..000000000 --- a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch deleted file mode 100644 index 2af11d257..000000000 --- a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: |