[arch-commits] Commit in transcode/trunk (PKGBUILD transcode-1.1.7-ffmpeg-2.4.patch)

[Bartłomiej Piotrowski]

    Date: Sunday, October 5, 2014 @ 19:34:01
  Author: bpiotrowski
Revision: 223884

upgpkg: transcode 1.1.7-17

switch back to ffmpeg 2.4

Added:
  transcode/trunk/transcode-1.1.7-ffmpeg-2.4.patch
Modified:
  transcode/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   13 +++++++------
 transcode-1.1.7-ffmpeg-2.4.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-05 16:40:29 UTC (rev 223883)
+++ PKGBUILD	2014-10-05 17:34:01 UTC (rev 223884)
@@ -6,12 +6,12 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=16
+pkgrel=17
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64')
 url="http://tcforge.berlios.de/"
 license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo' 'libdvdread' 'ffmpeg-compat' 'mjpegtools'
+depends=('gawk' 'imagemagick' 'lzo' 'libdvdread' 'ffmpeg' 'mjpegtools'
 	 'libmpeg2' 'libxaw' 'libxv' 'a52dec' 'libxml2')
 makedepends=('nasm' 'libx264')
 source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
@@ -24,7 +24,8 @@
 	transcode-1.1.7-preset-free.patch
 	transcode-1.1.7-libav-9.patch 
 	transcode-1.1.7-preset-force.patch
-	transcode-1.1.7-ffmpeg2.patch)
+	transcode-1.1.7-ffmpeg2.patch
+        transcode-1.1.7-ffmpeg-2.4.patch)
 sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
           'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
           'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
@@ -35,7 +36,8 @@
           '54b1bab48a0b3bc0e8464c4deb4de31bf1060a1c'
           'ef1cccd35317d3a28443b654da49de731cdf1766'
           '034853427bc784a80b333d2e2f4bab44f0b86ce0'
-          '764de67996e2c4947346c7a91586cc4ca826a8e2')
+          '764de67996e2c4947346c7a91586cc4ca826a8e2'
+          'b590dfc30cdc4bc2a6825de247928b46a8928a9a')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -46,6 +48,7 @@
   patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch"
   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
 
   cd ../subtitleripper
@@ -59,8 +62,6 @@
 
 
 build() {
-  export PKG_CONFIG_PATH="/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH"
-
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --disable-sse --disable-sse2 --disable-altivec --enable-mmx \

Added: transcode-1.1.7-ffmpeg-2.4.patch
===================================================================
--- transcode-1.1.7-ffmpeg-2.4.patch	                        (rev 0)
+++ transcode-1.1.7-ffmpeg-2.4.patch	2014-10-05 17:34:01 UTC (rev 223884)
@@ -0,0 +1,13 @@
+diff --git a/import/probe_ffmpeg.c b/import/probe_ffmpeg.c
+index 96d3d49..8e61c51 100644
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
+@@ -120,7 +120,7 @@ void probe_ffmpeg(info_t *ipipe)
+ 
+     translate_info(lavf_dmx_context, ipipe->probe_info);
+ 
+-    av_close_input_file(lavf_dmx_context);
++    avformat_close_input(&lavf_dmx_context);
+     return;
+ }
+