[arch-commits] Commit in transcode/repos (7 files)
Eric Bélanger
eric at archlinux.org
Tue Sep 13 21:30:19 UTC 2011
Date: Tuesday, September 13, 2011 @ 17:30:19
Author: eric
Revision: 137996
db-move: moved transcode from [testing] to [extra] (i686)
Added:
transcode/repos/extra-i686/PKGBUILD
(from rev 137983, transcode/repos/testing-i686/PKGBUILD)
transcode/repos/extra-i686/transcode-1.1.5-jpeg-7.patch
(from rev 137983, transcode/repos/testing-i686/transcode-1.1.5-jpeg-7.patch)
transcode/repos/extra-i686/transcode-1.1.5-mpa.patch
(from rev 137983, transcode/repos/testing-i686/transcode-1.1.5-mpa.patch)
Deleted:
transcode/repos/extra-i686/PKGBUILD
transcode/repos/extra-i686/transcode-1.1.5-jpeg-7.patch
transcode/repos/extra-i686/transcode-1.1.5-mpa.patch
transcode/repos/testing-i686/
------------------------------+
PKGBUILD | 156 +++++++++++++++++++++--------------------
transcode-1.1.5-jpeg-7.patch | 32 ++++----
transcode-1.1.5-mpa.patch | 20 ++---
3 files changed, 106 insertions(+), 102 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-13 21:30:18 UTC (rev 137995)
+++ extra-i686/PKGBUILD 2011-09-13 21:30:19 UTC (rev 137996)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: roberto <roberto at archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.5
-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'
- '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
- 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 \
- --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/"
-}
Copied: transcode/repos/extra-i686/PKGBUILD (from rev 137983, transcode/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-13 21:30:19 UTC (rev 137996)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer:
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: roberto <roberto at archlinux.org>
+
+pkgname=transcode
+_sripver=0.3-4
+pkgver=1.1.5
+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=('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)
+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 \
+ --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/"
+}
Deleted: extra-i686/transcode-1.1.5-jpeg-7.patch
===================================================================
--- extra-i686/transcode-1.1.5-jpeg-7.patch 2011-09-13 21:30:18 UTC (rev 137995)
+++ extra-i686/transcode-1.1.5-jpeg-7.patch 2011-09-13 21:30:19 UTC (rev 137996)
@@ -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;
Copied: transcode/repos/extra-i686/transcode-1.1.5-jpeg-7.patch (from rev 137983, transcode/repos/testing-i686/transcode-1.1.5-jpeg-7.patch)
===================================================================
--- extra-i686/transcode-1.1.5-jpeg-7.patch (rev 0)
+++ extra-i686/transcode-1.1.5-jpeg-7.patch 2011-09-13 21:30:19 UTC (rev 137996)
@@ -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;
Deleted: extra-i686/transcode-1.1.5-mpa.patch
===================================================================
--- extra-i686/transcode-1.1.5-mpa.patch 2011-09-13 21:30:18 UTC (rev 137995)
+++ extra-i686/transcode-1.1.5-mpa.patch 2011-09-13 21:30:19 UTC (rev 137996)
@@ -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;
Copied: transcode/repos/extra-i686/transcode-1.1.5-mpa.patch (from rev 137983, transcode/repos/testing-i686/transcode-1.1.5-mpa.patch)
===================================================================
--- extra-i686/transcode-1.1.5-mpa.patch (rev 0)
+++ extra-i686/transcode-1.1.5-mpa.patch 2011-09-13 21:30:19 UTC (rev 137996)
@@ -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;
More information about the arch-commits
mailing list