* [Buildroot] [pull request] Pull request for branch misc-fixes4
@ 2010-02-18 23:36 Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2010-02-18 23:36 UTC (permalink / raw)
To: buildroot
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,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins
2010-02-18 23:36 [Buildroot] [pull request] Pull request for branch misc-fixes4 Thomas Petazzoni
@ 2010-02-18 23:36 ` Thomas Petazzoni
2010-02-19 10:12 ` Peter Korsgaard
2010-02-18 23:36 ` [Buildroot] [PATCH 2/3] Fix build failure of rubix Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 3/3] xboard: remove package Thomas Petazzoni
2 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2010-02-18 23:36 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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(-)
diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in
index edbaf26..1d5a367 100644
--- a/package/games/ace_of_penguins/Config.in
+++ b/package/games/ace_of_penguins/Config.in
@@ -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
diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk
index 65a2667..fe3e204 100644
--- a/package/games/ace_of_penguins/ace_of_penguins.mk
+++ b/package/games/ace_of_penguins/ace_of_penguins.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/3] Fix build failure of rubix
2010-02-18 23:36 [Buildroot] [pull request] Pull request for branch misc-fixes4 Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins Thomas Petazzoni
@ 2010-02-18 23:36 ` Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 3/3] xboard: remove package Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2010-02-18 23:36 UTC (permalink / raw)
To: buildroot
Add a patch to use strstr() instead of index().
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../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
diff --git a/package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch b/package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch
new file mode 100644
index 0000000..9c34aee
--- /dev/null
+++ b/package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch
@@ -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 <thomas.petazzoni@free-electrons.com>
+
+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;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] xboard: remove package
2010-02-18 23:36 [Buildroot] [pull request] Pull request for branch misc-fixes4 Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 2/3] Fix build failure of rubix Thomas Petazzoni
@ 2010-02-18 23:36 ` Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2010-02-18 23:36 UTC (permalink / raw)
To: buildroot
This 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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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
diff --git a/package/games/Config.in b/package/games/Config.in
index 000a014..16924a4 100644
--- a/package/games/Config.in
+++ b/package/games/Config.in
@@ -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
diff --git a/package/games/xboard/Config.in b/package/games/xboard/Config.in
deleted file mode 100644
index 1821aa0..0000000
--- a/package/games/xboard/Config.in
+++ /dev/null
@@ -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
diff --git a/package/games/xboard/xboard-4.2.7-installer.patch b/package/games/xboard/xboard-4.2.7-installer.patch
deleted file mode 100644
index 477b8a2..0000000
--- a/package/games/xboard/xboard-4.2.7-installer.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.in 2003-11-28 16:12:57.000000000 -0500
-+++ b/Makefile.in 2008-02-13 13:18:34.000000000 -0500
-@@ -63,27 +63,27 @@ default: xboard zic2xpm
- all: default pseudosource info FAQ html dvi ps
-
- install: installdirs default
-- $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
-- $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
-- $(INSTALL_PROGRAM) cmail $(bindir)/cmail
-- $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
-- $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
-- $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-- $(INSTALL_DATA) xboard.info $(infodir)/xboard.info
-+ $(INSTALL_PROGRAM) xboard $(DESTDIR)$(bindir)/xboard
-+ $(INSTALL_PROGRAM) zic2xpm $(DESTDIR)$(bindir)/zic2xpm
-+ $(INSTALL_PROGRAM) cmail $(DESTDIR)$(bindir)/cmail
-+ $(INSTALL_PROGRAM) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard
-+ $(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext)
-+ $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
-+ $(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info
- -PATH=$$PATH:/sbin:/usr/sbin install-info \
-- $(infodir)/xboard.info $(infodir)/dir
-+ $(infodir)/xboard.info $(DESTDIR)$(infodir)/dir
-
- installdirs: mkinstalldirs
- $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
-
- uninstall:
-- rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard
-- rm -f $(bindir)/zic2xpm
-- rm -f $(man6dir)/xboard$(man6ext) $(man6dir)/cmail$(man6ext)
-- rm -f $(man6dir)/zic2xpm$(man6ext)
-- rm -f $(infodir)/xboard.info
-+ rm -f $(DESTDIR)$(bindir)/xboard $(DESTDIR)$(bindir)/cmail $(DESTDIR)$(bindir)/pxboard
-+ rm -f $(DESTDIR)$(bindir)/zic2xpm
-+ rm -f $(DESTDIR)$(man6dir)/xboard$(man6ext) $(DESTDIR)$(man6dir)/cmail$(man6ext)
-+ rm -f $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
-+ rm -f $(DESTDIR)$(infodir)/xboard.info
- -PATH=$$PATH:/sbin:/usr/sbin install-info --delete \
-- $(infodir)/xboard.info $(infodir)/dir
-+ $(DESTDIR)$(infodir)/xboard.info $(DESTDIR)$(infodir)/dir
-
- clean:
- rm -f xboard zic2xpm *.o xboard.txt zic2xpm.txt $(LEX_OUTPUT_ROOT).c
---- a/Makefile.in 2008-02-13 13:20:14.000000000 -0500
-+++ b/Makefile.in 2008-02-13 13:21:25.000000000 -0500
-@@ -74,7 +74,7 @@ install: installdirs default
- $(infodir)/xboard.info $(DESTDIR)/$(infodir)/dir
-
- installdirs: mkinstalldirs
-- $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
-+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) $(DESTDIR)$(man6dir) $(DESTDIR)$(infodir)
-
- uninstall:
- rm -f $(DESTDIR)/$(bindir)/xboard $(DESTDIR)/$(bindir)/cmail $(DESTDIR)/$(bindir)/pxboard
diff --git a/package/games/xboard/xboard.mk b/package/games/xboard/xboard.mk
deleted file mode 100644
index 078e37c..0000000
--- a/package/games/xboard/xboard.mk
+++ /dev/null
@@ -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))
-
--
1.6.3.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins
2010-02-18 23:36 ` [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins Thomas Petazzoni
@ 2010-02-19 10:12 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2010-02-19 10:12 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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 <thomas.petazzoni@free-electrons.com>
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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-02-19 10:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-18 23:36 [Buildroot] [pull request] Pull request for branch misc-fixes4 Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 1/3] Add libxpm as a dependency of ace_of_penguins Thomas Petazzoni
2010-02-19 10:12 ` Peter Korsgaard
2010-02-18 23:36 ` [Buildroot] [PATCH 2/3] Fix build failure of rubix Thomas Petazzoni
2010-02-18 23:36 ` [Buildroot] [PATCH 3/3] xboard: remove package Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox