[vdr-plugin-xineliboutput] 04/04: Added truecolor patch to add a --truecolor option which forces true color even if no client is conncected (required by some skins)
Tobias Grimm
tiber-guest at moszumanska.debian.org
Mon Sep 7 22:31:31 UTC 2015
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 fe572901d0c65ff312038fac2c0fac062fd6d4fc
Author: etobi <git at e-tobi.net>
Date: Tue Sep 8 00:18:58 2015 +0200
Added truecolor patch to add a --truecolor option which forces true color even if no client is conncected (required by some skins)
---
debian/changelog | 6 ++-
debian/patches/Makfile-fixes.patch | 6 +--
debian/patches/series | 2 +-
debian/patches/truecolor.diff | 80 ++++++++++++++++++++++++++++++++++
debian/patches/vdr-2.1.10-compat.patch | 17 --------
5 files changed, 88 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5da9fc5..6181a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-vdr-plugin-xineliboutput (1.1.0+cvs20150907-1) UNRELEASED; urgency=medium
+vdr-plugin-xineliboutput (1.1.0+cvs20150907-1) unstable; urgency=medium
* New Upstream Snapshot
* Fixed get-vcs-snapshot
+ * Added truecolor patch to add a --truecolor option which forces true color
+ even if no client is conncected (required by some skins)
- -- Tobias Grimm <etobi at debian.org> Mon, 07 Sep 2015 23:57:30 +0200
+ -- Tobias Grimm <etobi at debian.org> Tue, 08 Sep 2015 00:18:47 +0200
vdr-plugin-xineliboutput (1.1.0+cvs20150211-4) unstable; urgency=medium
diff --git a/debian/patches/Makfile-fixes.patch b/debian/patches/Makfile-fixes.patch
index 5647938..23342e0 100644
--- a/debian/patches/Makfile-fixes.patch
+++ b/debian/patches/Makfile-fixes.patch
@@ -1,10 +1,10 @@
Index: vdr-plugin-xineliboutput/Makefile
===================================================================
---- vdr-plugin-xineliboutput.orig/Makefile 2015-02-11 21:53:07.170652840 +0100
-+++ vdr-plugin-xineliboutput/Makefile 2015-02-11 22:39:02.663204016 +0100
+--- vdr-plugin-xineliboutput.orig/Makefile 2015-09-08 00:00:31.417996386 +0200
++++ vdr-plugin-xineliboutput/Makefile 2015-09-08 00:00:31.417996386 +0200
@@ -297,7 +297,7 @@
+
$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes)
@echo Installing $^
- install -D -m644 $< $@
+ install -D -m644 -t $@ $<
diff --git a/debian/patches/series b/debian/patches/series
index 1c2fe9a..91b0b09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
fix-segfault.patch
Makfile-fixes.patch
-vdr-2.1.10-compat.patch
+truecolor.diff
diff --git a/debian/patches/truecolor.diff b/debian/patches/truecolor.diff
new file mode 100644
index 0000000..2a4c72a
--- /dev/null
+++ b/debian/patches/truecolor.diff
@@ -0,0 +1,80 @@
+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)
diff --git a/debian/patches/vdr-2.1.10-compat.patch b/debian/patches/vdr-2.1.10-compat.patch
deleted file mode 100644
index 299ff94..0000000
--- a/debian/patches/vdr-2.1.10-compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/osd.c
-+++ b/osd.c
-@@ -514,12 +514,12 @@
- if (IsTrueColor()) {
-
- LOCK_PIXMAPS;
-- while (cPixmapMemory *pm = RenderPixmaps()) {
-+ while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory*>(RenderPixmaps())) {
- int w = pm->ViewPort().Width();
- int h = pm->ViewPort().Height();
- int d = w * sizeof(tColor);
- CmdArgb(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), w, h, pm->Data(), h * d);
-- delete pm;
-+ DestroyPixmap(pm);
- }
-
- return;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-xineliboutput.git
More information about the pkg-vdr-dvb-changes
mailing list