Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/414bae13b382ffd1b60e0ec080c311621e3c2da4)

3 files changed, 19 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8839d015b08..e02b97e733e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by makepkg 5.2.2
-# Wed Dec 23 12:27:59 UTC 2020
+# Sat May  1 09:42:27 UTC 2021
 pkgbase = vdr-targavfd
-	pkgdesc = shows information about the current state of VDR on Targa USB Graphic Vacuum Fluorescent Display
-	pkgver = 0.3.1
-	pkgrel = 5
+	pkgdesc = Shows information about the current state of VDR on Targa USB Graphic Vacuum Fluorescent Display
+	pkgver = 0.3.2
+	pkgrel = 1
 	epoch = 1
-	url = http://projects.vdr-developer.org/projects/show/plg-targavfd
+	url = https://github.com/vdr-projects/vdr-plugin-targavfd
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -15,14 +15,12 @@ pkgbase = vdr-targavfd
 	depends = fontconfig
 	depends = freetype2
 	depends = libusb
-	depends = vdr-api=2.4.6
+	depends = vdr-api=2.4.7
 	backup = etc/vdr/conf.avail/50-targavfd.conf
-	source = https://projects.vdr-developer.org/attachments/download/2087/vdr-targavfd-0.3.1.tgz
-	source = targavfd-freetype-2.9.1-fix.diff
+	source = vdr-targavfd-0.3.2.tar.gz::https://github.com/vdr-projects/vdr-plugin-targavfd/archive/refs/tags/0.3.2.tar.gz
 	source = 92-targavfd.rules
-	md5sums = ddd4893d206039c6738e7e81d2aac811
-	md5sums = 7fa986311cba912c95f601e90d36e8b5
-	md5sums = ee53f6e044af746a1e518937edc9a341
+	sha256sums = 1fae0afa633fa83632f2cfb82376614355a686a59740eaa9173c82faeb84673b
+	sha256sums = 01806805d602c4e97fed9318bd0d2c2f1d6ea92bf241a702bb086c7ebd0d5e99
 
 pkgname = vdr-targavfd
 
diff --git a/PKGBUILD b/PKGBUILD
index 29546ac6a67b..fc812db661f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,29 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-targavfd
-pkgver=0.3.1
+pkgver=0.3.2
 epoch=1
-_vdrapi=2.4.6
-pkgrel=5
-pkgdesc="shows information about the current state of VDR on Targa USB Graphic Vacuum Fluorescent Display"
-url="http://projects.vdr-developer.org/projects/show/plg-targavfd"
+_vdrapi=2.4.7
+pkgrel=1
+pkgdesc="Shows information about the current state of VDR on Targa USB Graphic Vacuum Fluorescent Display"
+url="https://github.com/vdr-projects/vdr-plugin-targavfd"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL3')
 depends=('fontconfig' 'freetype2' 'libusb' "vdr-api=${_vdrapi}")
 _plugname=${pkgname//vdr-/}
-source=("https://projects.vdr-developer.org/attachments/download/2087/$pkgname-$pkgver.tgz"
-        'targavfd-freetype-2.9.1-fix.diff'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vdr-projects/vdr-plugin-targavfd/archive/refs/tags/$pkgver.tar.gz"
         '92-targavfd.rules')
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-md5sums=('ddd4893d206039c6738e7e81d2aac811'
-         '7fa986311cba912c95f601e90d36e8b5'
-         'ee53f6e044af746a1e518937edc9a341')
-
-prepare() {
-  cd "$srcdir/$_plugname-$pkgver"
-  patch -p1 -i "${srcdir}/targavfd-freetype-2.9.1-fix.diff"
-}
+sha256sums=('1fae0afa633fa83632f2cfb82376614355a686a59740eaa9173c82faeb84673b'
+            '01806805d602c4e97fed9318bd0d2c2f1d6ea92bf241a702bb086c7ebd0d5e99')
 
 build() {
-  cd "$srcdir/$_plugname-$pkgver"
+  cd "$srcdir/vdr-plugin-$_plugname-$pkgver"
   make
 }
 
 package() {
-  cd "$srcdir/$_plugname-$pkgver"
+  cd "$srcdir/vdr-plugin-$_plugname-$pkgver"
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/92-targavfd.rules" "$pkgdir/usr/lib/udev/rules.d/92-targavfd.rules"
diff --git a/targavfd-freetype-2.9.1-fix.diff b/targavfd-freetype-2.9.1-fix.diff
deleted file mode 100644
index 6911baa7bbd8..000000000000
--- a/targavfd-freetype-2.9.1-fix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fa9c75b..f108cee 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,8 +54,8 @@ SOFILE = libvdr-$(PLUGIN).so
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES += $(shell freetype-config --cflags)
--LIBS += $(shell freetype-config --libs)
-+INCLUDES += $(shell pkg-config freetype2 --cflags)
-+LIBS += $(shell pkg-config freetype2 --libs)
- 
- INCLUDES += $(shell pkg-config --cflags libusb-1.0)
- LIBS += $(shell pkg-config --libs libusb-1.0)