Fixed build with external ffmpeg

3 files changed, 25 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61de1f79a7d4..979866053140 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tvheadend-git
 	pkgdesc = TV streaming server for Linux
 	pkgver = 4.3.r1252.g595fd174f
-	pkgrel = 2
+	pkgrel = 3
 	url = https://tvheadend.org/
 	install = tvheadend.install
 	arch = i686
@@ -28,8 +28,10 @@ pkgbase = tvheadend-git
 	backup = etc/conf.d/tvheadend
 	source = tvheadend-git::git+https://github.com/tvheadend/tvheadend.git#branch=master
 	source = dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend
+	source = fix-ffmpeg.patch
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = 2caa4893574ebb6c7f672e2313df865b
 
 pkgname = tvheadend-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4aa947bbf3ed..cb5fc9cee03c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=tvheadend-git
 _gitname='tvheadend-git'
 pkgver=4.3.r1252.g595fd174f
-pkgrel=2
+pkgrel=3
 pkgdesc="TV streaming server for Linux"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://tvheadend.org/"
@@ -24,9 +24,11 @@ install=tvheadend.install
 backup=('etc/conf.d/tvheadend')
 
 source=("${_gitname}::git+https://github.com/tvheadend/tvheadend.git#branch=master"
-        "dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend")
+        'dvb-scan-tables::git+https://github.com/tvheadend/dtv-scan-tables.git#branch=tvheadend'
+        'fix-ffmpeg.patch')
 md5sums=('SKIP'
-         'SKIP')
+         'SKIP'
+         '2caa4893574ebb6c7f672e2313df865b')
 
 pkgver() {
     cd "${srcdir}/${_gitname}"
@@ -40,6 +42,10 @@ prepare() {
     cp -a "dvb-scan-tables" "${_dvbscan}"
     rm -rf "${_dvbscan}/.git"
     touch "${_dvbscan}/.stamp"
+
+    # Fix changed constant name in ffmpeg
+    cd "${srcdir}/${_gitname}"
+    patch -p1 -i "${srcdir}/fix-ffmpeg.patch"
 }
 
 build() {
diff --git a/fix-ffmpeg.patch b/fix-ffmpeg.patch
new file mode 100644
index 000000000000..bdff6476a96e
--- /dev/null
+++ b/fix-ffmpeg.patch
@@ -0,0 +1,13 @@
+diff --git a/src/transcoding/codec/codec.c b/src/transcoding/codec/codec.c
+index 54d7dc2a7..9a8598b03 100644
+--- a/src/transcoding/codec/codec.c
++++ b/src/transcoding/codec/codec.c
+@@ -102,7 +102,7 @@ codec_get_title(AVCodec *self)
+         str_snprintf(codec_title, sizeof(codec_title),
+             self->long_name ? "%s: %s%s" : "%s%s%s",
+             self->name, self->long_name ? self->long_name : "",
+-            (self->capabilities & CODEC_CAP_EXPERIMENTAL) ? " (Experimental)" : "")
++            (self->capabilities & AV_CODEC_CAP_EXPERIMENTAL) ? " (Experimental)" : "")
+        ) {
+         return NULL;
+     }