[arch-commits] Commit in transcode/trunk (3 files)
Date: Wednesday, February 17, 2016 @ 01:05:59
Author: arojas
Revision: 259868
ffmpeg 3.0 rebuild
Added:
transcode/trunk/transcode-1.1.7-ffmpeg29.patch
transcode/trunk/transcode-ffmpeg3.patch
Modified:
transcode/trunk/PKGBUILD
+
PKGBUILD | 14 +
transcode-1.1.7-ffmpeg29.patch | 352 +++
transcode-ffmpeg3.patch| 213 +++
3 files changed, 575 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-16 23:53:38 UTC (rev 259867)
+++ PKGBUILD2016-02-17 00:05:59 UTC (rev 259868)
@@ -6,7 +6,7 @@
pkgname=transcode
_sripver=0.3-4
pkgver=1.1.7
-pkgrel=18
+pkgrel=19
pkgdesc="A video/DVD ripper and encoder for the terminal/console"
arch=('i686' 'x86_64')
url="http://www.transcoding.org/;
@@ -25,7 +25,9 @@
transcode-1.1.7-libav-9.patch
transcode-1.1.7-preset-force.patch
transcode-1.1.7-ffmpeg2.patch
-transcode-1.1.7-ffmpeg-2.4.patch)
+transcode-1.1.7-ffmpeg-2.4.patch
+ transcode-1.1.7-ffmpeg29.patch
+ transcode-ffmpeg3.patch)
sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
@@ -37,7 +39,9 @@
'ef1cccd35317d3a28443b654da49de731cdf1766'
'034853427bc784a80b333d2e2f4bab44f0b86ce0'
'764de67996e2c4947346c7a91586cc4ca826a8e2'
- 'b590dfc30cdc4bc2a6825de247928b46a8928a9a')
+ 'b590dfc30cdc4bc2a6825de247928b46a8928a9a'
+ '0e8769c1e8ec9f0ed87266c404ba13560db3578d'
+ '6aefa6a13fa70f8cc92ed03dd5383a4adcd4a6d0')
prepare() {
cd ${pkgname}-${pkgver}
@@ -49,7 +53,9 @@
patch -p1 -i "${srcdir}/transcode-1.1.7-preset-force.patch"
patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg2.patch"
patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg-2.4.patch"
- sed -i 's|freetype/ftglyph.h|freetype2/ftglyph.h|'
filter/subtitler/load_font.c
+ patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg29.patch"
+ patch -p1 -i "${srcdir}/transcode-ffmpeg3.patch"
+ sed -i 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|'
filter/subtitler/load_font.c
cd ../subtitleripper
patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
Added: transcode-1.1.7-ffmpeg29.patch
===
--- transcode-1.1.7-ffmpeg29.patch (rev 0)
+++ transcode-1.1.7-ffmpeg29.patch 2016-02-17 00:05:59 UTC (rev 259868)
@@ -0,0 +1,352 @@
+Index: transcode-1.1.7/encode/encode_lavc.c
+===
+--- transcode-1.1.7.orig/encode/encode_lavc.c
transcode-1.1.7/encode/encode_lavc.c
+@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
+ vframe_list_t *vframe)
+ {
+ avpicture_fill((AVPicture *)>ff_venc_frame, vframe->video_buf,
+-PIX_FMT_YUV420P,
++AV_PIX_FMT_YUV420P,
+ pd->ff_vcontext.width, pd->ff_vcontext.height);
+ }
+
+@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
+ IMG_YUV_DEFAULT,
+ pd->ff_vcontext.width, pd->ff_vcontext.height);
+ avpicture_fill((AVPicture *)>ff_venc_frame, pd->vframe_buf->video_buf,
+- PIX_FMT_YUV422P,
++ AV_PIX_FMT_YUV422P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ ac_imgconvert(src, IMG_YUV_DEFAULT,
+ pd->ff_venc_frame.data, IMG_YUV422P,
+@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
+ IMG_YUV422P,
+ pd->ff_vcontext.width, pd->ff_vcontext.height);
+ avpicture_fill((AVPicture *)>ff_venc_frame, pd->vframe_buf->video_buf,
+- PIX_FMT_YUV420P,
++ AV_PIX_FMT_YUV420P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ ac_imgconvert(src, IMG_YUV422P,
+ pd->ff_venc_frame.data, IMG_YUV420P,
+@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
+ vframe_list_t *vframe)
+ {
+ avpicture_fill((AVPicture *)>ff_venc_frame, vframe->video_buf,
+- PIX_FMT_YUV422P,
++ AV_PIX_FMT_YUV422P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+
+ }
+@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
+vframe_list_t *vframe)
+ {
+ avpicture_fill((AVPicture *)>ff_venc_frame, pd->vframe_buf->video_buf,
+- PIX_FMT_YUV420P,
++ AV_PIX_FMT_YUV420P,
+pd->ff_vcontext.width, pd->ff_vcontext.height);
+ ac_imgconvert(>video_buf, IMG_RGB_DEFAULT,
+
[arch-commits] Commit in transcode/trunk (3 files)
Date: Friday, July 6, 2012 @ 01:55:49
Author: eric
Revision: 163030
upgpkg: transcode 1.1.7-5
Rebuild against ffmpeg 0.11
Added:
transcode/trunk/ffmpeg-0.11.patch
Modified:
transcode/trunk/PKGBUILD
Deleted:
transcode/trunk/ffmpeg-0.10.patch
---+
PKGBUILD |8 +--
ffmpeg-0.10.patch | 14 -
ffmpeg-0.11.patch | 130
3 files changed, 134 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-06 02:47:50 UTC (rev 163029)
+++ PKGBUILD2012-07-06 05:55:49 UTC (rev 163030)
@@ -6,7 +6,7 @@
pkgname=transcode
_sripver=0.3-4
pkgver=1.1.7
-pkgrel=4
+pkgrel=5
pkgdesc=A video/DVD ripper and encoder for the terminal/console
arch=('i686' 'x86_64')
url=http://tcforge.berlios.de/;
@@ -18,17 +18,17 @@
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.10.patch)
+ffmpeg-0.11.patch)
sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
'591943a33235342a66c3df0625a164a1479c09ae'
- '3c03111cfae88db918afff3837cec7db32ace3cc')
+ '765dacce5ee463adf5c124556d68bb873ef436c6')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/ffmpeg-0.10.patch
+ 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 \
Deleted: ffmpeg-0.10.patch
===
--- ffmpeg-0.10.patch 2012-07-06 02:47:50 UTC (rev 163029)
+++ ffmpeg-0.10.patch 2012-07-06 05:55:49 UTC (rev 163030)
@@ -1,14 +0,0 @@
-diff -Nur transcode-1.1.7.orig/filter/filter_pp.c
transcode-1.1.7/filter/filter_pp.c
transcode-1.1.7.orig/filter/filter_pp.c2012-01-27 19:55:13.706613234
+
-+++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +
-@@ -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];
-
Added: ffmpeg-0.11.patch
===
--- ffmpeg-0.11.patch (rev 0)
+++ ffmpeg-0.11.patch 2012-07-06 05:55:49 UTC (rev 163030)
@@ -0,0 +1,130 @@
+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.0
-0500
fixed-tc/export/export_ffmpeg.c2012-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.c2011-11-19 11:50:27.0
-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, 1},
+ {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
[arch-commits] Commit in transcode/trunk (3 files)
Date: Thursday, September 23, 2010 @ 23:35:03
Author: eric
Revision: 91207
upgpkg: transcode 1.1.5-5
Fixed mpa codec (close FS#20587), Fixed jpeg segmentation fault
Added:
transcode/trunk/transcode-1.1.5-jpeg-7.patch
transcode/trunk/transcode-1.1.5-mpa.patch
Modified:
transcode/trunk/PKGBUILD
--+
PKGBUILD | 19 ---
transcode-1.1.5-jpeg-7.patch | 16
transcode-1.1.5-mpa.patch| 10 ++
3 files changed, 38 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-09-24 01:59:31 UTC (rev 91206)
+++ PKGBUILD2010-09-24 03:35:03 UTC (rev 91207)
@@ -6,23 +6,28 @@
pkgname=transcode
_sripver=0.3-4
pkgver=1.1.5
-pkgrel=4
-pkgdesc=A video/DVD ripper and encoder for the terminal/console.
+pkgrel=5
+pkgdesc=A video/DVD ripper and encoder for the terminal/console
arch=('i686' 'x86_64')
url=http://tcforge.berlios.de/;
license=('GPL')
depends=('imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools'
- 'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264' 'libxml2'
- 'libxv' 'a52dec' 'alsa-lib')
+'libmpeg2' 'libtheora' 'libxaw' 'libxml2' 'libxv' 'a52dec' 'alsa-lib')
makedepends=('nasm' 'pkg-config')
options=('!libtool' '!makeflags')
source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
-
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
-md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' 'c0bd49a88f667c68c4430ad25bbed510')
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d')
+
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
+ transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch)
+md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' 'c0bd49a88f667c68c4430ad25bbed510'\
+ 'af4056b7530a6f147594f676849e7c7b' 'c299cfc6c4be6a5512d1a129f04e5450')
+sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26'
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'\
+ '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977'
'6f45d9167c3aa15a83cb29545749f55eb1f1e5a2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 ../transcode-1.1.5-jpeg-7.patch
+ patch -p1 ../transcode-1.1.5-mpa.patch
+
# building from here
./configure --prefix=/usr \
--enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \
Added: transcode-1.1.5-jpeg-7.patch
===
--- transcode-1.1.5-jpeg-7.patch(rev 0)
+++ transcode-1.1.5-jpeg-7.patch2010-09-24 03:35:03 UTC (rev 91207)
@@ -0,0 +1,16 @@
+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;
Added: transcode-1.1.5-mpa.patch
===
--- transcode-1.1.5-mpa.patch (rev 0)
+++ transcode-1.1.5-mpa.patch 2010-09-24 03:35:03 UTC (rev 91207)
@@ -0,0 +1,10 @@
+--- 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;
