Merge branch 'master' of git://projects.qi-hardware.com/openwrt-packagesHEADmaster

Conflicts:
	links/Makefile

3 files changed, 67 insertions, 0 deletions

diff --git a/fbida/patches/001-sys_siglist.patch b/fbida/patches/001-sys_siglist.patch
new file mode 100644
index 0000000..7c0c337
--- /dev/null
+++ b/fbida/patches/001-sys_siglist.patch
@@ -0,0 +1,10 @@
+--- fbida-2.07.orig/fbtools.c	2008-10-11 12:49:38.676243745 +0200
++++ fbida-2.07/fbtools.c	2008-10-11 12:50:08.286262765 +0200
+@@ -519,6 +519,6 @@
+ 
+     /* cleanup */
+     fb_cleanup();
+-    fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]);
++    fprintf(stderr,"Oops: %s\n",strsignal(termsig));
+     exit(42);
+ }
diff --git a/fbida/patches/002-fontsize.patch b/fbida/patches/002-fontsize.patch
new file mode 100644
index 0000000..1e5f404
--- /dev/null
+++ b/fbida/patches/002-fontsize.patch
@@ -0,0 +1,21 @@
+diff -ur fbida-2.07_orig/fbi.c fbida-2.07/fbi.c
+--- fbida-2.07_orig/fbi.c	2008-06-09 18:53:33.000000000 +0400
++++ fbida-2.07/fbi.c	2010-10-18 22:22:33.166338378 +0400
+@@ -548,7 +548,7 @@
+ 	L"  L           - rotate counter-clockwise",
+     };
+ 
+-    shadow_draw_text_box(face, 24, 16, transparency,
++    shadow_draw_text_box(face, 0, 0, transparency,
+ 			 help, ARRAY_SIZE(help));
+     shadow_render();
+ }
+@@ -1465,7 +1465,7 @@
+ 
+     font_init();
+     if (NULL == fontname)
+-	fontname = "monospace:size=16";
++	fontname = "monospace:size=10";
+     face = font_open(fontname);
+     if (NULL == face) {
+ 	fprintf(stderr,"can't open font: %s\n",fontname);
diff --git a/fbida/patches/003-fbgs.patch b/fbida/patches/003-fbgs.patch
new file mode 100644
index 0000000..b06e084
--- /dev/null
+++ b/fbida/patches/003-fbgs.patch
@@ -0,0 +1,36 @@
+--- fbida-2.07.orig/fbgs	2010-10-18 20:26:32.264246468 +0400
++++ fbida-2.07/fbgs	2010-10-18 20:56:04.670332976 +0400
+@@ -1,7 +1,7 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # tmp dir
+-DIR="$(mktemp -dtp ${TMPDIR-/var/tmp} fbgs-XXXXXX)"
++DIR="$(mktemp -dtp ${TMPDIR-/tmp} fbgs-XXXXXX)"
+ test -d "$DIR" || exit 1
+ trap "rm -rf $DIR" EXIT
+ 
+@@ -33,7 +33,22 @@
+ 		-p)	password="$2"
+ 			shift; shift
+ 			;;
+-		-h)	echo fixme: help text
++		-h)	echo "
++fbgs - poor man's PostScript/pdf viewer for the linux framebuffer con-
++sole
++
++fbgs [ options ] file
++
++fbgs is a simple wrapper script which takes a PostScript or pdf file as
++input,  renders  the pages using ghostscript into a temporary directory
++and finally calls fbi to display them.
++
++fbps understands all fbi options (they are passed through). Addition-
++ally  you  can  specify  -l, -xl or -xxl to get the pages rendered with
++100, 120 or 150 dpi (default is 75). You can use option  -p  <password>
++if your PDF file requires password.  With -c you can ask fbgs to render
++the pages in color.
++"
+ 			exit 1
+ 			;;
+ 		-c)	device="png16m"