Update tvheadend (4.2.8)

repo-make.conf

@@ -30,6 +30,7 @@ kodi-addon-pvr-vdr-vnsi
 kodi-addon-pvr-hts
 kodi-addon-graphlcd
 naludump
+tvheadend
 #oscam
 vdr
 vdr-addon-lifeguard

tvheadend/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = tvheadend
 	pkgdesc = TV streaming server for Linux
-	pkgver = 4.2.6
-	pkgrel = 6
+	pkgver = 4.2.8
+	pkgrel = 1
 	url = https://tvheadend.org/projects/tvheadend
 	install = tvheadend.install
 	arch = i686
@@ -15,20 +15,17 @@ pkgbase = tvheadend
 	makedepends = wget
 	makedepends = python
 	depends = avahi
-	depends = ffmpeg
 	depends = uriparser
 	depends = openssl
 	depends = tar
 	optdepends = xmltv: For an alternative source of programme listings
 	optdepends = libiconv: For conversion of character encodings
 	provides = tvheadend
 	conflicts = tvheadend-git
-	source = https://github.com/tvheadend/tvheadend/archive/v4.2.6.tar.gz
+	source = https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz
 	source = tvheadend.service
-	source = 0001-ffmpeg-3.5-fixes.patch
-	sha256sums = 09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9
+	sha256sums = 1aef889373d5fad2a7bd2f139156d4d5e34a64b6d38b87b868a2df415f01f7ad
 	sha256sums = 0fba50a4d8993aa32815ffcc7eac6b372a85f3334bd804571cc6c6cf0795fff1
-	sha256sums = 0481d7ab443639d2ffc2e13e7f3207b1489fafbe605b9fbe50d3a8d44acf5a38
 
 pkgname = tvheadend
 

tvheadend/PKGBUILD

@@ -3,13 +3,13 @@
 
 pkgname=tvheadend
 
-pkgver=4.2.6
-pkgrel=6
+pkgver=4.2.8
+pkgrel=1
 pkgdesc="TV streaming server for Linux"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://tvheadend.org/projects/tvheadend"
 license=('GPL3')
-depends=('avahi' 'ffmpeg' 'uriparser' 'openssl' 'tar')
+depends=('avahi' 'uriparser' 'openssl' 'tar')
 makedepends=('git' 'wget' 'python')
 optdepends=('xmltv: For an alternative source of programme listings'
 	    'libiconv: For conversion of character encodings'
@@ -20,41 +20,33 @@ install=tvheadend.install
 
 source=("https://github.com/tvheadend/tvheadend/archive/v$pkgver.tar.gz"
         "tvheadend.service"
-        "0001-ffmpeg-3.5-fixes.patch"
 )
-sha256sums=('09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9'
-            '0fba50a4d8993aa32815ffcc7eac6b372a85f3334bd804571cc6c6cf0795fff1'
-            '0481d7ab443639d2ffc2e13e7f3207b1489fafbe605b9fbe50d3a8d44acf5a38')
+sha256sums=('1aef889373d5fad2a7bd2f139156d4d5e34a64b6d38b87b868a2df415f01f7ad'
+            '0fba50a4d8993aa32815ffcc7eac6b372a85f3334bd804571cc6c6cf0795fff1')
 
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    # Backport commit 3cb4f580565b307457f6e645f34bf113c2be54a4 to support ffmpeg 4.0
-    patch -p1 -i "${srcdir}/0001-ffmpeg-3.5-fixes.patch"
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-    ./configure --prefix=/usr --python=python3 \
+  ./configure --prefix=/usr --python=python3 \
         --disable-ffmpeg_static \
         --disable-libx264_static \
         --disable-libx265_static \
         --disable-libvpx_static \
         --disable-libtheora_static \
         --disable-libvorbis_static \
-        --disable-libfdkaac_static
-}
+        --disable-libfdkaac_static \
+        --disable-libav
 
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # TODO: temporary fix to succeed compilation with GCC 8+
-    make CFLAGS_NO_WERROR=yes
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="$pkgdir" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
 
-    # Fix permission mode of man-page
-    chmod 0644 "${pkgdir}/usr/share/man/man1/tvheadend.1"
+  # Fix permission mode of man-page
+  chmod 0644 "${pkgdir}/usr/share/man/man1/tvheadend.1"
 
-    # Install service file
-    install -Dm644 "${srcdir}/tvheadend.service" "$pkgdir/usr/lib/systemd/system/tvheadend.service"
+  # Install service file
+  install -Dm644 "${srcdir}/tvheadend.service" "$pkgdir/usr/lib/systemd/system/tvheadend.service"
 }