Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/29a8f700d52503c03b48345119c2bb701cc97fc6)

3 files changed, 26 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d259a63b89d6..e56cf7125aa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.1
-# Sun Aug 21 08:36:14 UTC 2016
+# Mon Jan 16 16:26:44 UTC 2017
 pkgbase = xineliboutput
 	pkgver = 1.1.0.55.g9027ea1
-	pkgrel = 1
+	pkgrel = 3
 	url = http://www.sourceforge.net/projects/xineliboutput
 	arch = x86_64
 	arch = i686
@@ -23,33 +23,30 @@ pkgbase = xineliboutput
 	source = 50-xineliboutput.conf
 	md5sums = SKIP
 	md5sums = d1f1c591b9f927fd0b86e7ff19c09951
-	md5sums = a9a3cd09b950d2024b21a1c6e0620506
+	md5sums = c3b2b26732606b4f95ca95cea6ce2084
 
 pkgname = vdr-xineliboutput
 	pkgdesc = X11 and Linux framebuffer front-end for VDR
-	depends = dbus-glib
-	depends = libextractor
-	depends = libxrandr
-	depends = mesa
 	depends = vdr-api=2.2.0
-	depends = xine-lib
-	depends = xineliboutput-xineplug
-	optdepends = nvidia: Required for VDPAU decoding
-	optdepends = xorg-server: Required for software decoding
+	depends = libextractor
+	depends = libbluray
+	optdepends = xineliboutput-xineplug: local output device
+	optdepends = xineliboutput-frontends: remote output device
 	backup = etc/vdr/conf.avail/50-xineliboutput.conf
 	backup = var/lib/vdr/plugins/xineliboutput/allowed_hosts.conf
 
 pkgname = xineliboutput-frontends
-	pkgdesc = Xineliboutput frontends (vdr-fbfe and vdr-sxfe)
+	pkgdesc = Xineliboutput remote frontends (vdr-fbfe and vdr-sxfe)
+	depends = xineliboutput-xineplug
+
+pkgname = xineliboutput-xineplug
+	pkgdesc = Neccessary xine plugins for remote frontends or local VDR output
 	depends = dbus-glib
+	depends = libextractor
+	depends = libbluray
 	depends = libxrandr
 	depends = mesa
 	depends = xine-lib
-	depends = xineliboutput-xineplug
 	optdepends = nvidia: Required for VDPAU decoding
 	optdepends = xorg-server: Required for software decoding
 
-pkgname = xineliboutput-xineplug
-	pkgdesc = Neccessary xine plugins for xineliboutput-frontends and vdr-xineliboutput
-	depends = xine-lib
-
diff --git a/50-xineliboutput.conf b/50-xineliboutput.conf
index 23626bee9bf2..96738ce408e5 100644
--- a/50-xineliboutput.conf
+++ b/50-xineliboutput.conf
@@ -8,7 +8,7 @@
 
 #--remote=PORT
 #    Listen PORT for remote clients
-#    (default 3789)
+#    (default 37890)
 #    none or 0 disables remote mode
 #    Also local interface address can be specified:
 #    --remote=<ip>:<port>  (default is all interfaces)
diff --git a/PKGBUILD b/PKGBUILD
index b17a9b9d7344..1928c050cca8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(vdr-xineliboutput xineliboutput-frontends xineliboutput-xineplug)
 pkgver=1.1.0.55.g9027ea1
 _gitver=9027ea1737b966386916da27207e8bf92f24cfe0
 _vdrapi=2.2.0
-pkgrel=1
+pkgrel=3
 url="http://www.sourceforge.net/projects/xineliboutput"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
@@ -17,7 +17,7 @@ source=("git://git.code.sf.net/p/xineliboutput/git#commit=$_gitver"
         "50-$_plugname.conf")
 md5sums=('SKIP'
          'd1f1c591b9f927fd0b86e7ff19c09951'
-         'a9a3cd09b950d2024b21a1c6e0620506')
+         'c3b2b26732606b4f95ca95cea6ce2084')
 
 pkgver() {
   cd "${srcdir}/git"
@@ -37,9 +37,9 @@ build() {
 
 package_vdr-xineliboutput() {
   pkgdesc="X11 and Linux framebuffer front-end for VDR"
-  depends=('dbus-glib' 'libextractor' 'libxrandr' 'mesa' "vdr-api=${_vdrapi}" 'xine-lib' 'xineliboutput-xineplug')
-  optdepends=('nvidia: Required for VDPAU decoding'
-              'xorg-server: Required for software decoding')
+  depends=("vdr-api=${_vdrapi}" 'libextractor' 'libbluray')
+  optdepends=('xineliboutput-xineplug: local output device'
+              'xineliboutput-frontends: remote output device')
   backup=("etc/vdr/conf.avail/50-$_plugname.conf"
           "var/lib/vdr/plugins/$_plugname/allowed_hosts.conf")
   cd "${srcdir}/git"
@@ -56,10 +56,8 @@ package_vdr-xineliboutput() {
 }
 
 package_xineliboutput-frontends() {
-  pkgdesc="Xineliboutput frontends (vdr-fbfe and vdr-sxfe)"
-  depends=('dbus-glib' 'libxrandr' 'mesa' 'xine-lib' 'xineliboutput-xineplug')
-  optdepends=('nvidia: Required for VDPAU decoding'
-              'xorg-server: Required for software decoding')
+  pkgdesc="Xineliboutput remote frontends (vdr-fbfe and vdr-sxfe)"
+  depends=('xineliboutput-xineplug')
   cd "${srcdir}/git"
 
   mkdir -p "$pkgdir/usr/lib/vdr/plugins"
@@ -68,8 +66,10 @@ package_xineliboutput-frontends() {
 }
 
 package_xineliboutput-xineplug() {
-  pkgdesc="Neccessary xine plugins for xineliboutput-frontends and vdr-xineliboutput"
-  depends=('xine-lib')
+  pkgdesc="Neccessary xine plugins for remote frontends or local VDR output"
+  depends=('dbus-glib' 'libextractor' 'libbluray' 'libxrandr' 'mesa' 'xine-lib')
+  optdepends=('nvidia: Required for VDPAU decoding'
+              'xorg-server: Required for software decoding')
   cd "${srcdir}/git"
 
   mkdir -p "$pkgdir/usr/lib/vdr/plugins"