Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/484067af1f671e8e141062962cc02503ea3fafd8)

2 files changed, 13 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2347bb57678d..a345ac2b6b51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by makepkg 6.0.2
-# Mon Dec 19 14:03:35 UTC 2022
 pkgbase = vdr-skinflatplus
 	pkgdesc = Simple and slim skin for VDR
-	pkgver = 0.6.0.r42.g3e905e29
-	pkgrel = 5
+	pkgver = 0.6.3
+	pkgrel = 1
 	url = https://github.com/MegaV0lt/vdr-plugin-skinflatplus
 	arch = x86_64
 	arch = i686
@@ -11,7 +9,6 @@ pkgbase = vdr-skinflatplus
 	arch = armv6h
 	arch = armv7h
 	license = GPL2
-	makedepends = git
 	depends = fontconfig
 	depends = graphicsmagick
 	depends = vdr-api=2.6.3
@@ -20,9 +17,9 @@ pkgbase = vdr-skinflatplus
 	backup = var/lib/vdr/plugins/skinflatplus/configs/MV_default
 	backup = var/lib/vdr/plugins/skinflatplus/configs/default
 	backup = var/lib/vdr/plugins/skinflatplus/configs/fnu_default
-	source = git+https://github.com/MegaV0lt/vdr-plugin-skinflatplus.git#commit=3e905e29af98d79e0bc57e0810a5a919b9e1f01d
+	source = vdr-skinflatplus-0.6.3.tar.gz::https://github.com/MegaV0lt/vdr-plugin-skinflatplus/archive/refs/tags/0.6.3.tar.gz
 	source = 50-skinflatplus.conf
-	sha256sums = SKIP
+	sha256sums = 46ff2ea27b12227d02c5528615da0ac74ee84f14e5a2c08a24fc298973546711
 	sha256sums = 6f6f9699cbc73d73d34c4e17183d3f03b1553a2b8caa62ee881354f2ac12bd8d
 
 pkgname = vdr-skinflatplus
diff --git a/PKGBUILD b/PKGBUILD
index b313f6201b92..8d6d9821a680 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,47 +2,30 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-skinflatplus
-pkgver=0.6.0.r42.g3e905e29
-_gitver=3e905e29af98d79e0bc57e0810a5a919b9e1f01d
+pkgver=0.6.3
 _vdrapi=2.6.3
-pkgrel=5
+pkgrel=1
 pkgdesc="Simple and slim skin for VDR"
 url="https://github.com/MegaV0lt/vdr-plugin-skinflatplus"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 depends=('fontconfig' 'graphicsmagick' "vdr-api=${_vdrapi}")
-makedepends=('git')
 _plugname=${pkgname//vdr-/}
-source=("git+https://github.com/MegaV0lt/vdr-plugin-skinflatplus.git#commit=$_gitver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/MegaV0lt/vdr-plugin-skinflatplus/archive/refs/tags/$pkgver.tar.gz"
         "50-$_plugname.conf")
 backup=('etc/epgd/eventsview-flatplus.sql'
         "etc/vdr/conf.avail/50-$_plugname.conf"
         'var/lib/vdr/plugins/skinflatplus/configs/'{MV_default,default,fnu_default})
-sha256sums=('SKIP'
+sha256sums=('46ff2ea27b12227d02c5528615da0ac74ee84f14e5a2c08a24fc298973546711'
             '6f6f9699cbc73d73d34c4e17183d3f03b1553a2b8caa62ee881354f2ac12bd8d')
 
-pkgver() {
-  cd "$srcdir/vdr-plugin-$_plugname"
-  _last_release=0.6.0
-  _last_release_commit=cd60fe82b3c0dd03b92b10cdc3135a0ef57f835a
-
-  _count=$((`git rev-list --count HEAD` - `git rev-list --count $_last_release_commit`))
-  if [ $_count -gt 0 ]; then
-    printf "%s.r%s.g%s" $_last_release \
-      $_count \
-      `git rev-parse --short HEAD`
-  else
-    printf "%s" $_last_release
-  fi
-}
-
 build() {
-  cd "$srcdir/vdr-plugin-$_plugname"
+  cd "$srcdir/vdr-plugin-$_plugname-$pkgver"
   make IMAGELIB=graphicsmagick
 }
 
 package() {
-  cd "$srcdir/vdr-plugin-$_plugname"
+  cd "$srcdir/vdr-plugin-$_plugname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
@@ -50,5 +33,8 @@ package() {
   install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf"
   rm "$pkgdir/var/lib/vdr/plugins/skinflatplus/configs/skin flat"
 
+  # Workaround for https://github.com/MegaV0lt/vdr-plugin-skinflatplus/issues/3
+  find "$pkgdir/usr/share/vdr/plugins" -xtype l -delete
+
   chown -R 666:666 "$pkgdir/var/lib/vdr"
 }