Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/73cdf339c460eccf7cbbffea87d92c480351024e)

2 files changed, 54 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7511c4ee1b46..9dc394e56731 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.1.1
-# Tue Dec 25 15:32:59 UTC 2018
+# Generated by makepkg 5.1.2
+# Sun Jan 13 14:35:13 UTC 2019
 pkgbase = vdr-softhddevice
 	pkgdesc = software and GPU emulated HD output device plugin for VDR
 	pkgver = 0.6.1rc1_65_g6dfa88a
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://projects.vdr-developer.org/projects/plg-softhddevice
 	arch = x86_64
@@ -16,21 +16,24 @@ pkgbase = vdr-softhddevice
 	makedepends = glm
 	makedepends = glu
 	makedepends = patchutils
-	depends = ffmpeg2.8
 	depends = freeglut
 	depends = glew
-	depends = mesa
 	depends = vdr-api=2.4.0
 	depends = xcb-util-wm
 	depends = xorg-server
+	depends = libva
+	depends = libvdpau
+	depends = alsa-lib
 	optdepends = nvidia: Required for VDPAU decoding,
 	optdepends = vdr-xorg: Recommended way to start X.org server together with VDR
 	backup = etc/vdr/conf.avail/50-softhddevice.conf
 	source = git://projects.vdr-developer.org/vdr-plugin-softhddevice.git#commit=6dfa88aecf1b5a4c5932ba278209d9f22676547f
-	source = https://github.com/louisbraun/softhddevice-openglosd/compare/48fbfa9f...3ed09d43.diff
+	source = https://ffmpeg.org/releases/ffmpeg-2.8.15.tar.xz
+	source = softhddevice-openglosd.diff::https://github.com/louisbraun/softhddevice-openglosd/compare/48fbfa9f...569fde5d.diff
 	source = 50-softhddevice.conf
 	md5sums = SKIP
-	md5sums = 5dc3d680794ae6293a7ba03de1d29c57
+	md5sums = 9c5f5d9a3aeaa6ff1f2514cc509d3f07
+	md5sums = f8b7095b157a955f29ddc76d5bf5c476
 	md5sums = f6ef6cb0bf17c5a28f858e5306776d27
 
 pkgname = vdr-softhddevice
diff --git a/PKGBUILD b/PKGBUILD
index f1eef0c09fb7..b93c26bf2ff7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,26 @@ pkgname=vdr-softhddevice
 pkgver=0.6.1rc1_65_g6dfa88a
 epoch=1
 _gitver=6dfa88aecf1b5a4c5932ba278209d9f22676547f
+_ffmpegver=2.8.15
 _vdrapi=2.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="software and GPU emulated HD output device plugin for VDR"
 url="http://projects.vdr-developer.org/projects/plg-softhddevice"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('AGPL3')
-depends=('ffmpeg2.8' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server')
+depends=('freeglut' 'glew' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'libva' 'libvdpau' 'alsa-lib')
 optdepends=('nvidia: Required for VDPAU decoding',
             'vdr-xorg: Recommended way to start X.org server together with VDR')
 makedepends=('git' 'glm' 'glu' 'patchutils')
 _plugname=${pkgname//vdr-/}
 source=("git://projects.vdr-developer.org/vdr-plugin-softhddevice.git#commit=$_gitver"
-        "https://github.com/louisbraun/softhddevice-openglosd/compare/48fbfa9f...3ed09d43.diff"
+        "https://ffmpeg.org/releases/ffmpeg-${_ffmpegver}.tar.xz"
+        "softhddevice-openglosd.diff::https://github.com/louisbraun/softhddevice-openglosd/compare/48fbfa9f...569fde5d.diff"
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 md5sums=('SKIP'
-         '5dc3d680794ae6293a7ba03de1d29c57'
+         '9c5f5d9a3aeaa6ff1f2514cc509d3f07'
+         'f8b7095b157a955f29ddc76d5bf5c476'
          'f6ef6cb0bf17c5a28f858e5306776d27')
 
 pkgver() {
@@ -41,17 +44,51 @@ prepare() {
   # Enable this to compile with debug logging
   #sed -i 's/# -DDEBUG/-DDEBUG/g' Makefile
 
-  filterdiff -x '*.po' "$srcdir/48fbfa9f...3ed09d43.diff" | patch -p1
+  # OpenGL OSD support
+  filterdiff -x '*.po' "$srcdir/softhddevice-openglosd.diff" | patch -p1
 }
 
 build() {
+  cd "${srcdir}/ffmpeg-${_ffmpegver}"
+  ./configure \
+    --disable-everything \
+    --disable-programs \
+    --disable-doc \
+    --disable-stripping \
+    --disable-yasm \
+    --disable-asm \
+    --prefix="${srcdir}/ffmpeg_root" \
+    --enable-static \
+    --disable-shared \
+    --enable-pic \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-hwaccel=h263_vaapi \
+    --enable-hwaccel=h263_vdpau \
+    --enable-hwaccel=h264_vaapi \
+    --enable-hwaccel=h264_vdpau \
+    --enable-hwaccel=mpeg1_vdpau \
+    --enable-hwaccel=mpeg2_vaapi \
+    --enable-hwaccel=mpeg2_vdpau \
+    --enable-hwaccel=mpeg4_vaapi \
+    --enable-hwaccel=mpeg4_vdpau \
+    --enable-hwaccel=wmv3_vaapi \
+    --enable-hwaccel=wmv3_vdpau \
+    --enable-hwaccel=hevc_vaapi \
+    --enable-hwaccel=hevc_vdpau \
+    --enable-decoder=ac3 \
+    --enable-decoder=eac3 \
+    --enable-decoder=mp2
+  make
+  make install
+
   cd "${srcdir}/vdr-plugin-${_plugname}"
-  PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" make
+  PKG_CONFIG_PATH="${srcdir}/ffmpeg_root/lib/pkgconfig" make
 }
 
 package() {
   cd "${srcdir}/vdr-plugin-${_plugname}"
-  PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" make DESTDIR="${pkgdir}" install
+  PKG_CONFIG_PATH="${srcdir}/ffmpeg_root/lib/pkgconfig" make DESTDIR="${pkgdir}" install
 
   install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf"
 }