2022-01-03: version 1.2.4 (horchi)\n - change: Removed dependency to mysql-compat package\n\n1.2.4

7 files changed, 33 insertions, 27 deletions

diff --git a/HISTORY.h b/HISTORY.h
index 34f0292..f01b745 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.2.3"
-#define VERSION_DATE "01.01.2022"
+#define _VERSION     "1.2.4"
+#define VERSION_DATE "03.01.2022"
 
 #define DB_API 7
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2022-01-03: version 1.2.4 (horchi)
+   - change: Removed dependency to mysql-compat package
+
 2022-01-02: version 1.2.3 (horchi)
    - change: Removed timer start margin for switch timers
 
diff --git a/Make.config b/Make.config
index b60af0f..c369a0d 100644
--- a/Make.config
+++ b/Make.config
@@ -12,18 +12,25 @@ PREFIX = /usr/local
 # enable AUX patch, in VDR >= 2.3.4 not needed!
 #WITH_AUX_PATCH = 1
 
-# enable graphtftng and/or pin plugin support if autodetection below don't work
-#WITH_GTFT = 1
+# enable pin plugin support if autodetection below don't work
+
 #WITH_PIN  = 1
 
 DEBUG = 1
+# ------------------
+# internals
+
+SQLCFG = mariadb-config
+
+ifdef MYSQL
+  SQLCFG = mysql_config
+endif
+
 #USE_CLANG = 1
 
 # set python interpreter
-PYTHON ?= python
 
-# -----------------------
-# don't touch below ;)
+PYTHON ?= python
 
 ifdef USE_CLANG
   CC = clang++
diff --git a/Makefile b/Makefile
index 931aabe..78f8f20 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ LIBS += $(HLIB)
 LIBS += -lrt -larchive -lcrypto
 LIBS += $(shell pkg-config --libs uuid)
 LIBS += $(shell pkg-config --libs tinyxml2)
-LIBS += $(shell mysql_config --libs_r)
+LIBS += $(shell $(SQLCFG) --libs_r)
 ifdef USEPYTHON
   CFLAGS += $(shell $(PYTHON)-config --includes)
   LIBS += $(PYTHON_LIBS)
@@ -106,7 +106,7 @@ SOFILE = libvdr-$(PLUGIN).so
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += $(shell mysql_config --include)
+INCLUDES += $(shell $(SQLCFG) --include)
 
 DEFINES += -DEPG2VDR -DLOG_PREFIX='"$(PLUGIN): "' $(USES)
 
diff --git a/README b/README
index 4a071d6..b0d9186 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ Requirements:
 -------------
 
   - VDR 1.7.27+     (since it use the EPG handler interface)
-  - libmysql >= 5.07
+  - libmariadb >= 10.x
   - libarchive
   - python libpython libpython-dev python-dev
   - libjansson4 libjansson-dev
@@ -29,7 +29,7 @@ Requirements:
 
 Ubuntu (16.04):
   - libarchive13, libarchive-dev
-  - libmysqlclient-dev libmysqlclient18
+  - libmariadb-dev mariadb-common
   - libjansson4 libjansson-dev
   - python libpython libpython-dev python-dev
   - uuid-dev
@@ -39,7 +39,7 @@ Description:
 ------------
 
 This plugin is used to retrieve EPG data into the VDR. The EPG data
-was loaded from a mysql database.
+was loaded from a mariadb database.
 
 Setup Menu:
 -----------
@@ -49,7 +49,7 @@ Setup Menu:
 
   Update DVB EPG Database
       Master/Slave Mode (one client should be master, e.g. 24/7 Server, all others slave)
-        - auto: Normally first VDR will be master - the master transfers the DVB events to the mySQL Server
+        - auto: Normally first VDR will be master - the master transfers the DVB events to the mariadb Server
         - yes: Master mode on
         - no: Master mode off
       Make sure that only one VDR will be master or you run into DB performance issues. Makes just sense, if you have different channels on your clients.
@@ -57,11 +57,11 @@ Setup Menu:
   Show In Main Menu
       Shows entry in main menu to perform update manually
 
-  MySQL Host
-      IP of mySQL Server
+  MariaDb Host
+      IP of mariadb Server
 
   Port
-      Port of your mySQL Server
+      Port of your mariadb Server
 
   Database Name
       Database name
@@ -76,7 +76,7 @@ Setup Menu:
       Blacklist (like noepg-plug) all channels which not listst in the channelmap table
 
   LoadImages
-      Load images from MySQL-Server to local file system
+      Load images from MariaDb-Server to local file system
 
   Prohibit Shutdown On Busy 'epgd'
       Don't shutdown VDR while epgd is busy
@@ -101,7 +101,7 @@ throwing away local changes and update to latest source:
 	git reset --hard
 	git pull
 
-setup.conf (put the IP of your mySQL server):
+setup.conf (put the IP of your MariaDb server):
 ---------------------------------------------
 
   epg2vdr.UpdateTime = 2
diff --git a/lib/Makefile b/lib/Makefile
index 6c00449..f3ab6dd 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -26,7 +26,7 @@ CFLAGS += $(shell pkg-config --cflags uuid)
 CFLAGS += $(shell pkg-config --cflags zlib)
 
 BASELIBS += -lrt
-BASELIBS += $(shell mysql_config --libs_r)
+BASELIBS += $(shell $(SQLCFG) --libs_r)
 BASELIBS += $(shell pkg-config --libs uuid)
 BASELIBS += $(shell pkg-config --libs zlib)
 BASELIBS += $(PYTHON_LIBS)
@@ -53,7 +53,7 @@ ifdef SYSD_NOTIFY
    CFLAGS += $(shell pkg-config --cflags libsystemd-daemon)
 endif
 
-CFLAGS += $(shell mysql_config --include)
+CFLAGS += $(shell $(SQLCFG) --include)
 DEFINES += $(USES)
 
 all: lib $(TEST) $(DEMO)
diff --git a/lib/db.h b/lib/db.h
index 8c95882..17c6b25 100644
--- a/lib/db.h
+++ b/lib/db.h
@@ -5,8 +5,7 @@
  *
  */
 
-#ifndef __DB_H
-#define __DB_H
+#pragma once
 
 #include <linux/unistd.h>
 
@@ -16,7 +15,7 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 
 #include <list>
 
@@ -1368,6 +1367,3 @@ class cDbProcedure : public cDbService
       char* name;
 
 };
-
-//***************************************************************************
-#endif //__DB_H
diff --git a/update.h b/update.h
index 181319f..173763f 100644
--- a/update.h
+++ b/update.h
@@ -8,7 +8,7 @@
 #ifndef __UPDATE_H
 #define __UPDATE_H
 
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <queue>
 
 #include <vdr/status.h>