[vdr-plugin-xineliboutput] 07/10: Dropped truecolor.diff - fixed upstream

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-xineliboutput.

commit f510b669d8e11998e80a4f3e77d3fbbf4b6885a7
Author: Tobias Grimm <etobi at debian.org>
Date:   Tue Jan 31 23:17:51 2017 +0100

    Dropped truecolor.diff - fixed upstream
---
 debian/patches/series         |  1 -
 debian/patches/truecolor.diff | 80 -------------------------------------------
 2 files changed, 81 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 41a60a3..5df0836 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable-po-update.patch
-truecolor.diff
 libcec3.patch
diff --git a/debian/patches/truecolor.diff b/debian/patches/truecolor.diff
deleted file mode 100644
index 2a4c72a..0000000
--- a/debian/patches/truecolor.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Adds a --truecolor option to force true color even if no client is connected
-Author: balta @ vdr-portal.de
-Origin: http://www.vdr-portal.de/board1-news/board101-news-archiv/p1151593-announce-nopacity-0-1-2/#post1151593
-
-ur xineliboutput-1.0.90.git.1355089073/config.c xineliboutput-1.0.90.git.1355089073.patched/config.c
-Index: vdr-plugin-xineliboutput/config.c
-===================================================================
---- vdr-plugin-xineliboutput.orig/config.c	2015-09-08 00:14:44.678572816 +0200
-+++ vdr-plugin-xineliboutput/config.c	2015-09-08 00:14:44.662572871 +0200
-@@ -741,7 +741,7 @@
- 
- bool config_t::ProcessArgs(int argc, char *argv[])
- {
--  static const char short_options[] = "fDw:h:l:mr:A:V:d:P:C:pc";
-+  static const char short_options[] = "fDw:h:l:mr:A:V:d:P:C:pct";
- 
-   static const struct option long_options[] = {
-       { "fullscreen",   no_argument,       NULL, 'f' },
-@@ -764,6 +764,7 @@
-       { "config",       required_argument, NULL, 'C' },
-       { "primary",      no_argument,       NULL, 'p' },
-       { "exit-on-close",no_argument,       NULL, 'c' },
-+      { "truecolor",    no_argument,       NULL, 't' },
-       { NULL,           no_argument,       NULL,  0  }
-     };
- 
-@@ -781,6 +782,8 @@
-               break;
-     case 'f': ProcessArg("Fullscreen", "1");
-               break;
-+    case 't': ProcessArg("truecoloreverytime", "1");
-+	      break;
-     case 'D': ProcessArg("X11.HUDOSD", "1");
-               if (optarg && strstr(optarg, "xshape")) {
-                 ProcessArg("XShapeHUDOSD", "1");
-@@ -899,6 +902,7 @@
-   else if (!strcasecmp(Name, "X11.OpenglAlways")) opengl = atoi(Value);
-   else if (!strcasecmp(Name, "X11.OpenglHUDOSD")) hud_osd |= (atoi(Value) ? HUD_OPENGL : 0);
-   else if (!strcasecmp(Name, "X11.XShapeHUDOSD")) hud_osd |= (atoi(Value) ? HUD_XSHAPE : 0);
-+  else if (!strcasecmp(Name, "truecoloreverytime")) truecoloreverytime = atoi(Value);
- 
-   else if (!strcasecmp(Name, "Audio.Driver")) STRN0CPY(audio_driver, Value);
-   else if (!strcasecmp(Name, "Audio.Port"))   STRN0CPY(audio_port, Value);
-Index: vdr-plugin-xineliboutput/config.h
-===================================================================
---- vdr-plugin-xineliboutput.orig/config.h	2015-09-08 00:14:44.678572816 +0200
-+++ vdr-plugin-xineliboutput/config.h	2015-09-08 00:14:44.674572830 +0200
-@@ -294,6 +294,7 @@
-     int  window_id;        // use existing X11 window
-     int  hud_osd;          // head up display OSD
-     int  opengl;           // use opengl acceleration for video and HUD OSD
-+    int  truecoloreverytime;
- 
-     // Audio settings
-     int  speaker_type;
-Index: vdr-plugin-xineliboutput/frontend_svr.c
-===================================================================
---- vdr-plugin-xineliboutput.orig/frontend_svr.c	2015-09-08 00:14:44.678572816 +0200
-+++ vdr-plugin-xineliboutput/frontend_svr.c	2015-09-08 00:14:44.678572816 +0200
-@@ -783,7 +783,7 @@
-         has_clients++;
-     }
- 
--  return has_clients ? 1 : -1;
-+  return has_clients || xc.truecoloreverytime ? 1 : -1;
- }
- 
- int cXinelibServer::PlayFileCtrl(const char *Cmd, int TimeoutMs)
-Index: vdr-plugin-xineliboutput/xineliboutput.c
-===================================================================
---- vdr-plugin-xineliboutput.orig/xineliboutput.c	2015-09-08 00:14:44.678572816 +0200
-+++ vdr-plugin-xineliboutput/xineliboutput.c	2015-09-08 00:14:44.678572816 +0200
-@@ -160,6 +160,7 @@
- "                           there are active frontend(s)\n"
- "  -c        --exit-on-close  Exit vdr when local frontend window is closed\n"
- "  -C        --config=file  Use xine-lib config file\n"
-+"  -t        --truecolor    Support True Color OSD if no client is connected\n"
- ;
- 
- const char *cPluginXinelibOutput::CommandLineHelp(void)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-xineliboutput.git