merge of '1e5f74b2b60986b2dbf42fbd03a69ee2a59be5a2'

     and 'a205d31ba30bfe2c36e1988e8e13a5dbe3399620'

5 files changed, 75 insertions, 0 deletions

diff --git a/packages/fbida/files/.mtn2git_empty b/packages/fbida/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbida/files/.mtn2git_empty
diff --git a/packages/fbida/files/GNUmakefile.patch b/packages/fbida/files/GNUmakefile.patch
new file mode 100644
index 0000000000..2c0e8fbcd3
--- /dev/null
+++ b/packages/fbida/files/GNUmakefile.patch
@@ -0,0 +1,24 @@
+Index: fbida-2.07/fbi.c
+===================================================================
+--- fbida-2.07/GNUmakefile	2008-10-10 22:27:58.000000000 +0200
++++ fbida-2.07/GNUmakefile.mod	2008-10-10 22:31:07.000000000 +0200
+@@ -181,16 +181,16 @@
+ install: build
+ 	$(INSTALL_DIR) $(bindir)
+ 	$(INSTALL_DIR) $(mandir)/man1
+-	$(INSTALL_BINARY) exiftran $(bindir)
++	$(INSTALL_SCRIPT) exiftran $(bindir)
+ 	$(INSTALL_DATA) $(srcdir)/exiftran.man $(mandir)/man1/exiftran.1
+ ifeq ($(HAVE_LINUX_FB_H),yes)
+-	$(INSTALL_BINARY) fbi $(bindir)
++	$(INSTALL_SCRIPT) fbi $(bindir)
+ 	$(INSTALL_SCRIPT) fbgs $(bindir)
+ 	$(INSTALL_DATA) $(srcdir)/fbi.man $(mandir)/man1/fbi.1
+ 	$(INSTALL_DATA) $(srcdir)/fbgs.man $(mandir)/man1/fbgs.1
+ endif
+ ifeq ($(HAVE_MOTIF),yes)
+-	$(INSTALL_BINARY) ida $(bindir)
++	$(INSTALL_SCRIPT) ida $(bindir)
+ 	$(INSTALL_DATA) $(srcdir)/ida.man $(mandir)/man1/ida.1
+ 	$(INSTALL_DIR) $(resdir)/app-defaults
+ 	$(INSTALL_DATA) $(srcdir)/Ida.ad $(resdir)/app-defaults/Ida
diff --git a/packages/fbida/files/exiftran.c.patch b/packages/fbida/files/exiftran.c.patch
new file mode 100644
index 0000000000..0441a5a1de
--- /dev/null
+++ b/packages/fbida/files/exiftran.c.patch
@@ -0,0 +1,13 @@
+Index: fbida-2.07/exiftran.c
+===================================================================
+--- fbida-2.07/exiftran.c	2006-06-13 14:47:24.000000000 +0200
++++ fbida-2.07/exiftran.c.mod	2008-10-07 01:43:07.000000000 +0200
+@@ -16,6 +16,8 @@
+ #include "jpegtools.h"
+ #include "genthumbnail.h"
+ 
++#define HAVE_NEW_EXIF
++
+ /* ---------------------------------------------------------------------- */
+ 
+ static void dump_exif(FILE *out, ExifData *ed)
diff --git a/packages/fbida/files/fbi.c.patch b/packages/fbida/files/fbi.c.patch
new file mode 100644
index 0000000000..36942afa3d
--- /dev/null
+++ b/packages/fbida/files/fbi.c.patch
@@ -0,0 +1,25 @@
+Index: fbida-2.07/fbi.c
+===================================================================
+--- fbida-2.07/fbi.c	2008-06-09 16:53:33.000000000 +0200
++++ fbida-2.07/fbi.c.mod	2008-10-10 21:33:54.000000000 +0200
+@@ -46,6 +46,7 @@
+ #include "jpeg/transupp.h"		/* Support routines for jpegtran */
+ #include "jpegtools.h"
+ 
++#define HAVE_NEW_EXIF
+ #define TRUE            1
+ #define FALSE           0
+ #undef  MAX
+@@ -1465,10 +1466,10 @@
+ 
+     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);
++	fprintf(stderr,"can't open font: %s. Please install ttf-dejavu-sans-mono.ipk\n",fontname);
+ 	exit(1);
+     }
+     fd = fb_init(cfg_get_str(O_DEVICE),
diff --git a/packages/fbida/files/makefile.patch b/packages/fbida/files/makefile.patch
new file mode 100644
index 0000000000..8ed04dc1b9
--- /dev/null
+++ b/packages/fbida/files/makefile.patch
@@ -0,0 +1,13 @@
+Index: fbida-2.07/GNUmakefile
+===================================================================
+--- fbida-2.07/GNUmakefile	2006-06-13 15:35:48.000000000 +0200
++++ fbida-2.07/GNUmakefile.mod	2008-10-07 22:55:51.000000000 +0200
+@@ -181,7 +181,7 @@
+ install: build
+ 	$(INSTALL_DIR) $(bindir)
+ 	$(INSTALL_DIR) $(mandir)/man1
+-	$(INSTALL_BINARY) exiftran $(bindir)
++	$(INSTALL_SCRIPT) exiftran $(bindir)
+ 	$(INSTALL_DATA) $(srcdir)/exiftran.man $(mandir)/man1/exiftran.1
+ ifeq ($(HAVE_LINUX_FB_H),yes)
+ 	$(INSTALL_SCRIPT) fbi $(bindir)