summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hanson <hansonorders@verizon.net>2010-11-10 21:01:26 (GMT)
committerMichael Hanson <hansonorders@verizon.net>2010-11-10 21:01:26 (GMT)
commit18868a76d89f89e10f95a3d3e225608a83bf97af (patch)
tree6f9844abdd654657d93ff8380d13beceea0fbf81
parent36fa3d903b16f4b4a4c6ff117e0ac65957da44b1 (diff)
downloadlinhes_pkgbuild-18868a76d89f89e10f95a3d3e225608a83bf97af.zip
linhes_pkgbuild-18868a76d89f89e10f95a3d3e225608a83bf97af.tar.gz
linhes_pkgbuild-18868a76d89f89e10f95a3d3e225608a83bf97af.tar.bz2
transcode: recompile due to new ffmpeg & imagemagick
-rw-r--r--abs/core/transcode/PKGBUILD87
-rw-r--r--abs/core/transcode/transcode-1.1.5-jpeg-7.patch16
-rw-r--r--abs/core/transcode/transcode-1.1.5-mpa.patch10
3 files changed, 74 insertions, 39 deletions
diff --git a/abs/core/transcode/PKGBUILD b/abs/core/transcode/PKGBUILD
index 4535bce..92f2348 100644
--- a/abs/core/transcode/PKGBUILD
+++ b/abs/core/transcode/PKGBUILD
@@ -1,39 +1,42 @@
-# $Id: PKGBUILD 26150 2009-02-03 03:22:44Z eric $
+# $Id: PKGBUILD 91207 2010-09-24 03:35:03Z eric $
+# Maintainer:
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Maintainer: roberto <roberto@archlinux.org>
+# Contributor: roberto <roberto@archlinux.org>
pkgname=transcode
_sripver=0.3-4
-pkgver=1.1.0
-pkgrel=6
-pkgdesc="Transcode is a video/DVD ripper and encoder for the terminal/console."
-arch=(i686 x86_64)
-license=('GPL2')
-depends=('imagemagick>=6.4.8.10' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg>=20081220' 'mjpegtools' \
- 'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264>=20090108' 'libxml2' \
- 'libxv' 'a52dec')
-makedepends=('nasm')
-install=transcode.install
-url="http://transcoding.org"
-options=(!libtool !makeflags)
-source=(http://fromani.exit1.org/${pkgname}-${pkgver}.tar.bz2 \
- http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
-md5sums=('5ca205e32b546402a48ea8004a7b3232' 'c0bd49a88f667c68c4430ad25bbed510')
+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=6.6.5.7' '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 $startdir/src/$pkgname-$pkgver
- sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' import/{import_ffmpeg.c,decode_lavc.c} || return 1
- sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' export/{aud_aux.c,export_ffmpeg.c,ffmpeg_cfg.h} || return 1
- sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' filter/filter_resample.c || return 1
- autoconf || return 1
+ 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-deprecated \
+ ./configure --prefix=/usr \
--enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \
- --enable-avifile=no --enable-lame --enable-ogg --enable-vorbis --enable-theora \
- --enable-libdv --enable-a52-default-decoder --enable-libxml2 --enable-v4l \
+ --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 \
@@ -45,23 +48,29 @@ build() {
--with-libavcodec-prefix=/usr \
--with-libavcodec-includes=/usr/include \
--with-libavcodec-libs=/usr/lib
- make || return 1
- make DESTDIR=$startdir/pkg install
+
+ make
##############################################################################
# this imports the latest subtitleripper sources and replaces the internal
-### rm -rf $startdir/src/$pkgname-$pkgver/contrib/subrip
- mkdir $startdir/src/$pkgname-$pkgver/contrib
- tar xzf ../subtitleripper-$_sripver.tgz -C $startdir/src/$pkgname-$pkgver/contrib
- mv $startdir/src/$pkgname-$pkgver/contrib/subtitleripper \
- $startdir/src/$pkgname-$pkgver/contrib/subrip
+ mkdir contrib
+ mv "${srcdir}/subtitleripper" contrib/subrip
# removes dependency on libppm, make it dependend on netpbm just failed, argh...
- sed -i 's|^\(.*lppm.*\)$|#\1|' contrib/subrip/Makefile
- sed -i 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' contrib/subrip/Makefile
cd contrib/subrip
+ sed -e 's|^\(.*lppm.*\)$|#\1|' \
+ -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+ -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+ -i Makefile
make
- install -m 755 pgm2txt $startdir/pkg/usr/bin/
- install -m 755 srttool $startdir/pkg/usr/bin/
- install -m 755 subtitle2pgm $startdir/pkg/usr/bin/
- install -m 755 subtitle2vobsub $startdir/pkg/usr/bin/
- install -m 755 vobsub2pgm $startdir/pkg/usr/bin/
+}
+
+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/"
}
diff --git a/abs/core/transcode/transcode-1.1.5-jpeg-7.patch b/abs/core/transcode/transcode-1.1.5-jpeg-7.patch
new file mode 100644
index 0000000..288932a
--- /dev/null
+++ b/abs/core/transcode/transcode-1.1.5-jpeg-7.patch
@@ -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;
diff --git a/abs/core/transcode/transcode-1.1.5-mpa.patch b/abs/core/transcode/transcode-1.1.5-mpa.patch
new file mode 100644
index 0000000..e7fb0fc
--- /dev/null
+++ b/abs/core/transcode/transcode-1.1.5-mpa.patch
@@ -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;