Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/3bf8a4492e3b973a559fd2c53855b231e25c7e74)

4 files changed, 121 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..4497dba5bf6e
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = vdr-play
+	pkgdesc = Mediaplayer plugin for VDR and X11
+	pkgver = 0.0.14_21_g8035264
+	pkgrel = 13
+	url = http://projects.vdr-developer.org/projects/plg-play
+	arch = x86_64
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	license = AGPL3
+	makedepends = git
+	depends = mplayer
+	depends = vdr-api=2.2.0
+	depends = xcb-util-image
+	depends = xcb-util-keysyms
+	depends = xcb-util-wm
+	backup = etc/vdr/conf.avail/50-play.conf
+	source = git://projects.vdr-developer.org/vdr-plugin-play.git#commit=8035264d471f75407222a48f2fa707795e25d461
+	source = play-vdr2.1.10compat.diff
+	source = 50-play.conf
+	md5sums = SKIP
+	md5sums = 88bd08bead28aab75bd002daccf7e5b5
+	md5sums = 19d455b69728f7e6469763b2b2424074
+
+pkgname = vdr-play
+
diff --git a/50-play.conf b/50-play.conf
new file mode 100644
index 000000000000..299cdf246822
--- /dev/null
+++ b/50-play.conf
@@ -0,0 +1,27 @@
+[play]
+#-% device
+#    mplayer dvd device
+
+#-/ dir
+#    browser root directory
+
+#-a audio
+#    mplayer -ao (alsa:device=hw=0.0) overwrites mplayer.conf
+
+#-d display
+#    X11 display (default :0.0) overwrites $DISPLAY
+
+#-f
+#    mplayer fullscreen playback
+
+#-g geometry
+#    x11 window geometry wxh+x+y
+
+#-k colorkey
+#    video color key (default=0x020507, mplayer2=0x76B901)
+
+#-m mplayer
+#    filename of mplayer executable
+
+#-M args
+#    arguments for mplayer
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..55bea4657fa8
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,45 @@
+# This PKGBUILD is part of the VDR4Arch project [https://github.com/vdr4arch]
+
+# Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
+pkgname=vdr-play
+pkgver=0.0.14_21_g8035264
+_gitver=8035264d471f75407222a48f2fa707795e25d461
+_vdrapi=2.2.0
+pkgrel=13
+pkgdesc="Mediaplayer plugin for VDR and X11"
+url="http://projects.vdr-developer.org/projects/plg-play"
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
+license=('AGPL3')
+depends=('mplayer' "vdr-api=${_vdrapi}" 'xcb-util-image' 'xcb-util-keysyms' 'xcb-util-wm')
+makedepends=('git')
+_plugname=$(echo $pkgname | sed 's/vdr-//g')
+source=("git://projects.vdr-developer.org/vdr-plugin-play.git#commit=$_gitver"
+        'play-vdr2.1.10compat.diff'
+        "50-$_plugname.conf")
+backup=("etc/vdr/conf.avail/50-$_plugname.conf")
+md5sums=('SKIP'
+         '88bd08bead28aab75bd002daccf7e5b5'
+         '19d455b69728f7e6469763b2b2424074')
+
+pkgver() {
+  cd "${srcdir}/vdr-plugin-$_plugname"
+  git tag -a 0.0.14 -m 'Added Tag' eb4b8437553ff7666eceadd09c6cb9dd8255380e 2> /dev/null
+  git describe --tags | sed 's/-/_/g'
+}
+
+prepare() {
+  cd "${srcdir}/vdr-plugin-$_plugname"
+  patch -p1 -i "$srcdir/play-vdr2.1.10compat.diff"
+}
+
+build() {
+  cd "${srcdir}/vdr-plugin-$_plugname"
+  make
+}
+
+package() {
+  cd "${srcdir}/vdr-plugin-$_plugname"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf"
+}
diff --git a/play-vdr2.1.10compat.diff b/play-vdr2.1.10compat.diff
new file mode 100644
index 000000000000..2a30b179e3ec
--- /dev/null
+++ b/play-vdr2.1.10compat.diff
@@ -0,0 +1,22 @@
+diff --git a/play.cpp b/play.cpp
+index 269426d..ccf87c2 100644
+--- a/play.cpp
++++ b/play.cpp
+@@ -1352,7 +1352,7 @@ void cMyOsd::Flush(void)
+     }
+ 
+     LOCK_PIXMAPS;
+-    while ((pm = RenderPixmaps())) {
++    while ((pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()))) {
+ 	int x;
+ 	int y;
+ 	int w;
+@@ -1367,7 +1367,7 @@ void cMyOsd::Flush(void)
+ 	    pm->Data());
+ 	OsdDrawARGB(x, y, w, h, pm->Data());
+ 
+-	delete pm;
++	DestroyPixmap(pm);
+     }
+     cMyOsd::Dirty = 0;
+ }