r1723 (was: [dslinux-commit-owner at dslinux.in-berlin.de: dslinux-commit post from stsp at dslinux.in-berlin.de requires approval])
Stefan Sperling
stsp at stsp.name
Sun Apr 15 15:41:55 CEST 2007
Sending log for r1723 to this list.
Diff to user/links/font_include.c was >4MB so the original
message bounced. I've removed that part of the diff before
sending this message.
----- Forwarded message from dslinux-commit-owner at dslinux.in-berlin.de -----
Subject: dslinux-commit post from stsp at dslinux.in-berlin.de requires approval
From: dslinux-commit-owner at dslinux.in-berlin.de
To: dslinux-commit-owner at dslinux.in-berlin.de
Date: Sun, 15 Apr 2007 15:30:02 +0200
As list administrator, your authorization is requested for the
following mailing list posting:
List: dslinux-commit at dslinux.in-berlin.de
From: stsp at dslinux.in-berlin.de
Subject: r1723 - in trunk
Reason: Message body is too big: 4828729 bytes with a limit of 4096 KB
At your convenience, visit:
http://mailman.dslinux.in-berlin.de/mailman/admindb/dslinux-commit
to approve or deny the request.
Date: Sun, 15 Apr 2007 15:29:46 +0200
To: dslinux-commit at dslinux.in-berlin.de
From: stsp at dslinux.in-berlin.de
Subject: r1723 - in trunk
Reply-to: dslinux-devel at dslinux.in-berlin.de
Author: stsp
Date: 2007-04-15 15:29:39 +0200 (Sun, 15 Apr 2007)
New Revision: 1723
Log:
Add graphics support to links.
Patch by Troy Davis (GPF).
Also suppress those annoying pointer signedness warnings
while compiling links, and make sure that running 'make clean'
in user/links cleans out the config cache.
While here, fix potential dependency error by making
mc depend on gpm.
Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help 2007-04-15 12:59:08 UTC (rev 1722)
+++ trunk/config/Configure.help 2007-04-15 13:29:39 UTC (rev 1723)
@@ -1063,6 +1063,15 @@
CONFIG_USER_LINKS_LINKS
Nice text mode WWW browser.
+CONFIG_USER_LINKS_WITH_GPM
+ Enable mouse support in the Links WWW browser.
+
+CONFIG_USER_LINKS_WITH_GRAPHICS
+ Enable graphic support in the Links WWW browser.
+ Links will use a different font and show images on web
+ sites if you pick this option.
+ Note that this feature needs tons of memory.
+
CONFIG_USER_LINUXIGD_LINUXIGD
Linux Internet Gateway Device. A UPnP-IGD NAT-based
Daemon.
Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in 2007-04-15 12:59:08 UTC (rev 1722)
+++ trunk/config/config.in 2007-04-15 13:29:39 UTC (rev 1723)
@@ -447,7 +447,16 @@
bool 'l2tpd' CONFIG_USER_L2TPD_L2TPD
bool 'links' CONFIG_USER_LINKS_LINKS
if [ "$CONFIG_USER_LINKS_LINKS" = "y" ]; then
- define_bool CONFIG_LIB_LIBSSL y
+ define_bool CONFIG_LIB_LIBSSL y
+ bool ' links with mouse' CONFIG_USER_LINKS_WITH_GPM
+ if [ "$CONFIG_USER_LINKS_WITH_GPM" = "y" ]; then
+ define_bool CONFIG_USER_GPM_GPM y
+ fi
+ bool ' links with graphics' CONFIG_USER_LINKS_WITH_GRAPHICS
+ if [ "$CONFIG_USER_LINKS_WITH_GRAPHICS" = "y" ]; then
+ define_bool CONFIG_LIB_LIBPNG y
+ define_bool CONFIG_LIB_LIBJPEG y
+ fi
fi
bool 'linux-igd' CONFIG_USER_LINUXIGD_LINUXIGD
if [ "$CONFIG_USER_LINUXIGD_LINUXIGD" = "y" ]; then
@@ -789,6 +798,9 @@
bool 'mathomatic' CONFIG_USER_MATHOMATIC
bool 'mawk' CONFIG_USER_MAWK_AWK
bool 'mc' CONFIG_USER_MC
+if [ "$CONFIG_USER_MC" = "y" ]; then
+ define_bool CONFIG_USER_GPM_GPM y
+fi
bool 'mpc' CONFIG_USER_MPC
bool 'mysql' CONFIG_USER_MYSQL
if [ "$CONFIG_USER_MYSQL" = "y" ]; then
Modified: trunk/user/links/Makefile
===================================================================
--- trunk/user/links/Makefile 2007-04-15 12:59:08 UTC (rev 1722)
+++ trunk/user/links/Makefile 2007-04-15 13:29:39 UTC (rev 1723)
@@ -2,9 +2,23 @@
all: .compiled
+LINKS_CONFIGURE_FLAGS=
+
+ifeq ($(CONFIG_USER_LINKS_WITH_GRAPHICS),y)
+LINKS_CONFIGURE_FLAGS+=--enable-graphics --with-fb \
+ --without-svgalib --without-x --without-directfb \
+ --without-sdl --without-pmshell --without-atheos \
+ --without-libtiff
+endif
+
+ifeq ($(CONFIG_USER_LINKS_WITH_GPM),y)
+LINKS_CONFIGURE_FLAGS+=--with-gpm
+endif
+
.configured:
- cd src && ./configure --target=$(CROSS) \
- --prefix=/nonexistent
+ cd src && env "CFLAGS=$(CFLAGS) -Wno-pointer-sign" \
+ ./configure --target=$(CROSS) \
+ --prefix=/nonexistent $(LINKS_CONFIGURE_FLAGS)
touch $@
.compiled: .configured
@@ -13,6 +27,7 @@
clean:
-[ -f src/Makefile ] && $(MAKE) -C src clean
+ rm -f src/config.cache
rm -f .configured .compiled
# Empty romfs target since we only statically link with libraries
Modified: trunk/user/links/src/configure
===================================================================
--- trunk/user/links/src/configure 2007-04-15 12:59:08 UTC (rev 1722)
+++ trunk/user/links/src/configure 2007-04-15 13:29:39 UTC (rev 1723)
@@ -7665,13 +7665,15 @@
if test -z "$drivers" && test "$cf_use_graphics" = yes; then
- { echo "configure: error: No graphics drivers found." 1>&2; exit 1; }
+ cat >> confdefs.h <<EOF
+#define GRDRV_FB 1
+EOF
+ drivers="$drivers FB";
fi
fi
-
if test "$cf_have_atheos" = yes; then
ATHEOS_GR_TRUE=
ATHEOS_GR_FALSE='#'
----- End forwarded message -----
--
stefan
http://stsp.name PGP Key: 0xF59D25F0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://mailman.dslinux.in-berlin.de/pipermail/dslinux-commit-dslinux.in-berlin.de/attachments/20070415/ba848e1e/attachment.pgp
More information about the dslinux-commit
mailing list