gentoo resync : 07.05.2021

2 files changed, 53 insertions, 290 deletions

diff --git a/media-video/vdr/files/vdr-2.2.0_gcc11.patch b/media-video/vdr/files/vdr-2.2.0_gcc11.patch
new file mode 100644
index 000000000000..297cdceabf56
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_gcc11.patch
@@ -0,0 +1,29 @@
+Fix compile with gcc-11, officially from kls
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+
+--- a/tools.h	2021-05-05 21:48:32.382919856 +0200
++++ b/tools.h	2021-05-05 21:53:10.184522278 +0200
+@@ -50,7 +50,10 @@
+ #define CHECK(s) { if ((s) < 0) LOG_ERROR; } // used for 'ioctl()' calls
+ #define FATALERRNO (errno && errno != EAGAIN && errno != EINTR)
+ 
+-#ifndef __STL_CONFIG_H // in case some plugin needs to use the STL
++// In case some plugin needs to use the STL and gets an error message regarding one
++// of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL before
++// including any VDR header files.
++#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
+ template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
+ template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
+ template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
+--- a/recording.c	2021-05-05 22:08:23.898974097 +0200
++++ b/recording.c	2021-05-05 22:08:39.323280274 +0200
+@@ -2949,7 +2949,7 @@
+            }
+         // found a non existing file suffix
+         }
+-     if (Open() >= 0) {
++     if (Open()) {
+         if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) {
+            LOG_ERROR_STR(fileName);
+            return NULL;
diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
index 866b018b5b79..1e37b2f0010c 100644
--- a/media-video/vdr/files/vdr-2.4.7_gcc11.patch
+++ b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
@@ -1,292 +1,26 @@
-https://bugs.gentoo.org/786882
+Fix compile with gcc-11, officially from kls
 
-compile fix for gcc-11
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
 
-Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 May 2021)
-diff -Naur vdr-2.4.7.orig/channels.c vdr-2.4.7/channels.c
---- vdr-2.4.7.orig/channels.c	2021-05-02 19:34:32.312653108 +0200
-+++ vdr-2.4.7/channels.c	2021-05-02 19:39:19.241653108 +0200
-@@ -11,6 +11,7 @@
- #include <ctype.h>
- #include "device.h"
- #include "libsi/si.h"
-+using namespace std;
- 
- // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
- // format characters in order to allow any number of blanks after a numeric
-diff -Naur vdr-2.4.7.orig/ci.c vdr-2.4.7/ci.c
---- vdr-2.4.7.orig/ci.c	2021-05-02 19:34:32.313653108 +0200
-+++ vdr-2.4.7/ci.c	2021-05-02 19:49:53.216653108 +0200
-@@ -27,6 +27,8 @@
- #include "skins.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- // Set these to 'true' for debug output:
- static bool DumpTPDUDataTransfer = false;
- static bool DebugProtocol = false;
-diff -Naur vdr-2.4.7.orig/device.c vdr-2.4.7/device.c
---- vdr-2.4.7.orig/device.c	2021-05-02 19:34:32.313653108 +0200
-+++ vdr-2.4.7/device.c	2021-05-02 19:43:19.071653108 +0200
-@@ -20,6 +20,8 @@
- #include "status.h"
- #include "transfer.h"
- 
-+using namespace std;
-+
- // --- cLiveSubtitle ---------------------------------------------------------
- 
- class cLiveSubtitle : public cReceiver {
-diff -Naur vdr-2.4.7.orig/diseqc.c vdr-2.4.7/diseqc.c
---- vdr-2.4.7.orig/diseqc.c	2021-05-02 19:34:32.314653108 +0200
-+++ vdr-2.4.7/diseqc.c	2021-05-02 19:50:14.177653108 +0200
-@@ -14,6 +14,8 @@
- #include "sources.h"
- #include "thread.h"
- 
-+using namespace std;
-+
- #define ALL_DEVICES (~0) // all bits set to '1'
- #define MAX_DEVICES 32   // each bit in a 32-bit integer represents one device
- 
-diff -Naur vdr-2.4.7.orig/dvbdevice.c vdr-2.4.7/dvbdevice.c
---- vdr-2.4.7.orig/dvbdevice.c	2021-05-02 19:34:32.314653108 +0200
-+++ vdr-2.4.7/dvbdevice.c	2021-05-02 19:50:35.634653108 +0200
-@@ -21,6 +21,8 @@
- #include "menuitems.h"
- #include "sourceparams.h"
- 
-+using namespace std;
-+
- static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in use (will be determined by the first device created)
- 
- #define DVBS_TUNE_TIMEOUT  9000 //ms
-diff -Naur vdr-2.4.7.orig/dvbplayer.c vdr-2.4.7/dvbplayer.c
---- vdr-2.4.7.orig/dvbplayer.c	2021-05-02 19:34:32.314653108 +0200
-+++ vdr-2.4.7/dvbplayer.c	2021-05-02 19:43:47.344653108 +0200
-@@ -15,6 +15,8 @@
- #include "thread.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- // --- cPtsIndex -------------------------------------------------------------
- 
- #define PTSINDEX_ENTRIES 1024
-diff -Naur vdr-2.4.7.orig/dvbspu.c vdr-2.4.7/dvbspu.c
---- vdr-2.4.7.orig/dvbspu.c	2021-05-02 19:34:32.314653108 +0200
-+++ vdr-2.4.7/dvbspu.c	2021-05-02 19:44:08.952653108 +0200
-@@ -17,6 +17,8 @@
- #include <inttypes.h>
- #include <math.h>
- 
-+using namespace std;
-+
- /*
-  * cDvbSpubitmap:
-  *
-diff -Naur vdr-2.4.7.orig/dvbsubtitle.c vdr-2.4.7/dvbsubtitle.c
---- vdr-2.4.7.orig/dvbsubtitle.c	2021-05-02 19:34:32.315653108 +0200
-+++ vdr-2.4.7/dvbsubtitle.c	2021-05-02 19:44:42.537653108 +0200
-@@ -16,6 +16,8 @@
- #include "device.h"
- #include "libsi/si.h"
- 
-+using namespace std;
-+
- #define PAGE_COMPOSITION_SEGMENT    0x10
- #define REGION_COMPOSITION_SEGMENT  0x11
- #define CLUT_DEFINITION_SEGMENT     0x12
-diff -Naur vdr-2.4.7.orig/eit.c vdr-2.4.7/eit.c
---- vdr-2.4.7.orig/eit.c	2021-05-02 19:34:32.315653108 +0200
-+++ vdr-2.4.7/eit.c	2021-05-02 19:45:16.962653108 +0200
-@@ -18,6 +18,8 @@
- #include "libsi/section.h"
- #include "libsi/descriptor.h"
- 
-+using namespace std;
-+
- #define VALID_TIME (31536000 * 2) // two years
- 
- #define DBGEIT 0
-diff -Naur vdr-2.4.7.orig/font.c vdr-2.4.7/font.c
---- vdr-2.4.7.orig/font.c	2021-05-02 19:34:32.315653108 +0200
-+++ vdr-2.4.7/font.c	2021-05-02 19:51:53.540653108 +0200
-@@ -21,6 +21,8 @@
- #include "osd.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- const char *DefaultFontOsd = "Sans Serif:Bold";
- const char *DefaultFontSml = "Sans Serif";
- const char *DefaultFontFix = "Courier:Bold";
-diff -Naur vdr-2.4.7.orig/menu.c vdr-2.4.7/menu.c
---- vdr-2.4.7.orig/menu.c	2021-05-02 19:34:32.317653108 +0200
-+++ vdr-2.4.7/menu.c	2021-05-02 19:45:44.891653108 +0200
-@@ -33,6 +33,8 @@
- #include "transfer.h"
- #include "videodir.h"
- 
-+using namespace std;
-+
- #define MAXWAIT4EPGINFO   3 // seconds
- #define MODETIMEOUT       3 // seconds
- #define NEWTIMERLIMIT   120 // seconds until the start time of a new timer created from the Schedule menu,
-diff -Naur vdr-2.4.7.orig/menuitems.c vdr-2.4.7/menuitems.c
---- vdr-2.4.7.orig/menuitems.c	2021-05-02 19:34:32.318653108 +0200
-+++ vdr-2.4.7/menuitems.c	2021-05-02 19:46:02.483653108 +0200
-@@ -17,6 +17,8 @@
- #include "skins.h"
- #include "status.h"
- 
-+using namespace std;
-+
- #define AUTO_ADVANCE_TIMEOUT  1500 // ms before auto advance when entering characters via numeric keys
- 
- const char *FileNameChars = trNOOP("FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&");
-diff -Naur vdr-2.4.7.orig/mtd.c vdr-2.4.7/mtd.c
---- vdr-2.4.7.orig/mtd.c	2021-05-02 19:34:32.318653108 +0200
-+++ vdr-2.4.7/mtd.c	2021-05-02 19:46:23.355653108 +0200
-@@ -10,6 +10,8 @@
- #include "mtd.h"
- #include "receiver.h"
- 
-+using namespace std;
-+
- //#define DEBUG_MTD
- #ifdef DEBUG_MTD
- #define DBGMTD(a...) dsyslog(a)
-diff -Naur vdr-2.4.7.orig/nit.c vdr-2.4.7/nit.c
---- vdr-2.4.7.orig/nit.c	2021-05-02 19:34:32.318653108 +0200
-+++ vdr-2.4.7/nit.c	2021-05-02 19:52:19.012653108 +0200
-@@ -16,6 +16,8 @@
- #include "libsi/descriptor.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- #define DVB_SYSTEM_1 0 // see also dvbdevice.c
- #define DVB_SYSTEM_2 1
- 
-diff -Naur vdr-2.4.7.orig/osd.c vdr-2.4.7/osd.c
---- vdr-2.4.7.orig/osd.c	2021-05-02 19:34:32.318653108 +0200
-+++ vdr-2.4.7/osd.c	2021-05-02 19:47:12.501653108 +0200
-@@ -16,6 +16,8 @@
- #include "device.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- tColor HsvToColor(double H, double S, double V)
- {
-   if (S > 0) {
-diff -Naur vdr-2.4.7.orig/osdbase.c vdr-2.4.7/osdbase.c
---- vdr-2.4.7.orig/osdbase.c	2021-05-02 19:34:32.318653108 +0200
-+++ vdr-2.4.7/osdbase.c	2021-05-02 19:46:53.516653108 +0200
-@@ -15,6 +15,8 @@
- #include "remote.h"
- #include "status.h"
- 
-+using namespace std;
-+
- // --- cOsdItem --------------------------------------------------------------
- 
- cOsdItem::cOsdItem(eOSState State)
-diff -Naur vdr-2.4.7.orig/recording.c vdr-2.4.7/recording.c
---- vdr-2.4.7.orig/recording.c	2021-05-02 19:34:32.323653108 +0200
-+++ vdr-2.4.7/recording.c	2021-05-02 19:47:45.990653108 +0200
-@@ -31,6 +31,8 @@
- #include "tools.h"
- #include "videodir.h"
- 
-+using namespace std;
-+
- #define SUMMARYFALLBACK
- 
- #define RECEXT       ".rec"
-diff -Naur vdr-2.4.7.orig/remux.c vdr-2.4.7/remux.c
---- vdr-2.4.7.orig/remux.c	2021-05-02 19:34:32.323653108 +0200
-+++ vdr-2.4.7/remux.c	2021-05-02 19:48:03.230653108 +0200
-@@ -16,6 +16,8 @@
- #include "shutdown.h"
- #include "tools.h"
- 
-+using namespace std;
-+
- // Set these to 'true' for debug output:
- static bool DebugPatPmt = false;
- static bool DebugFrames = false;
-diff -Naur vdr-2.4.7.orig/skinclassic.c vdr-2.4.7/skinclassic.c
---- vdr-2.4.7.orig/skinclassic.c	2021-05-02 19:34:32.324653108 +0200
-+++ vdr-2.4.7/skinclassic.c	2021-05-02 19:48:26.271653108 +0200
-@@ -14,6 +14,8 @@
- #include "themes.h"
- #include "videodir.h"
- 
-+using namespace std;
-+
- #define ScrollWidth (Setup.FontOsdSize / 4)
- #define TextFrame   (Setup.FontOsdSize / 10)
- #define TextSpacing (Setup.FontOsdSize / 4)
-diff -Naur vdr-2.4.7.orig/skinlcars.c vdr-2.4.7/skinlcars.c
---- vdr-2.4.7.orig/skinlcars.c	2021-05-02 19:34:32.324653108 +0200
-+++ vdr-2.4.7/skinlcars.c	2021-05-02 19:48:46.063653108 +0200
-@@ -63,6 +63,8 @@
- #include "symbols/teletext.xpm"
- #include "symbols/volume.xpm"
- 
-+using namespace std;
-+
- #define Gap            (Setup.FontOsdSize / 5 & ~1) // must be even
- #define TextFrame      (Setup.FontOsdSize / TEXT_ALIGN_BORDER)
- #define TextSpacing    (2 * TextFrame)
-diff -Naur vdr-2.4.7.orig/skinsttng.c vdr-2.4.7/skinsttng.c
---- vdr-2.4.7.orig/skinsttng.c	2021-05-02 19:34:32.324653108 +0200
-+++ vdr-2.4.7/skinsttng.c	2021-05-02 19:49:15.256653108 +0200
-@@ -50,6 +50,8 @@
- #include "symbols/teletext.xpm"
- #include "symbols/volume.xpm"
- 
-+using namespace std;
-+
- #define Roundness     (Setup.FontOsdSize / 2)
- #define Gap           (Setup.FontOsdSize / 5)
- #define ScrollWidth   (Setup.FontOsdSize / 4)
-diff -Naur vdr-2.4.7.orig/thread.c vdr-2.4.7/thread.c
---- vdr-2.4.7.orig/thread.c	2021-05-02 19:59:16.883653108 +0200
-+++ vdr-2.4.7/thread.c	2021-05-02 20:00:08.879653108 +0200
-@@ -24,6 +24,8 @@
- #include <unistd.h>
- #include "tools.h"
- 
-+using namespace std;
-+
- #define ABORT { dsyslog("ABORT!"); cBackTrace::BackTrace(); abort(); }
- 
- //#define DEBUG_LOCKING  // uncomment this line to activate debug output for locking
-diff -Naur vdr-2.4.7.orig/timers.c vdr-2.4.7/timers.c
---- vdr-2.4.7.orig/timers.c	2021-05-02 19:59:16.883653108 +0200
-+++ vdr-2.4.7/timers.c	2021-05-02 19:59:52.287653108 +0200
-@@ -17,6 +17,8 @@
- #include "status.h"
- #include "svdrp.h"
- 
-+using namespace std;
-+
- // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
- // format characters in order to allow any number of blanks after a numeric
- // value!
-diff -Naur vdr-2.4.7.orig/tools.c vdr-2.4.7/tools.c
---- vdr-2.4.7.orig/tools.c	2021-05-02 20:02:40.535653108 +0200
-+++ vdr-2.4.7/tools.c	2021-05-02 20:03:06.859653108 +0200
-@@ -28,6 +28,8 @@
- #include "i18n.h"
- #include "thread.h"
- 
-+using namespace std;
-+
- int SysLogLevel = 3;
- 
- #define MAXSYSLOGBUF 256
+--- a/tools.h     2021/01/19 20:38:28     5.3
++++ b/tools.h     2021/05/05 15:16:45
+@@ -53,17 +53,15 @@
+
+ // In case some plugin needs to use the STL and gets an error message regarding one
+ // of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL before
+-// including tools.h.
+-#if !defined(__STL_CONFIG_H) // for old versions of the STL
+-#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_STL_ALGOBASE_H)
++// including any VDR header files.
++#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
+ template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
+ template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
+ #endif
+ template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
+-#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_MOVE_H)
++#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
+ template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
+ #endif
+-#endif
+
+ template<class T> inline T constrain(T v, T l, T h) { return v < l ? l : v > h ? h : v; }