From 52ae1d77d97cb64f57fc3f544ffecae0243603b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=BChling?= <dvdkhlng@gmx.de>
Date: Sun, 9 Jan 2011 11:36:37 +0100
Subject: [PATCH] gnuplot-gfx: reworked truecolor fixes to upstream-submittable

---
 gnuplot-gfx/Makefile                          |  2 +-
 .../patches/070-linuxvga-truecolor.patch      | 26 +++++++------------
 .../patches/071-linuxvga-nanonote.patch       | 13 ++++++++++
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 gnuplot-gfx/patches/071-linuxvga-nanonote.patch

diff --git a/gnuplot-gfx/Makefile b/gnuplot-gfx/Makefile
index b8012bc..6c5b51b 100644
--- a/gnuplot-gfx/Makefile
+++ b/gnuplot-gfx/Makefile
@@ -29,7 +29,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gnuplot-gfx
 PKG_ORIG_NAME=gnuplot
 PKG_VERSION:=4.4.0
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_ORIG_NAME)-$(PKG_VERSION)
 HOST_BUILD_DIR = $(BUILD_DIR_HOST)/$(PKG_ORIG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_ORIG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/gnuplot-gfx/patches/070-linuxvga-truecolor.patch b/gnuplot-gfx/patches/070-linuxvga-truecolor.patch
index 40b7aca..5c8da65 100644
--- a/gnuplot-gfx/patches/070-linuxvga-truecolor.patch
+++ b/gnuplot-gfx/patches/070-linuxvga-truecolor.patch
@@ -1,19 +1,13 @@
 Index: gnuplot-4.4.0/term/linux.trm
 ===================================================================
---- gnuplot-4.4.0.orig/term/linux.trm	2011-01-06 16:42:27.000000000 +0100
-+++ gnuplot-4.4.0/term/linux.trm	2011-01-08 12:28:08.000000000 +0100
-@@ -94,8 +94,12 @@
- #define _STRING_H_
- #include <vga.h>
+--- gnuplot-4.4.0.orig/term/linux.trm	2011-01-09 10:20:04.000000000 +0100
++++ gnuplot-4.4.0/term/linux.trm	2011-01-09 10:45:51.000000000 +0100
+@@ -241,7 +241,7 @@
+ 	linetype = LT_BLACK;
+     if (linetype >= 13)
+ 	linetype %= 13;
+-    vga_setcolor(vgacolor[linetype + 2]);
++    vga_setegacolor(vgacolor[linetype + 2]);
+ }
  
--static int linux_vmode = G1024x768x256;		/* default mode */
--static int vgacolor[] = { 7, 8, 2, 3, 4, 5, 9, 14, 12, 15, 13, 10, 11, 1, 6 };
-+static int linux_vmode = G320x240x16M32;		/* default mode */
-+/* static int vgacolor[] = { 7, 8, 2, 3, 4, 5, 9, 14, 12, 15, 13, 10, 11, 1, 6 }; */
-+static int vgacolor[] = { 
-+   0xc0c0c0, 0x808080, 0x008000, 0x008080, 0x800000, 0x800080, 
-+   0x0000ff, 0xffff00, 0xff0000, 0xffffff, 0xff00ff, 0x00ff00, 
-+   0x00ffff, 0x000080, 0x808000 };
- static int graphics_on = FALSE;
- static vga_modeinfo *modeinfo;
- static int linux_startx, linux_starty, linux_lasty;
+ TERM_PUBLIC void
diff --git a/gnuplot-gfx/patches/071-linuxvga-nanonote.patch b/gnuplot-gfx/patches/071-linuxvga-nanonote.patch
new file mode 100644
index 0000000..7f93c1c
--- /dev/null
+++ b/gnuplot-gfx/patches/071-linuxvga-nanonote.patch
@@ -0,0 +1,13 @@
+Index: gnuplot-4.4.0/term/linux.trm
+===================================================================
+--- gnuplot-4.4.0.orig/term/linux.trm	2011-01-09 10:29:36.000000000 +0100
++++ gnuplot-4.4.0/term/linux.trm	2011-01-09 10:29:52.000000000 +0100
+@@ -94,7 +94,7 @@
+ #define _STRING_H_
+ #include <vga.h>
+ 
+-static int linux_vmode = G1024x768x256;		/* default mode */
++static int linux_vmode = G320x240x16M32;		/* default mode */
+ static int vgacolor[] = { 7, 8, 2, 3, 4, 5, 9, 14, 12, 15, 13, 10, 11, 1, 6 };
+ static int graphics_on = FALSE;
+ static vga_modeinfo *modeinfo;