update for 2010.08

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,11 @@
+2010.08: Released August 31th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: atk, xstroke
+
+	Removed packages: lxdoom
+
 2010.08-rc2, Released August 30th, 2010:
 
 	Fixes all over the tree.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2010.08-rc2"
+	default "2010.08"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"

Makefile

@@ -400,13 +400,17 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
 endif
 	find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
+	mkdir -p $(TARGET_DIR)/etc
+	# Mandatory configuration file and auxilliary cache directory
+	# for recent versions of ldconfig
+	touch $(TARGET_DIR)/etc/ld.so.conf
+	mkdir -p $(TARGET_DIR)/var/cache/ldconfig
 	if [ -x "$(TARGET_CROSS)ldconfig" ]; \
 	then \
-		$(TARGET_CROSS)ldconfig -r $(TARGET_DIR) 2>/dev/null; \
+		$(TARGET_CROSS)ldconfig -r $(TARGET_DIR); \
 	else \
-		/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null; \
+		/sbin/ldconfig -r $(TARGET_DIR); \
 	fi
-	mkdir -p $(TARGET_DIR)/etc
 	echo $(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion) > \
 		$(TARGET_DIR)/etc/br-version
 

docs/download.html

@@ -6,14 +6,14 @@
 
 <p>
 
-The latest stable release is <b>2010.05</b>, which can be downloaded
+The latest stable release is <b>2010.08</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2010.05.tar.gz">buildroot-2010.05.tar.gz</a>
+<a href="/downloads/buildroot-2010.08.tar.gz">buildroot-2010.08.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.05.tar.bz2">buildroot-2010.05.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.08.tar.bz2">buildroot-2010.08.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2010.08-rc2</b>, which can be
 downloaded here:<p>
 
@@ -21,7 +21,7 @@ downloaded here:<p>
 or
 <a href="/downloads/buildroot-2010.08-rc2.tar.bz2">buildroot-2010.08-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/news.html

@@ -6,6 +6,15 @@
 
 <ul>
 
+  <li><b>31 August 2010 -- 2010.08 released</b>
+
+    <p>The stable 2010.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.08">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2010.08.tar.bz2">2010.08 release</a>.</p>
+
   <li><b>30 August 2010 -- 2010.08-rc2 released</b>
 
     <p>RC2 is out with more cleanups and bugfixes, see the <a

fs/jffs2/Config.in

@@ -81,7 +81,9 @@ config BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
 	  the pagesize is not a power of 2
 
 config BR2_JFFS2_TARGET_SREC
-	bool "RootFS in SREC file formet"
+	bool "RootFS in SREC file format"
+	help
+	  The binary data will be encoded in Motorola's S-record format
 
 config BR2_TARGET_ROOTFS_JFFS2_PAD
 	bool "Pad output"

fs/squashfs/squashfs.mk

@@ -19,7 +19,8 @@ endif
 
 define ROOTFS_SQUASHFS_CMD
 	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend \
-		$(ROOTFS_SQUASHFS_ARGS)
+		$(ROOTFS_SQUASHFS_ARGS) && \
+	chmod 0644 $$@
 endef
 
 $(eval $(call ROOTFS_TARGET,squashfs))

package/Config.in

@@ -77,7 +77,6 @@ menu "Games"
 source "package/games/ace_of_penguins/Config.in"
 source "package/games/gnuchess/Config.in"
 source "package/games/magiccube4d/Config.in"
-source "package/games/lxdoom/Config.in"
 source "package/games/prboom/Config.in"
 source "package/games/doom-wad/Config.in"
 source "package/games/rubix/Config.in"

package/atk/atk.mk

@@ -41,7 +41,7 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
 		gl_cv_c_restrict=no ac_cv_prog_F77=no
 
 ATK_CONF_OPT =  --enable-shared \
-		--enable-static
+		--enable-static \
 		--disable-glibtest --enable-explicit-deps=no \
 		--disable-debug
 

package/games/doom-wad/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DOOM_WAD
 	bool "shareware Doom WAD file"
-	depends on BR2_PACKAGE_LXDOOM || BR2_PACKAGE_PRBOOM
+	depends on BR2_PACKAGE_PRBOOM
 	help
 	  This will install the shareware wad data file for the doom game.
 

package/games/lxdoom/Config.in

@@ -1,5 +0,0 @@
-config BR2_PACKAGE_LXDOOM
-	bool "lxdoom"
-	depends on BR2_PACKAGE_XORG7
-	help
-	  This is the linux version of the popular doom game.

package/games/lxdoom/lxdoom-1.4.4-updated.patch

@@ -1,173 +0,0 @@
-diff -Nrup lxdoom-1.4.4/src/m_menu.c lxdoom-1.4.4-avr32/src/m_menu.c
---- a/src/m_menu.c	2000-03-17 15:50:30.000000000 -0500
-+++ b/src/m_menu.c	2007-10-22 17:18:43.000000000 -0400
-@@ -38,6 +38,7 @@ rcsid[] = "$Id: m_menu.c,v 1.24 2000/03/
- 
- #include <fcntl.h>
- #include <unistd.h>
-+#include <bits/posix1_lim.h>
- 
- #include "doomdef.h"
- #include "doomstat.h"
-diff -Nrup lxdoom-1.4.4/src/p_maputl.c lxdoom-1.4.4-avr32/src/p_maputl.c
---- a/src/p_maputl.c	1999-10-12 09:01:13.000000000 -0400
-+++ b/src/p_maputl.c	2007-10-22 17:20:56.000000000 -0400
-@@ -322,7 +322,7 @@ void P_SetThingPosition(mobj_t *thing)
- //
- // A fast function for testing intersections between things and linedefs.
- 
--boolean CONSTFUNC ThingIsOnLine(const mobj_t *t, const line_t *l)
-+boolean ThingIsOnLine(const mobj_t *t, const line_t *l)
- {
-   int dx = l->dx >> FRACBITS;                             // Linedef vector
-   int dy = l->dy >> FRACBITS;
-diff -Nrup lxdoom-1.4.4/src/r_data.c lxdoom-1.4.4-avr32/src/r_data.c
---- a/src/r_data.c	2000-01-25 17:40:45.000000000 -0500
-+++ b/src/r_data.c	2007-10-22 17:19:29.000000000 -0400
-@@ -38,6 +38,7 @@ rcsid[] = "$Id: r_data.c,v 1.13 2000/01/
- #include "r_main.h"
- #include "r_sky.h"
- #include "lprintf.h"  // jff 08/03/98 - declaration of lprintf
-+#include <bits/posix1_lim.h>
- 
- //
- // Graphics.
-diff -Nrup lxdoom-1.4.4/src/r_segs.c lxdoom-1.4.4-avr32/src/r_segs.c
---- a/src/r_segs.c	1999-10-17 04:52:04.000000000 -0400
-+++ b/src/r_segs.c	2007-10-22 17:14:46.000000000 -0400
-@@ -47,15 +47,15 @@ rcsid[] = "$Id: r_segs.c,v 1.14 1999/10/
- // killough 1/6/98: replaced globals with statics where appropriate
- 
- // True if any of the segs textures might be visible.
--static boolean  segtextured;
--static boolean  markfloor;      // False if the back side is the same plane.
--static boolean  markceiling;
--static boolean  maskedtexture;
--static int      toptexture;
--static int      bottomtexture;
--static int      midtexture;
-+boolean  segtextured;
-+boolean  markfloor;      // False if the back side is the same plane.
-+boolean  markceiling;
-+boolean  maskedtexture;
-+int      toptexture;
-+int      bottomtexture;
-+int      midtexture;
- 
--static fixed_t  toptexheight, midtexheight, bottomtexheight; // cph
-+fixed_t  toptexheight, midtexheight, bottomtexheight; // cph
- 
- angle_t         rw_normalangle; // angle to line origin
- int             rw_angle1;
-@@ -65,28 +65,28 @@ lighttable_t    **walllights;
- //
- // regular wall
- //
--static int      rw_x;
--static int      rw_stopx;
--static angle_t  rw_centerangle;
--static fixed_t  rw_offset;
--static fixed_t  rw_scale;
--static fixed_t  rw_scalestep;
--static fixed_t  rw_midtexturemid;
--static fixed_t  rw_toptexturemid;
--static fixed_t  rw_bottomtexturemid;
--static int      worldtop;
--static int      worldbottom;
--static int      worldhigh;
--static int      worldlow;
--static fixed_t  pixhigh;
--static fixed_t  pixlow;
--static fixed_t  pixhighstep;
--static fixed_t  pixlowstep;
--static fixed_t  topfrac;
--static fixed_t  topstep;
--static fixed_t  bottomfrac;
--static fixed_t  bottomstep;
--static short    *maskedtexturecol;
-+int      rw_x;
-+int      rw_stopx;
-+angle_t  rw_centerangle;
-+fixed_t  rw_offset;
-+fixed_t  rw_scale;
-+fixed_t  rw_scalestep;
-+fixed_t  rw_midtexturemid;
-+fixed_t  rw_toptexturemid;
-+fixed_t  rw_bottomtexturemid;
-+int      worldtop;
-+int      worldbottom;
-+int      worldhigh;
-+int      worldlow;
-+fixed_t  pixhigh;
-+fixed_t  pixlow;
-+fixed_t  pixhighstep;
-+fixed_t  pixlowstep;
-+fixed_t  topfrac;
-+fixed_t  topstep;
-+fixed_t  bottomfrac;
-+fixed_t  bottomstep;
-+short    *maskedtexturecol;
- 
- //
- // R_ScaleFromGlobalAngle
---- a/src/wi_stuff.c	2008-02-12 14:02:42.000000000 -0500
-+++ b/src/wi_stuff.c	2008-02-12 14:04:34.000000000 -0500
-@@ -368,7 +368,7 @@ static const patch_t  * items;
- static const patch_t  * frags;
- 
- // Time sucks.
--static const patch_t  * time;
-+static const patch_t  * mytime;
- static const patch_t  * par;
- static const patch_t  * sucks;
-
-diff -Nrup lxdoom-1.4.4/src/d_main.c lxdoom-1.4.4-avr32/src/d_main.c
---- a/src/d_main.c	2000-03-27 05:33:49.000000000 -0500
-+++ b/src/d_main.c	2007-10-22 17:18:05.000000000 -0400
-@@ -39,7 +39,7 @@ static const char rcsid[] = "$Id: d_main
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--
-+#include <bits/posix1_lim.h>
- #include "doomdef.h"
- #include "doomstat.h"
- #include "dstrings.h"
-@@ -228,7 +228,7 @@ void D_Display (void)
-     case -1:
-     case GS_LEVEL:
-       V_SetPalette(0); // cph - use default (basic) palette  
--    default:
-+    default:;
-     }
- 
-     switch (gamestate) {
-@@ -241,7 +241,7 @@ void D_Display (void)
-     case GS_DEMOSCREEN:
-       D_PageDrawer();
-       break;
--    default:
-+    default:;
-     }
-   } else if (gametic) { // In a level
-     boolean redrawborderstuff;
-diff -Nrup lxdoom-1.4.4/src/g_game.c lxdoom-1.4.4-avr32/src/g_game.c
---- a/src/g_game.c	2000-03-17 15:50:30.000000000 -0500
-+++ b/src/g_game.c	2007-10-22 17:18:10.000000000 -0400
-@@ -67,6 +67,7 @@ rcsid[] = "$Id: g_game.c,v 1.36 2000/03/
- #include "lprintf.h"
- #include "i_main.h"
- #include "i_system.h"
-+#include <bits/posix1_lim.h>
- 
- #define SAVEGAMESIZE  0x20000
- #define SAVESTRINGSIZE  24
-@@ -868,7 +869,7 @@ void G_Ticker (void)
-     switch (prevgamestate) {
-     case GS_INTERMISSION:
-       WI_End();
--    default:
-+    default:;
-     }
-     prevgamestate = gamestate;
-   } 

package/games/lxdoom/lxdoom.mk

@@ -1,19 +0,0 @@
-#############################################################
-#
-# lxdoom
-#
-#############################################################
-LXDOOM_VERSION = 1.4.4
-LXDOOM_SOURCE = lxdoom-$(LXDOOM_VERSION).tar.gz
-LXDOOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lxdoom
-LXDOOM_INSTALL_STAGING = NO
-LXDOOM_INSTALL_TARGET = YES
-LXDOOM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-LXDOOM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) --prefix=/usr \
-		--includedir=/usr/include --enable-shared
-
-LXDOOM_DEPENDENCIES = xserver_xorg-server
-
-$(eval $(call AUTOTARGETS,package/games,lxdoom))

package/xstroke/Config.in

@@ -1,12 +1,10 @@
 config BR2_PACKAGE_XSTROKE
 	bool "xstroke"
 	depends on BR2_PACKAGE_XORG7
-	depends on BR2_USE_WCHAR # glib2
-	select BR2_PACKAGE_DOCKER
+	select BR2_PACKAGE_XLIB_LIBXFT
+	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XLIB_LIBXPM
 	help
 	  Handwriting recognition for X
 
 	  http://avr32linux.org/twiki/pub/Main/XStroke
-
-comment "xstroke requires a toolchain with WCHAR support"
-	depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR

package/xstroke/xstroke.mk

@@ -6,12 +6,9 @@
 XSTROKE_VERSION = 0.6
 XSTROKE_SOURCE = xstroke-$(XSTROKE_VERSION).tar.gz
 XSTROKE_SITE = http://avr32linux.org/twiki/pub/Main/XStroke
-XSTROKE_AUTORECONF = NO
-XSTROKE_INSTALL_STAGING = NO
-XSTROKE_INSTALL_TARGET = YES
 XSTROKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-XSTROKE_DEPENDENCIES = xserver_xorg-server
+XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm
 
 $(eval $(call AUTOTARGETS,package,xstroke))