Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/1e60aa08d840bb2d9ee1f490dac364ffdd01a823)

3 files changed, 54 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfa5e45053b7..2847a2d618e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.1.3
-# Tue Jun 18 20:49:51 UTC 2019
+# Sat Oct 12 17:30:24 UTC 2019
 pkgbase = vdr-skinflatplus
 	pkgdesc = Simple and slim skin for VDR
-	pkgver = 0.6.0.r12.g5a8c1819
-	pkgrel = 2
+	pkgver = 0.6.0.r13.g9f49ddbd
+	pkgrel = 1
 	url = http://projects.vdr-developer.org/projects/plg-skinflatplus
 	arch = x86_64
 	arch = i686
@@ -20,9 +20,11 @@ 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://projects.vdr-developer.org/skin-flatplus.git#commit=5a8c1819d963bc78c317b98dd2e77be68bad1549
+	source = git://projects.vdr-developer.org/skin-flatplus.git#commit=9f49ddbd7ce4969c713d850a7b17123b17f3288f
+	source = vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch
 	source = 50-skinflatplus.conf
 	md5sums = SKIP
+	md5sums = e646c28a172c63debdfec1ea9f7df5ac
 	md5sums = 878594e0f5af2ab308e6ab86a9bf0136
 
 pkgname = vdr-skinflatplus
diff --git a/PKGBUILD b/PKGBUILD
index 03eeb348e0c8..08930bca8571 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-skinflatplus
-pkgver=0.6.0.r12.g5a8c1819
-_gitver=5a8c1819d963bc78c317b98dd2e77be68bad1549
+pkgver=0.6.0.r13.g9f49ddbd
+_gitver=9f49ddbd7ce4969c713d850a7b17123b17f3288f
 _vdrapi=2.4.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Simple and slim skin for VDR"
 url="http://projects.vdr-developer.org/projects/plg-skinflatplus"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -14,11 +14,13 @@ depends=('fontconfig' 'graphicsmagick' "vdr-api=${_vdrapi}")
 makedepends=('git')
 _plugname=${pkgname//vdr-/}
 source=("git://projects.vdr-developer.org/skin-flatplus.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})
 md5sums=('SKIP'
+         'e646c28a172c63debdfec1ea9f7df5ac'
          '878594e0f5af2ab308e6ab86a9bf0136')
 
 pkgver() {
@@ -38,6 +40,7 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/skin-flatplus"
+  patch -p1 -i ${srcdir}/${pkgname}-graphicsmagick-1.3.32-compat.patch
   sed -i 's/Magick++/GraphicsMagick++/g' Makefile
 }
 
diff --git a/vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch b/vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch
new file mode 100644
index 000000000000..14aa4244b696
--- /dev/null
+++ b/vdr-skinflatplus-graphicsmagick-1.3.32-compat.patch
@@ -0,0 +1,42 @@
+--- 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;