[arch-commits] Commit in transcode/trunk (PKGBUILD transcode-swresample.patch)

[Antonio Rojas]

    Date: Saturday, December 15, 2018 @ 20:06:24
  Author: arojas
Revision: 416383

Port from avresample to swresample (FS#61086)

Added:
  transcode/trunk/transcode-swresample.patch
Modified:
  transcode/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 ++++++++-----
 transcode-swresample.patch |   20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-15 17:47:20 UTC (rev 416382)
+++ PKGBUILD	2018-12-15 20:06:24 UTC (rev 416383)
@@ -5,22 +5,24 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=28
+pkgrel=29
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=(x86_64)
 url="http://www.transcoding.org/"
 license=(GPL)
-depends=(gawk libmagick lzo libdvdread ffmpeg mjpegtools libmpeg2 libxaw libxv a52dec)
+depends=(gawk libmagick lzo libdvdread ffmpeg mjpegtools libmpeg2 libxaw a52dec)
 makedepends=(nasm x264)
 #source=(https://bitbucket.org/france/transcode-tcforge/downloads/$pkgname-$pkgver.tar.bz2
 source=(https://sources.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.bz2
         transcode-imagemagick7.patch
         transcode-ffmpeg3.patch
-        transcode-ffmpeg4.patch)
+        transcode-ffmpeg4.patch
+        transcode-swresample.patch)
 sha256sums=('1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92'
             '4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51'
             '728ec3101039d98116275e36ea5cf0434a23a0bb82aca830ea9612fb9d16b062'
-            '2cc680666f705685a9fdc54b5a377e7728765bde6ed83c43b835634e27767721')
+            '2cc680666f705685a9fdc54b5a377e7728765bde6ed83c43b835634e27767721'
+            '6b4e91085742535174015be5da103fe3337b4cb14537634ae378c9050088280e')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -27,7 +29,8 @@
   patch -p1 -i ../transcode-ffmpeg3.patch # LFS patch
   patch -p1 -i ../transcode-ffmpeg4.patch # Gentoo patch
   patch -p1 -i ../transcode-imagemagick7.patch # Gentoo patch
-  sed -i 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' filter/subtitler/load_font.c
+  sed -e 's|freetype/ftglyph.h|freetype2/freetype/ftglyph.h|' -i filter/subtitler/load_font.c
+  patch -p1 -i ../transcode-swresample.patch # port away from avresample
   autoreconf -vi
 }
 

Added: transcode-swresample.patch
===================================================================
--- transcode-swresample.patch	                        (rev 0)
+++ transcode-swresample.patch	2018-12-15 20:06:24 UTC (rev 416383)
@@ -0,0 +1,20 @@
+--- transcode-1.1.7/filter/filter_resample.c.orig	2018-12-15 20:00:16.111657609 +0000
++++ transcode-1.1.7/filter/filter_resample.c	2018-12-15 20:01:13.141800445 +0000
+@@ -37,7 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcavcodec.h"
+ #include "libtc/tcmodule-plugin.h"
+-#include <libavresample/avresample.h>
++#include <libswresample/swresample.h>
+ 
+ 
+ typedef struct {
+@@ -46,7 +46,7 @@
+ 
+     int bytes_per_sample;
+ 
+-    AVAudioResampleContext *resample_ctx;
++    SwrContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""