Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/31ccfe0fc18cc5084e7b6a7f21ce13384f918782)

2 files changed, 26 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ed666b9b723..b200cf2f0141 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,26 @@
-# Generated by makepkg 6.0.1
-# Thu Feb 17 15:03:40 UTC 2022
+# Generated by makepkg 6.0.2
+# Mon Dec 19 14:02:41 UTC 2022
 pkgbase = vdr-skinenigmang
 	pkgdesc = skin based on the Enigma text2skin addon
-	pkgver = 0.1.2_20_g995b108
-	pkgrel = 7
+	pkgver = 0.1.4
+	pkgrel = 2
 	epoch = 1
-	url = http://andreas.vdr-developer.org/enigmang/index.html
+	url = https://github.com/vdr-projects/vdr-plugin-skinenigmang
 	arch = x86_64
 	arch = i686
 	arch = arm
 	arch = armv6h
 	arch = armv7h
 	license = GPL2
-	makedepends = git
 	depends = freetype2
 	depends = gcc-libs
-	depends = vdr-api=2.6.1
+	depends = vdr-api=2.6.3
 	backup = etc/vdr/conf.avail/50-skinenigmang.conf
-	source = git+https://projects.vdr-developer.org/git/vdr-plugin-skinenigmang.git#commit=995b108c894970306efcba1d8e70ded50e76f1d3
+	source = vdr-skinenigmang-0.1.4.tar.gz::https://github.com/vdr-projects/vdr-plugin-skinenigmang/archive/refs/tags/0.1.4.tar.gz
 	source = skinenigmang-search_for_logos_in_resourcedir.diff
 	source = 50-skinenigmang.conf
-	md5sums = SKIP
-	md5sums = 6bfd86e7a92d969edd208401b65b20fe
-	md5sums = 8b2c4d67273e3b52e38496e52b35e345
+	sha256sums = 853f4b47b2b2e688ec0062695f7261962c734fa894b3db4e69266986c0e20a4e
+	sha256sums = e61d17e978a01988118737f7f0c0af6aba7999c1f465940c8e1529d0bf49c6fc
+	sha256sums = 134aba4b0c41beeecec0eb7f5014d58bd02a2546106474f8dd76fab26abf86b4
 
 pkgname = vdr-skinenigmang
diff --git a/PKGBUILD b/PKGBUILD
index 2c503b85679d..46ea4514db3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,46 +2,37 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-skinenigmang
-pkgver=0.1.2_20_g995b108
+pkgver=0.1.4
+pkgrel=2
+_vdrapi=2.6.3
 epoch=1
-_gitver=995b108c894970306efcba1d8e70ded50e76f1d3
-_vdrapi=2.6.1
-pkgrel=7
 pkgdesc="skin based on the Enigma text2skin addon"
-url="http://andreas.vdr-developer.org/enigmang/index.html"
+url="https://github.com/vdr-projects/vdr-plugin-skinenigmang"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 depends=('freetype2' 'gcc-libs' "vdr-api=${_vdrapi}")
-makedepends=('git')
 _plugname=${pkgname//vdr-/}
-source=("git+https://projects.vdr-developer.org/git/vdr-plugin-skinenigmang.git#commit=$_gitver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vdr-projects/vdr-plugin-skinenigmang/archive/refs/tags/$pkgver.tar.gz"
         'skinenigmang-search_for_logos_in_resourcedir.diff'
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-md5sums=('SKIP'
-         '6bfd86e7a92d969edd208401b65b20fe'
-         '8b2c4d67273e3b52e38496e52b35e345')
-
-pkgver() {
-  cd "${srcdir}/vdr-plugin-${_plugname}"
-  git describe --tags | sed 's/-/_/g;s/v//'
-}
+sha256sums=('853f4b47b2b2e688ec0062695f7261962c734fa894b3db4e69266986c0e20a4e'
+            'e61d17e978a01988118737f7f0c0af6aba7999c1f465940c8e1529d0bf49c6fc'
+            '134aba4b0c41beeecec0eb7f5014d58bd02a2546106474f8dd76fab26abf86b4')
 
 prepare() {
-  cd "${srcdir}/vdr-plugin-${_plugname}"
+  cd "${srcdir}/vdr-plugin-$_plugname-$pkgver"
   patch -p1 -i "$srcdir/skinenigmang-search_for_logos_in_resourcedir.diff"
-  sed -i 's/\/include\/freetype/\/include\/freetype2/g' Makefile
 }
 
-package() {
-  cd "${srcdir}/vdr-plugin-${_plugname}"
+build() {
+  cd "${srcdir}/vdr-plugin-$_plugname-$pkgver"
+  make
+}
 
-  mkdir -p "$pkgdir/$(pkg-config vdr --variable=libdir)"
-  make CFLAGS="$(pkg-config vdr --variable=cflags)" \
-       CXXFLAGS="$(pkg-config vdr --variable=cxxflags)" \
-       VDRDIR="/usr/include/vdr" \
-       LIBDIR="$pkgdir/$(pkg-config vdr --variable=libdir)" \
-       LOCALEDIR="$pkgdir/$(pkg-config vdr --variable=locdir)" \
+package() {
+  cd "${srcdir}/vdr-plugin-$_plugname-$pkgver"
+  make DESTDIR="${pkgdir}" install
 
   install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf"