jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdr-plugin-xmltv2vdr: update to 0.2.2

Browse Source
This commit is contained in:
Rudi Heitbaum 2023-11-08 13:47:25 +00:00
parent f3c0f20654
commit 4960b896e9
3 changed files with 13 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-xmltv2vdr"
PKG_VERSION="ec7bd920d94e55f2d21bfa076b7e900b7b2b7537"
PKG_SHA256="eacc91062095563d8adc93873b373ddb34b076a8c0a9e5a86f6220d1d5d892e9"
PKG_VERSION="0.2.2"
PKG_SHA256="f12a1af9b3cd5aa6eaa46b81721efa3a0495393378bd766e2449593226076e1e"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
PKG_URL="https://github.com/vdr-projects/vdr-plugin-xmltv2vdr/archive/${PKG_VERSION}.tar.gz"

11
packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01-fix-makefile.patch Normal file
View File

@ -0,0 +1,11 @@
--- vdr-plugin-xmltv2vdr-0.2.2/Makefile 2023-09-29 18:10:08.000000000 +0000
+++ vdr-plugin-xmltv2vdr-0.2.2/Makefile 2023-11-08 14:02:23.031530482 +0000
@@ -53,6 +53,8 @@
PKG-LIBS += libxml-2.0 libpcrecpp sqlite3
PKG-INCLUDES += libxml-2.0 libpcrecpp sqlite3
+INCLUDES += -I$(VDRDIR)/include
+
DEFINES += -D_GNU_SOURCE -D_XOPEN_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKG-INCLUDES))

74
packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-02_gcc721_fixes.patch
View File

@ -1,74 +0,0 @@
taken from https://github.com/VDR4Arch/vdr4arch/blob/vdr-stable/plugins/vdr-xmltv2vdr/xmltv2vdr_gcc721_fixes.diff
fixes
event.cpp: In member function 'void cXMLTVEvent::GetSQL(const char*, int, const char*, char**, char**)':
event.cpp:531:5: error: 'string' was not declared in this scope
string si=sql_insert;
^~~~~~
diff --git a/dist/epgdata2xmltv/epgdata2xmltv.cpp b/dist/epgdata2xmltv/epgdata2xmltv.cpp
index de6fb26..ec465fb 100644
--- a/dist/epgdata2xmltv/epgdata2xmltv.cpp
+++ b/dist/epgdata2xmltv/epgdata2xmltv.cpp
@@ -561,7 +561,7 @@ int cepgdata2xmltv::Process(int argc, char *argv[])
enca_analyser_free(analyser);
}
- string s = xmlmem;
+ std::string s = xmlmem;
int reps=pcrecpp::RE("&(?![a-zA-Z]{1,8};)").GlobalReplace("%amp;",&s);
if (reps) {
xmlmem = (char *)realloc(xmlmem, s.size()+1);
diff --git a/event.cpp b/event.cpp
index ae33002..1df43ec 100644
--- a/event.cpp
+++ b/event.cpp
@@ -528,7 +528,7 @@ void cXMLTVEvent::GetSQL(const char *Source, int SrcIdx, const char *ChannelID,
return;
}
- string si=sql_insert;
+ std::string si=sql_insert;
int ireps;
ireps=pcrecpp::RE("'").GlobalReplace("''",&si);
ireps+=pcrecpp::RE("\\^").GlobalReplace("'",&si);
@@ -540,7 +540,7 @@ void cXMLTVEvent::GetSQL(const char *Source, int SrcIdx, const char *ChannelID,
}
*Insert=sql_insert;
- string su=sql_update;
+ std::string su=sql_update;
int ureps;
ureps=pcrecpp::RE("'").GlobalReplace("''",&su);
ureps+=pcrecpp::RE("\\^").GlobalReplace("'",&su);
diff --git a/import.cpp b/import.cpp
index 0d6f7bf..e417c59 100644
--- a/import.cpp
+++ b/import.cpp
@@ -1401,7 +1401,7 @@ bool cImport::UpdateXMLTVEvent(cEPGSource *Source, sqlite3 *Db, cXMLTVEvent *xEv
return false;
}
- string ed=shortdesc;
+ std::string ed=shortdesc;
int reps;
reps=pcrecpp::RE("'").GlobalReplace("''",&ed);
@@ -1511,7 +1511,7 @@ bool cImport::UpdateXMLTVEvent(cEPGSource *Source, sqlite3 *Db, const cEvent *Ev
return false;
}
- string ed=eitdescription;
+ std::string ed=eitdescription;
int reps;
reps=pcrecpp::RE("'").GlobalReplace("''",&ed);
@@ -1649,7 +1649,7 @@ cXMLTVEvent *cImport::SearchXMLTVEvent(sqlite3 **Db,const char *ChannelID, const
return NULL;
}
- string st=sqltitle;
+ std::string st=sqltitle;
int reps;
reps=pcrecpp::RE("'").GlobalReplace("''",&st);