Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/6711f4f666860a599709ce4eb85ba446ccf6a849)

3 files changed, 6 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66f5c3f78ebe..dd7f1a2c0aea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.2.2
-# Wed Dec 23 12:24:09 UTC 2020
+# Fri Jan 15 13:58:24 UTC 2021
 pkgbase = vdr-skinflatplus
 	pkgdesc = Simple and slim skin for VDR
-	pkgver = 0.6.0.r41.gce0be9e3
+	pkgver = 0.6.0.r42.g3e905e29
 	pkgrel = 1
 	url = https://github.com/MegaV0lt/vdr-plugin-skinflatplus
 	arch = x86_64
@@ -20,11 +20,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=ce0be9e3e90735271b5602f2877306283f8024b6
-	source = vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch
+	source = git+https://github.com/MegaV0lt/vdr-plugin-skinflatplus.git#commit=3e905e29af98d79e0bc57e0810a5a919b9e1f01d
 	source = 50-skinflatplus.conf
 	sha256sums = SKIP
-	sha256sums = 55ee7dfcb59bdf3ea19703a3c0bbeddf17e3bb3b3233c9774a323fdc2045a522
 	sha256sums = 6f6f9699cbc73d73d34c4e17183d3f03b1553a2b8caa62ee881354f2ac12bd8d
 
 pkgname = vdr-skinflatplus
diff --git a/PKGBUILD b/PKGBUILD
index d4a2448005b7..c2cb74efe239 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-skinflatplus
-pkgver=0.6.0.r41.gce0be9e3
-_gitver=ce0be9e3e90735271b5602f2877306283f8024b6
+pkgver=0.6.0.r42.g3e905e29
+_gitver=3e905e29af98d79e0bc57e0810a5a919b9e1f01d
 _vdrapi=2.4.6
 pkgrel=1
 pkgdesc="Simple and slim skin for VDR"
@@ -14,13 +14,11 @@ depends=('fontconfig' 'graphicsmagick' "vdr-api=${_vdrapi}")
 makedepends=('git')
 _plugname=${pkgname//vdr-/}
 source=("git+https://github.com/MegaV0lt/vdr-plugin-skinflatplus.git#commit=$_gitver"
-        "$pkgname-graphicsmagick-1.3.32-compat.patch"
         "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'
-            '55ee7dfcb59bdf3ea19703a3c0bbeddf17e3bb3b3233c9774a323fdc2045a522'
             '6f6f9699cbc73d73d34c4e17183d3f03b1553a2b8caa62ee881354f2ac12bd8d')
 
 pkgver() {
@@ -38,15 +36,9 @@ pkgver() {
   fi
 }
 
-prepare() {
-  cd "$srcdir/vdr-plugin-$_plugname"
-  patch -p1 -i ${srcdir}/${pkgname}-graphicsmagick-1.3.32-compat.patch
-  sed -i 's/Magick++/GraphicsMagick++/g' Makefile
-}
-
 build() {
   cd "$srcdir/vdr-plugin-$_plugname"
-  make
+  make IMAGELIB=graphicsmagick
 }
 
 package() {
diff --git a/vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch b/vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch
deleted file mode 100644
index 14aa4244b696..000000000000
--- a/vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/imageloader.c
-+++ b/imageloader.c
-@@ -8,7 +8,6 @@
- using namespace Magick;
- 
- cImageLoader::cImageLoader() {
--    InitializeMagick(NULL);
-     logoExtension = "png";
- }
- 
---- a/imagemagickwrapper.c
-+++ b/imagemagickwrapper.c
-@@ -4,7 +4,6 @@
- #include "imagescaler.h"
- 
- cImageMagickWrapper::cImageMagickWrapper() {
--    InitializeMagick(NULL);
- }
- 
- cImageMagickWrapper::~cImageMagickWrapper() {
---- a/skinflatplus.c
-+++ b/skinflatplus.c
-@@ -7,6 +7,7 @@
-  */
- #include <getopt.h>
- #include <vdr/plugin.h>
-+#include <Magick++.h>
- 
- #if defined(APIVERSNUM) && APIVERSNUM < 10734
- #error "VDR-1.7.34 API version or greater is required!"
-@@ -76,6 +77,11 @@ bool cPluginFlat::ProcessArgs(int argc, char *argv[]) {
-     return true;
- }
- 
-+__attribute__((constructor)) static void init(void) {
-+   Magick::InitializeMagick(NULL);
-+}
-+
-+
- bool cPluginFlat::Initialize(void) {
-     Config.Init();
-     return true;