Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Dale E. Edmons (65c1eb754436b3cca778bb216e05afb95d448989)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Dale E. Edmons" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Dale E. Edmons (65c1eb754436b3cca778bb216e05afb95d448989)
  • Date: Tue, 12 Feb 2008 03:21:41 -0600

GIT changes to master grimoire by Dale E. Edmons <linuxfan AT sourcemage.org>:

utils/fbgetty/DETAILS | 4 -
utils/fbgetty/HISTORY | 3 +
utils/fbgetty/PRE_BUILD | 3 +
utils/fbgetty/fbgetty-0.1.698-gcc41.patch | 64
++++++++++++++++++++++++++++++
4 files changed, 72 insertions(+), 2 deletions(-)

New commits:
commit 06c108af8e18b711b2802fa4a6c930a0766815c2
Author: Dale E. Edmons <linuxfan AT sourcemage.org>
Commit: Dale E. Edmons <linuxfan AT sourcemage.org>

Updated fbgetty and patched.

diff --git a/utils/fbgetty/DETAILS b/utils/fbgetty/DETAILS
index 3dd571c..547a072 100755
--- a/utils/fbgetty/DETAILS
+++ b/utils/fbgetty/DETAILS
@@ -1,7 +1,7 @@
SPELL=fbgetty
VERSION=0.1.698
- SOURCE=fbgetty-0.1.698.tar.gz
-
SOURCE_URL[0]=http://projects.meuh.org/fbgetty/downloads/fbgetty-0.1.698.tar.gz
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://projects.meuh.org/${SPELL}/downloads/${SOURCE}

SOURCE_HASH=sha512:942304ac00ecfaad59419a0994331e59d91269ee015e3bd38faa85db0b205e6e88e1958b65e503f59b81f050a1e110aeea6534eecb3ba010096a6b5173fd1ac5
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://projects.meuh.org/fbgetty/
diff --git a/utils/fbgetty/HISTORY b/utils/fbgetty/HISTORY
index b8d72f5..2d4edfe 100644
--- a/utils/fbgetty/HISTORY
+++ b/utils/fbgetty/HISTORY
@@ -1,3 +1,6 @@
+2008-02-12 Dale E. Edmons <linuxfan AT sourcemage.org>
+ * PRE_BUILD: Created for patching fbgetty (thanks arachnist).
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/utils/fbgetty/PRE_BUILD b/utils/fbgetty/PRE_BUILD
new file mode 100755
index 0000000..87303fa
--- /dev/null
+++ b/utils/fbgetty/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/fbgetty-0.1.698-gcc41.patch
diff --git a/utils/fbgetty/fbgetty-0.1.698-gcc41.patch
b/utils/fbgetty/fbgetty-0.1.698-gcc41.patch
new file mode 100644
index 0000000..a9722f1
--- /dev/null
+++ b/utils/fbgetty/fbgetty-0.1.698-gcc41.patch
@@ -0,0 +1,64 @@
+diff -Nru fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk
fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk
+--- fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk
2001-07-11 23:01:15.000000000 +0300
++++ fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk 2007-10-27
11:29:50.000000000 +0300
+@@ -45,8 +45,7 @@
+ name = $3;
+ type = $2;
+
+- printf("#define OFFSET_%s (offsetof(struct fbgetty_options_t, %s))\n",
name, name);
+- printf(" %s %s;\n\n", type, name);
++ printf(" %s %s;\n", type, name);
+ }
+
+ END {
+diff -Nru fbgetty-0.1.698.orig/src/options.c fbgetty-0.1.698/src/options.c
+--- fbgetty-0.1.698.orig/src/options.c 2001-12-17 22:55:42.000000000 +0200
++++ fbgetty-0.1.698/src/options.c 2007-10-27 11:32:53.000000000 +0300
+@@ -27,7 +27,7 @@
+ */
+
+ #include <fbgetty/global.h>
+-
++#include <stddef.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -141,7 +141,7 @@
+ #define ENV_BINARY 0x04
+ #define ENV_LEDS 0x08
+
+-#define ENV_ENTRY(name, type, ptr) { name, type, OFFSET_ ## ptr }
++#define ENV_ENTRY(name, type, ptr) { name, type, offsetof(struct
fbgetty_options_t, ptr) }
+
+ static struct env_entry
+ {
+@@ -899,20 +899,20 @@
+ }
+ merge_option_list[] =
+ {
+- { OFFSET_tty_device , MERGE_STR, NULL, -1 },
++ { offsetof(struct fbgetty_options_t, tty_device) , MERGE_STR, NULL, -1
},
+ #ifdef USE_FRAME_BUFFER
+- { OFFSET_fb_device, MERGE_STR, NULL, -1 },
++ { offsetof(struct fbgetty_options_t, fb_device), MERGE_STR, NULL, -1
},
+ #endif
+
+- { OFFSET_login_program, MERGE_STR, LOGIN_PROGRAM, -1 },
+- { OFFSET_login_prompt, MERGE_STR, LOGIN_PROMPT, -1 },
+- { OFFSET_issue_filename, MERGE_STR, ISSUE_FILE, -1 },
++ { offsetof(struct fbgetty_options_t, login_program), MERGE_STR,
LOGIN_PROGRAM, -1 },
++ { offsetof(struct fbgetty_options_t, login_prompt), MERGE_STR,
LOGIN_PROMPT, -1 },
++ { offsetof(struct fbgetty_options_t, issue_filename), MERGE_STR,
ISSUE_FILE, -1 },
+
+- { OFFSET_login_timeout, MERGE_INT, NULL, LOGIN_TIMEOUT },
+- { OFFSET_issue_refresh, MERGE_INT, NULL, ISSUE_REFRESH },
+- { OFFSET_screen_clear, MERGE_INT, NULL, TRUE },
++ { offsetof(struct fbgetty_options_t, login_timeout), MERGE_INT, NULL,
LOGIN_TIMEOUT },
++ { offsetof(struct fbgetty_options_t, issue_refresh), MERGE_INT, NULL,
ISSUE_REFRESH },
++ { offsetof(struct fbgetty_options_t, screen_clear), MERGE_INT, NULL,
TRUE },
+
+- { OFFSET_leds, MERGE_INT, NULL, 0 },
++ { offsetof(struct fbgetty_options_t, leds), MERGE_INT, NULL, 0
},
+ { 0, 0, NULL, -1 }
+ };
+




Archive powered by MHonArc 2.6.24.

Top of Page