From 9bf541b67d138b347a43b92c2042fd10e0a44a75 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sun, 8 Feb 2009 01:21:44 -0800 Subject: Moved transcode to proper location (extra). --- abs/core-testing/transcode/PKGBUILD | 68 --------------------------- abs/core-testing/transcode/transcode.install | 6 --- abs/extra-testing/transcode/PKGBUILD | 19 ++++---- abs/extra-testing/transcode/imagemagick.patch | 41 ---------------- abs/extra-testing/transcode/transcode.install | 17 ------- 5 files changed, 11 insertions(+), 140 deletions(-) delete mode 100644 abs/core-testing/transcode/PKGBUILD delete mode 100644 abs/core-testing/transcode/transcode.install delete mode 100644 abs/extra-testing/transcode/imagemagick.patch diff --git a/abs/core-testing/transcode/PKGBUILD b/abs/core-testing/transcode/PKGBUILD deleted file mode 100644 index 89f2300..0000000 --- a/abs/core-testing/transcode/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 24607 2009-01-19 05:27:57Z eric $ -# Contributor: Sarah Hay -# Maintainer: roberto - -pkgname=transcode -_sripver=0.3-4 -pkgver=1.1.0 -pkgrel=1 -pkgdesc="Transcode is a video/DVD ripper and encoder for the terminal/console." -arch=(i686 x86_64) -license=('GPL2') -depends=('imagemagick>=6.2.6' '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') - -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 - - # building from here - ./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-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ - --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ - --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 || return 1 - make DESTDIR=$startdir/pkg install - ############################################################################## - # 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 - # 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 - 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/ -} diff --git a/abs/core-testing/transcode/transcode.install b/abs/core-testing/transcode/transcode.install deleted file mode 100644 index 9858c32..0000000 --- a/abs/core-testing/transcode/transcode.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { -echo ">>" -echo ">> Transcode currently does not work with divx4linux. Please" -echo ">> use xvid(core) instead." -echo ">>" -} diff --git a/abs/extra-testing/transcode/PKGBUILD b/abs/extra-testing/transcode/PKGBUILD index 4198a79..89f2300 100644 --- a/abs/extra-testing/transcode/PKGBUILD +++ b/abs/extra-testing/transcode/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 15655 2008-10-16 19:04:55Z tobias $ +# $Id: PKGBUILD 24607 2009-01-19 05:27:57Z eric $ # Contributor: Sarah Hay # Maintainer: roberto pkgname=transcode _sripver=0.3-4 -pkgver=1.0.6 +pkgver=1.1.0 pkgrel=1 pkgdesc="Transcode is a video/DVD ripper and encoder for the terminal/console." arch=(i686 x86_64) license=('GPL2') -depends=('imagemagick>=6.2.6' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools' \ - 'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264>=20080625' 'libxml2' \ - 'libxv') +depends=('imagemagick>=6.2.6' '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://easynews.dl.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz) -md5sums=('7c3a341b0e4540e34ef50c66b0ab751d' 'c0bd49a88f667c68c4430ad25bbed510') + http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz) +md5sums=('5ca205e32b546402a48ea8004a7b3232' 'c0bd49a88f667c68c4430ad25bbed510') 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 + # building from here ./configure --prefix=/usr \ --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ @@ -48,7 +50,8 @@ build() { make DESTDIR=$startdir/pkg install ############################################################################## # this imports the latest subtitleripper sources and replaces the internal - rm -rf $startdir/src/$pkgname-$pkgver/contrib/subrip +### 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 diff --git a/abs/extra-testing/transcode/imagemagick.patch b/abs/extra-testing/transcode/imagemagick.patch deleted file mode 100644 index ed8ce23..0000000 --- a/abs/extra-testing/transcode/imagemagick.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- transcode-1.0.1.orig/filter/filter_compare.c -+++ transcode-1.0.1/filter/filter_compare.c -@@ -180,6 +180,7 @@ - if (!(compare[instance]->results = fopen(results_name, "w"))) - { - perror("could not open file for writing"); -+ return (-1); - } - - InitializeMagick(""); ---- transcode-1.0.1.orig/filter/filter_logo.c 2005-10-21 22:18:49.000000000 +0200 -+++ transcode-1.0.1/filter/filter_logo.c 2005-10-21 22:19:52.000000000 +0200 -@@ -183,17 +183,18 @@ - - if (optstr_get (options, "help", "") >= 0) - help_optstr(); -- } - -- if (verbose > 1) { -- printf (" Logo renderer Settings:\n"); -- printf (" file = %s\n", mfd->file); -- printf (" posdef = %d\n", mfd->pos); -- printf (" pos = %dx%d\n", mfd->posx, mfd->posy); -- printf (" range = %u-%u\n", mfd->start, mfd->end); -- printf (" flip = %d\n", mfd->flip); -- printf (" ignoredelay = %d\n", mfd->ignoredelay); -- printf (" rgbswap = %d\n", mfd->rgbswap); -+ if (verbose > 1) { -+ printf (" Logo renderer Settings:\n"); -+ printf (" file = %s\n", mfd->file); -+ printf (" posdef = %d\n", mfd->pos); -+ printf (" pos = %dx%d\n", mfd->posx, mfd->posy); -+ printf (" range = %u-%u\n", mfd->start, mfd->end); -+ printf (" flip = %d\n", mfd->flip); -+ printf (" ignoredelay = %d\n", mfd->ignoredelay); -+ printf (" rgbswap = %d\n", mfd->rgbswap); -+ } -+ return (-1); - } - - InitializeMagick(""); diff --git a/abs/extra-testing/transcode/transcode.install b/abs/extra-testing/transcode/transcode.install index 75c533b..9858c32 100644 --- a/abs/extra-testing/transcode/transcode.install +++ b/abs/extra-testing/transcode/transcode.install @@ -1,23 +1,6 @@ -# arg 1: the new package version post_install() { echo ">>" echo ">> Transcode currently does not work with divx4linux. Please" echo ">> use xvid(core) instead." echo ">>" } - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - /bin/true -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -op=$1 -shift - -$op $* -- cgit v0.12