diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
| commit | 4a534f68f38c221a2276fa791e086c3848ce515d (patch) | |
| tree | 7963845c02cde2b1f4a4fb8a6c6cfa497b5ee5d5 /extra/transcode | |
| parent | d5acc51bdb801d2bb930af53220946e739dd5edd (diff) | |
| parent | 738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/calibre/PKGBUILD
community/ffmpeg2theora/PKGBUILD
core/e2fsprogs/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/ffmpeg/PKGBUILD
multilib/lib32-alsa-lib/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-alsa-plugins/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
staging/transcode/PKGBUILD
staging/vlc/PKGBUILD
Diffstat (limited to 'extra/transcode')
| -rw-r--r-- | extra/transcode/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/transcode/ffmpeg-0.10.patch | 14 |
2 files changed, 22 insertions, 4 deletions
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 9faacb49b..ac5f1f722 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144420 2011-12-05 18:18:14Z jgc $ +# $Id: PKGBUILD 147746 2012-01-27 20:01:33Z ibiru $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" @@ -17,14 +17,18 @@ 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) + subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch + ffmpeg-0.10.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae') + '591943a33235342a66c3df0625a164a1479c09ae' + '3c03111cfae88db918afff3837cec7db32ace3cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch" ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch new file mode 100644 index 000000000..5965c180c --- /dev/null +++ b/extra/transcode/ffmpeg-0.10.patch @@ -0,0 +1,14 @@ +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.c 2012-01-27 19:55:13.706613234 +0000 ++++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +0000 +@@ -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]; + |