Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/2ed2792b5ac60feea483835267cc2d14ad0eb9cc)

2 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27f5922ea0dd..433936564bce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vdr-softhddevice
 	pkgdesc = software and GPU emulated HD output device plugin for VDR
 	pkgver = 0.6.1rc1_63_g4fa4f66
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://projects.vdr-developer.org/projects/plg-softhddevice
 	arch = x86_64
@@ -11,8 +11,12 @@ pkgbase = vdr-softhddevice
 	arch = armv7h
 	license = AGPL3
 	makedepends = git
+	makedepends = glm
 	makedepends = glu
-	depends = ffmpeg
+	makedepends = patchutils
+	depends = ffmpeg2.8
+	depends = freeglut
+	depends = glew
 	depends = mesa
 	depends = vdr-api=2.2.0
 	depends = xcb-util-wm
@@ -20,8 +24,10 @@ pkgbase = vdr-softhddevice
 	optdepends = nvidia: Required for VDPAU decoding
 	backup = etc/vdr/conf.avail/50-softhddevice.conf
 	source = git://projects.vdr-developer.org/vdr-plugin-softhddevice.git#commit=4fa4f6616a17fe38344d28bd186a493d89ef3b85
+	source = https://github.com/louisbraun/softhddevice-openglosd/compare/48fbfa9f...bf608ab5.diff
 	source = 50-softhddevice.conf
 	md5sums = SKIP
+	md5sums = 7c5687e815d9e1763b7111112b59d8ec
 	md5sums = f6ef6cb0bf17c5a28f858e5306776d27
 
 pkgname = vdr-softhddevice
diff --git a/PKGBUILD b/PKGBUILD
index 6f2d45743e0d..929940e8a0dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,19 +6,21 @@ pkgver=0.6.1rc1_63_g4fa4f66
 epoch=1
 _gitver=4fa4f6616a17fe38344d28bd186a493d89ef3b85
 _vdrapi=2.2.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=('ffmpeg' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server')
+depends=('ffmpeg2.8' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server')
 optdepends=('nvidia: Required for VDPAU decoding')
-makedepends=('git' 'glu' )
+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...bf608ab5.diff"
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 md5sums=('SKIP'
+         '7c5687e815d9e1763b7111112b59d8ec'
          'f6ef6cb0bf17c5a28f858e5306776d27')
 
 pkgver() {
@@ -37,11 +39,13 @@ prepare() {
 
   # Enable this to compile with debug logging
   #sed -i 's/# -DDEBUG/-DDEBUG/g' Makefile
+  
+  filterdiff -x '*.po' "$srcdir/48fbfa9f...bf608ab5.diff" | patch -p1
 }
 
 build() {
   cd "${srcdir}/vdr-plugin-${_plugname}"
-  make
+  PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" make
 }
 
 package() {