Pull request for branch misc-fixes4
The following changes since commit ac8329cff0a969bec23be7871bfaf394e369be7c:
Peter Korsgaard (1):
Merge branch 'misc-fixes3' of git://git.busybox.net/~tpetazzoni/git/buildroot
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot misc-fixes4
Thomas Petazzoni (3):
Add libxpm as a dependency of ace_of_penguins Fix build failure of rubix
xboard: remove package
package/games/Config.in | 1 - package/games/ace_of_penguins/Config.in | 1 + package/games/ace_of_penguins/ace_of_penguins.mk | 2 +- .../rubix-1.0.5-dont-use-legacy-functions.patch | 18 ++++++ package/games/xboard/Config.in | 8 --- package/games/xboard/xboard-4.2.7-installer.patch | 55 -------------------- package/games/xboard/xboard.mk | 16 ------ 7 files changed, 20 insertions(+), 81 deletions(-) create mode 100644 package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch delete mode 100644 package/games/xboard/Config.in delete mode 100644 package/games/xboard/xboard-4.2.7-installer.patch delete mode 100644 package/games/xboard/xboard.mk
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/3 Add libxpm as a dependency of ace_of_penguins
ace_of_penguins fails to build when xlib_libXpm is not selected. Add it has a dependency. However, contrary to normal dependencies to libraries (where we use 'select') we use 'depends on' here, otherwise the X.org server will be get selected automatically without the user noticing.
--- package/games/ace_of_penguins/Config.in | 1 + package/games/ace_of_penguins/ace_of_penguins.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
package/games/ace_of_penguins/Config.in +1 -0
@@ -2,6 +2,7 @@ config BR2_PACKAGE_ACE_OF_PENGUINS bool "ace_of_penguins" select BR2_PACKAGE_LIBPNG depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XLIB_LIBXPM help The Ace of Penguins is a set of Unix/X solitaire games based on the ones available for Windows but with a number of
package/games/ace_of_penguins/ace_of_penguins.mk +1 -1
@@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES ACE_OF_PENGUINS_STAGING = NO ACE_OF_PENGUINS_TARGET = YES -ACE_OF_PENGUINS_DEPENDENCIES = libpng xserver_xorg-server +ACE_OF_PENGUINS_DEPENDENCIES = libpng xserver_xorg-server xlib_libXpm $(eval $(call AUTOTARGETS,package/games,ace_of_penguins))
Signature · 1 line
1.6.3.3
PATCH 1/3 Add libxpm as a dependency of ace_of_penguins
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> ace_of_penguins fails to build when xlib_libXpm is not selected. Add Thomas> it has a dependency. However, contrary to normal dependencies to Thomas> libraries (where we use 'select') we use 'depends on' here, otherwise Thomas> the X.org server will be get selected automatically without the user Thomas> noticing.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> package/games/ace_of_penguins/Config.in | 1 + Thomas> package/games/ace_of_penguins/ace_of_penguins.mk | 2 +-
Thomas> 2 files changed, 2 insertions(+), 1 deletions(-)
Thomas> diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in Thomas> index edbaf26..1d5a367 100644
Thomas> --- a/package/games/ace_of_penguins/Config.in
Thomas> +++ b/package/games/ace_of_penguins/Config.in
Thomas> @@ -2,6 +2,7 @@ config BR2_PACKAGE_ACE_OF_PENGUINS
Thomas> bool "ace_of_penguins" Thomas> select BR2_PACKAGE_LIBPNG Thomas> depends on BR2_PACKAGE_XORG7
Thomas> + depends on BR2_PACKAGE_XLIB_LIBXPM
But we already depend on XORG7, so selecting LIBXPM seems ok to me? Longer term we should certainly make it possible to build X stuff without also building a X server.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/3 Fix build failure of rubix
In reply to Thomas PetazzoniAdd a patch to use strstr() instead of index().
--- .../rubix-1.0.5-dont-use-legacy-functions.patch | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch
package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch new file +18 -0
@@ -0,0 +1,18 @@ +Use strstr() instead of index(), since index() is a legacy function +and it may not be available in uClibc, depending on the configuration. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: rubix-1.0.5/cube.c +=================================================================== +--- rubix-1.0.5.orig/cube.c 2010-02-14 14:19:05.000000000 +0100 ++++ rubix-1.0.5/cube.c 2010-02-14 14:19:14.000000000 +0100 +@@ -257,7 +257,7 @@ + if (i==-1) goto finish; + if (buffer[0]=='%') goto new_section; + buffer[0]=toupper(buffer[0]); +- ptr = index(buffer, '='); ++ ptr = strstr(buffer, '='); + if (ptr) { + ++ptr; + while (isspace(*ptr)) ++ptr;
Signature · 1 line
1.6.3.3
PATCH 3/3 xboard: remove package
In reply to Thomas PetazzoniThis package requires Xaw3d, that has never been packaged in Buildroot. As no-one seems to be using this package, it's probably not worth the effort of packaging Xaw3d, a old-looking widget toolkit. Therefore, just drop the package.
--- package/games/Config.in | 1 - package/games/xboard/Config.in | 8 --- package/games/xboard/xboard-4.2.7-installer.patch | 55 --------------------- package/games/xboard/xboard.mk | 16 ------ 4 files changed, 0 insertions(+), 80 deletions(-) delete mode 100644 package/games/xboard/Config.in delete mode 100644 package/games/xboard/xboard-4.2.7-installer.patch delete mode 100644 package/games/xboard/xboard.mk
package/games/Config.in +0 -1
@@ -7,5 +7,4 @@ source "package/games/magiccube4d/Config.in" source "package/games/prboom/Config.in" source "package/games/rubix/Config.in" source "package/games/vice/Config.in" -source "package/games/xboard/Config.in" endmenu
package/games/xboard/Config.in deleted +0 -8
@@ -1,8 +0,0 @@ -config BR2_PACKAGE_XBOARD - bool "xboard" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_GNUCHESS - help - XBoard and WinBoard are graphical user interfaces for chess. - - http://ftp.gnu.org/gnu/xboard
package/games/xboard/xboard-4.2.7-installer.patch deleted +0 -55
55 lines not on this page · raw message
package/games/xboard/xboard.mk deleted +0 -16
@@ -1,16 +0,0 @@ -############################################################# -# -# xboard -# -############################################################# -XBOARD_VERSION = 4.2.7 -XBOARD_SOURCE = xboard-$(XBOARD_VERSION).tar.gz -XBOARD_SITE = $(BR2_GNU_MIRROR)/xboard -XBOARD_INSTALL_STAGING = NO -XBOARD_INSTALL_TARGET = YES -XBOARD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install - -XBOARD_DEPENDENCIES = gnuchess xserver_xorg-server - -$(eval $(call AUTOTARGETS,package/games,xboard)) -
Signature · 1 line
1.6.3.3