Add support for ffmpeg version 4.0

1 files changed, 27 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 06f1e88967da..0f31092c0560 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=tvheadend
 
 pkgver=4.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="TV streaming server for Linux"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://tvheadend.org/projects/tvheadend"
@@ -17,15 +17,36 @@ optdepends=('xmltv: For an alternative source of programme listings'
 provides=('tvheadend')
 conflicts=('tvheadend-git')
 install=tvheadend.install
+_tagname="v${pkgver}"
 
-source=("https://github.com/tvheadend/tvheadend/archive/v$pkgver.tar.gz"
+source=("git+https://github.com/tvheadend/tvheadend#tag=${_tagname}"
 	"tvheadend.override"
 )
-sha256sums=('09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9'
+sha256sums=('SKIP'
             'bbb54ae46fbb1b00f987c0a8dde644ee9a0121fa173ee21cc6bf7a6a6fb12146')
+
+_backports=(
+  # ffmpeg 3.5 fixes
+  '3cb4f580565b307457f6e645f34bf113c2be54a4'
+)
  
+_reverts=(
+)
+
 prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}"
+
+    # apply backports or reverts
+    local c
+    for c in "${_backports[@]}"; do
+      echo "Backporting commit $c"
+      git cherry-pick -n "$c"
+    done
+    for c in "${_reverts[@]}"; do
+      echo "Reverting commit $c"
+      git revert -n "$c"
+    done
+
     ./configure --prefix=/usr --python=python3 \
         --disable-ffmpeg_static \
         --disable-libx264_static \
@@ -37,13 +58,13 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}"
     # TODO: temporary fix to succeed compilation with GCC 8+
     make CFLAGS_NO_WERROR=yes
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}"
     make DESTDIR="$pkgdir" install
 
     # Fix permission mode of man-page