diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | PKGBUILD | 46 | ||||
| -rw-r--r-- | xineliboutput_fix_vdrversion_check.diff | 24 |
3 files changed, 28 insertions, 65 deletions
@@ -1,15 +1,13 @@ -# Generated by makepkg 5.1.3 -# Sun Jun 23 09:28:24 UTC 2019 pkgbase = xineliboutput - pkgver = 2.1.0 - pkgrel = 2 - url = http://www.sourceforge.net/projects/xineliboutput + pkgver = 2.3.0 + pkgrel = 1 + url = https://www.sourceforge.net/projects/xineliboutput arch = x86_64 arch = i686 arch = arm arch = armv6h arch = armv7h - license = GPL2 + license = GPL-2.0-or-later makedepends = avahi makedepends = dbus-glib makedepends = git @@ -18,21 +16,19 @@ pkgbase = xineliboutput makedepends = libextractor makedepends = libxrandr makedepends = mesa - makedepends = vdr-api=2.4.1 + makedepends = vdr-api=2.6.7 makedepends = xine-lib - source = xineliboutput::git://git.code.sf.net/p/xineliboutput/git#commit=ba6aae8c11944f7d11b5d290d7905a010aba3944 - source = xineliboutput_fix_vdrversion_check.diff + source = xineliboutput::git://git.code.sf.net/p/xineliboutput/git#commit=16af8504099ddfbcba75f191d9465130d6eeb56c source = 50-xineliboutput.conf - md5sums = SKIP - md5sums = d1f1c591b9f927fd0b86e7ff19c09951 - md5sums = c3b2b26732606b4f95ca95cea6ce2084 + sha256sums = 296d2ccaaa584ccf9b0491ebf3a03e7e6333d6a5900a2803119dce38016b0ded + sha256sums = a608928d27df92fb7467ae91da0feaf472254192c84c4af4393a958cc84af919 pkgname = vdr-xineliboutput pkgdesc = X11 and Linux framebuffer front-end for VDR depends = avahi depends = libextractor depends = libbluray - depends = vdr-api=2.4.1 + depends = vdr-api=2.6.7 optdepends = xineliboutput-xineplug: local output device optdepends = xineliboutput-frontends: remote output device backup = etc/vdr/conf.avail/50-xineliboutput.conf @@ -53,4 +49,3 @@ pkgname = xineliboutput-xineplug depends = xine-lib optdepends = nvidia: Required for VDPAU decoding optdepends = xorg-server: Required for software decoding - @@ -3,34 +3,26 @@ # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de> pkgbase=xineliboutput pkgname=(vdr-xineliboutput xineliboutput-frontends xineliboutput-xineplug) -pkgver=2.1.0 -_gitver=ba6aae8c11944f7d11b5d290d7905a010aba3944 -_vdrapi=2.4.1 -pkgrel=2 -url="http://www.sourceforge.net/projects/xineliboutput" +pkgver=2.3.0 +_gitver=16af8504099ddfbcba75f191d9465130d6eeb56c +_vdrapi=2.6.7 +pkgrel=1 +url="https://www.sourceforge.net/projects/xineliboutput" arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') -license=('GPL2') +license=('GPL-2.0-or-later') makedepends=('avahi' 'dbus-glib' 'git' 'glu' 'libcec' 'libextractor' 'libxrandr' 'mesa' "vdr-api=${_vdrapi}" 'xine-lib') -_plugname=${pkgname//vdr-/} source=("$pkgbase::git://git.code.sf.net/p/xineliboutput/git#commit=$_gitver" - 'xineliboutput_fix_vdrversion_check.diff' - "50-$_plugname.conf") -md5sums=('SKIP' - 'd1f1c591b9f927fd0b86e7ff19c09951' - 'c3b2b26732606b4f95ca95cea6ce2084') + "50-$pkgbase.conf") +sha256sums=('296d2ccaaa584ccf9b0491ebf3a03e7e6333d6a5900a2803119dce38016b0ded' + 'a608928d27df92fb7467ae91da0feaf472254192c84c4af4393a958cc84af919') pkgver() { - cd "${srcdir}/git" - git describe --tags | sed "s/$_plugname.//g;s/_/./g;s/-/./g" -} - -prepare() { - cd "${srcdir}/git" - patch -p1 -i "$srcdir/xineliboutput_fix_vdrversion_check.diff" + cd "${srcdir}/$pkgbase" + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "${srcdir}/git" + cd "${srcdir}/$pkgbase" ./configure make } @@ -40,17 +32,17 @@ package_vdr-xineliboutput() { depends=('avahi' 'libextractor' 'libbluray' "vdr-api=${_vdrapi}") 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" + backup=("etc/vdr/conf.avail/50-$pkgbase.conf" + "var/lib/vdr/plugins/$pkgbase/allowed_hosts.conf") + cd "${srcdir}/$pkgbase" mkdir -p "$pkgdir/usr/lib/vdr/plugins" make DESTDIR="$pkgdir" install rm -r "$pkgdir/usr/bin" rm -r "$pkgdir/usr/lib/xine" - install -Dm644 examples/allowed_hosts.conf "$pkgdir/var/lib/vdr/plugins/$_plugname/allowed_hosts.conf" - install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf" + install -Dm644 examples/allowed_hosts.conf "$pkgdir/var/lib/vdr/plugins/$pkgbase/allowed_hosts.conf" + install -Dm644 "$srcdir/50-$pkgbase.conf" "$pkgdir/etc/vdr/conf.avail/50-$pkgbase.conf" chown -R 666:666 "$pkgdir/var/lib/vdr" } @@ -58,7 +50,7 @@ package_vdr-xineliboutput() { package_xineliboutput-frontends() { pkgdesc="Xineliboutput remote frontends (vdr-fbfe and vdr-sxfe)" depends=('libcec' 'xineliboutput-xineplug') - cd "${srcdir}/git" + cd "${srcdir}/$pkgbase" mkdir -p "$pkgdir/usr/lib/vdr/plugins" make DESTDIR="$pkgdir" install @@ -70,7 +62,7 @@ package_xineliboutput-xineplug() { depends=('dbus-glib' 'libextractor' 'libbluray' 'libxrandr' 'mesa' 'xine-lib') optdepends=('nvidia: Required for VDPAU decoding' 'xorg-server: Required for software decoding') - cd "${srcdir}/git" + cd "${srcdir}/$pkgbase" mkdir -p "$pkgdir/usr/lib/vdr/plugins" make DESTDIR="$pkgdir" install diff --git a/xineliboutput_fix_vdrversion_check.diff b/xineliboutput_fix_vdrversion_check.diff deleted file mode 100644 index e48fe4dfac30..000000000000 --- a/xineliboutput_fix_vdrversion_check.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -upr a/device.c b/device.c ---- a/device.c 2016-08-20 11:41:20.856830323 +0200 -+++ b/device.c 2016-08-20 11:46:48.853501033 +0200 -@@ -1457,7 +1457,7 @@ void cXinelibDevice::SetVideoDisplayForm - #endif - } - --#if VDRVERSNUM < 20301 -+#if VDRVERSNUM < 20200 - eVideoSystem cXinelibDevice::GetVideoSystem(void) - { - TRACEF("cXinelibDevice::GetVideoSystem"); -diff -upr a/device.h b/device.h ---- a/device.h 2016-08-20 11:41:20.856830323 +0200 -+++ b/device.h 2016-08-20 11:46:52.500167744 +0200 -@@ -123,7 +123,7 @@ class cXinelibDevice : public cDevice - public: - virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat); - virtual void SetVideoFormat(bool VideoFormat16_9); --#if VDRVERSNUM < 20301 -+#if VDRVERSNUM < 20200 - virtual eVideoSystem GetVideoSystem(void); - #endif - |