diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/fbv/fbv-1.0b-fix-bgr555.patch | 64 | ||||
| -rw-r--r-- | package/matchbox/matchbox-desktop/matchbox-desktop.mk | 7 | ||||
| -rw-r--r-- | package/matchbox/matchbox-desktop/mbdesktop_modules | 9 | ||||
| -rw-r--r-- | package/radvd/Config.in | 1 | ||||
| -rw-r--r-- | package/radvd/radvd.mk | 6 |
5 files changed, 66 insertions, 21 deletions
diff --git a/package/fbv/fbv-1.0b-fix-bgr555.patch b/package/fbv/fbv-1.0b-fix-bgr555.patch new file mode 100644 index 000000000..8f185f0a3 --- /dev/null +++ b/package/fbv/fbv-1.0b-fix-bgr555.patch @@ -0,0 +1,64 @@ +[PATCH] fbv: support bgr555 format + +Signed-off-by: Josh.Wu <josh.wu@atmel.com> +diff -Naur fbv-1.0b-ori/fb_display.c fbv-1.0b/fb_display.c +--- fbv-1.0b-ori/fb_display.c 2010-04-02 09:38:15.000000000 +0800 ++++ fbv-1.0b/fb_display.c 2010-04-01 18:54:15.000000000 +0800 +@@ -297,6 +297,14 @@ + ((b >> 3) & 31) ); + } + ++inline static unsigned short make15color_bgr(unsigned char r, unsigned char g, unsigned char b) ++{ ++ return ( ++ (((b >> 3) & 31) << 10) | ++ (((g >> 3) & 31) << 5) | ++ ((r >> 3) & 31) ); ++} ++ + inline static unsigned short make16color(unsigned char r, unsigned char g, unsigned char b) + { + return ( +@@ -313,6 +321,14 @@ + u_int16_t *s_fbbuff; + u_int32_t *i_fbbuff; + ++ int is_bgr555 = 0; ++ struct fb_var_screeninfo var; ++ getVarScreenInfo(fh, &var); ++ if(var.red.offset == 0 && ++ var.green.offset == 5 && ++ var.blue.offset == 10) ++ is_bgr555 = 1; ++ + switch(bpp) + { + case 8: +@@ -325,15 +341,23 @@ + case 15: + *cpp = 2; + s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short)); +- for(i = 0; i < count ; i++) +- s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); ++ if(is_bgr555) ++ for(i = 0; i < count ; i++) ++ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); ++ else ++ for(i = 0; i < count ; i++) ++ s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); + fbbuff = (void *) s_fbbuff; + break; + case 16: + *cpp = 2; + s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short)); +- for(i = 0; i < count ; i++) +- s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); ++ if(is_bgr555) ++ for(i = 0; i < count ; i++) ++ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); ++ else ++ for(i = 0; i < count ; i++) ++ s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); + fbbuff = (void *) s_fbbuff; + break; + case 24: diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk index a3312af82..d5f61c1f1 100644 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk +++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk @@ -7,16 +7,9 @@ MATCHBOX_DESKTOP_VERSION = 0.9.1 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION) -MATCHBOX_DESKTOP_LIBTOOL_PATCH = NO MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib MATCHBOX_DESKTOP_CONF_OPT = --enable-expat -define MATCHBOX_DESKTOP_POST_INSTALL_FIXES - cp -f ./package/matchbox/matchbox-desktop/mbdesktop_modules $(TARGET_DIR)/etc/matchbox/ -endef - -MATCHBOX_DESKTOP_POST_INSTALL_TARGET_HOOKS += MATCHBOX_DESKTOP_POST_INSTALL_FIXES - ############################################################# ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) diff --git a/package/matchbox/matchbox-desktop/mbdesktop_modules b/package/matchbox/matchbox-desktop/mbdesktop_modules deleted file mode 100644 index 8206dad1f..000000000 --- a/package/matchbox/matchbox-desktop/mbdesktop_modules +++ /dev/null @@ -1,9 +0,0 @@ -# This file lists the 'plug-ins' with any arguments to be loaded by -# matchbox-desktop. -# -# It can be overridden on a per-user basis by copying this file to ~/.matchbox/ -# and editing. - -/usr/lib/tasks.so -/usr/lib/dotdesktop.so -# /usr/lib/simplefilebrowser.so / diff --git a/package/radvd/Config.in b/package/radvd/Config.in index 072aed4fa..c7753f038 100644 --- a/package/radvd/Config.in +++ b/package/radvd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_RADVD bool "radvd" select BR2_PACKAGE_FLEX + select BR2_PACKAGE_FLEX_LIBFL depends on BR2_INET_IPV6 help IPv6 Router Advertisement Daemon. diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk index defcf4b7c..fdc52acfa 100644 --- a/package/radvd/radvd.mk +++ b/package/radvd/radvd.mk @@ -3,14 +3,10 @@ # radvd # ############################################################# -RADVD_VERSION:=1.5 +RADVD_VERSION:=1.6 RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz RADVD_SITE:=http://www.litech.org/radvd/dist/ -RADVD_AUTORECONF:=no -RADVD_INSTALL_STAGING:=no -RADVD_INSTALL_TARGET:=YES RADVD_DEPENDENCIES:=flex host-flex -RADVD_MAKE:=$(MAKE1) RADVD_CONF_OPT:= --program-prefix='' $(eval $(call AUTOTARGETS,package,radvd)) |