[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[laird at uclibc.org]

Author: laird
Date: 2008-08-29 06:27:37 -0700 (Fri, 29 Aug 2008)
New Revision: 23283

Log:
games: Move all games into games subdir

Moved all games into a subdir called games and
then updated makefiles as necessary.

If not one objects to this one then I will
probably do the same for audio next.

Daniel Laird


Added:
   trunk/buildroot/package/games/
   trunk/buildroot/package/games/Config.in
   trunk/buildroot/package/games/ace_of_penguins/
   trunk/buildroot/package/games/gnuchess/
   trunk/buildroot/package/games/lxdoom/
   trunk/buildroot/package/games/magiccube4d/
   trunk/buildroot/package/games/rubix/
   trunk/buildroot/package/games/vice/
   trunk/buildroot/package/games/xboard/

Removed:
   trunk/buildroot/package/ace_of_penguins/
   trunk/buildroot/package/gnuchess/
   trunk/buildroot/package/lxdoom/
   trunk/buildroot/package/magiccube4d/
   trunk/buildroot/package/rubix/
   trunk/buildroot/package/vice/
   trunk/buildroot/package/xboard/

Modified:
   trunk/buildroot/package/Config.in
   trunk/buildroot/package/games/ace_of_penguins/ace_of_penguins.mk
   trunk/buildroot/package/games/gnuchess/gnuchess.mk
   trunk/buildroot/package/games/lxdoom/lxdoom.mk
   trunk/buildroot/package/games/magiccube4d/magiccube4d.mk
   trunk/buildroot/package/games/rubix/rubix.mk
   trunk/buildroot/package/games/vice/vice.mk
   trunk/buildroot/package/games/xboard/xboard.mk


Changeset:
Modified: trunk/buildroot/package/Config.in
===================================================================
--- trunk/buildroot/package/Config.in	2008-08-29 12:04:26 UTC (rev 23282)
+++ trunk/buildroot/package/Config.in	2008-08-29 13:27:37 UTC (rev 23283)
@@ -485,20 +485,7 @@
 # java support
 source "package/java/Config.in"
 
-menuconfig BR2_GAMES
-	bool "Games"
-	default y
-	help
-	  Support for games
+# various games packages
+source "package/games/Config.in"
 
-if BR2_GAMES
-source "package/lxdoom/Config.in"
-source "package/ace_of_penguins/Config.in"
-source "package/gnuchess/Config.in"
-source "package/xboard/Config.in"
-source "package/rubix/Config.in"
-source "package/magiccube4d/Config.in"
-source "package/vice/Config.in"
-endif
-
 endmenu

Added: trunk/buildroot/package/games/Config.in
===================================================================
--- trunk/buildroot/package/games/Config.in	                        (rev 0)
+++ trunk/buildroot/package/games/Config.in	2008-08-29 13:27:37 UTC (rev 23283)
@@ -0,0 +1,15 @@
+menuconfig BR2_GAMES
+	bool "Games"
+	default y
+	help
+	  Support for games
+
+if BR2_GAMES
+source "package/games/ace_of_penguins/Config.in"
+source "package/games/gnuchess/Config.in"
+source "package/games/lxdoom/Config.in"
+source "package/games/magiccube4d/Config.in"
+source "package/games/rubix/Config.in"
+source "package/games/vice/Config.in"
+source "package/games/xboard/Config.in"
+endif

Copied: trunk/buildroot/package/games/ace_of_penguins (from rev 23274, trunk/buildroot/package/ace_of_penguins)

Modified: trunk/buildroot/package/games/ace_of_penguins/ace_of_penguins.mk
===================================================================
--- trunk/buildroot/package/ace_of_penguins/ace_of_penguins.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/ace_of_penguins/ace_of_penguins.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -3,7 +3,6 @@
 # ace_of_penguins
 #
 #############################################################
-
 ACE_OF_PENGUINS_VERSION = 1.2
 ACE_OF_PENGUINS_SOURCE = ace-$(ACE_OF_PENGUINS_VERSION).tar.gz
 ACE_OF_PENGUINS_SITE = http://www.delorie.com/store/ace/
@@ -13,4 +12,4 @@
 
 ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng $(XSERVER)
 
-$(eval $(call AUTOTARGETS,package,ace_of_penguins))
\ No newline at end of file
+$(eval $(call AUTOTARGETS,package/games,ace_of_penguins))

Copied: trunk/buildroot/package/games/gnuchess (from rev 23274, trunk/buildroot/package/gnuchess)

Modified: trunk/buildroot/package/games/gnuchess/gnuchess.mk
===================================================================
--- trunk/buildroot/package/gnuchess/gnuchess.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/gnuchess/gnuchess.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -6,7 +6,6 @@
 GNUCHESS_VERSION = 5.07
 GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
-GNUCHESS_AUTORECONF = NO
 GNUCHESS_INSTALL_STAGING = NO
 GNUCHESS_INSTALL_TARGET = YES
 
@@ -14,5 +13,5 @@
 
 GNUCHESS_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,gnuchess))
+$(eval $(call AUTOTARGETS,package/games,gnuchess))
 

Copied: trunk/buildroot/package/games/lxdoom (from rev 23274, trunk/buildroot/package/lxdoom)

Modified: trunk/buildroot/package/games/lxdoom/lxdoom.mk
===================================================================
--- trunk/buildroot/package/lxdoom/lxdoom.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/lxdoom/lxdoom.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -3,11 +3,9 @@
 # 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_AUTORECONF = NO
 LXDOOM_INSTALL_STAGING = NO
 LXDOOM_INSTALL_TARGET = YES
 LXDOOM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -19,4 +17,4 @@
 
 LXDOOM_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,lxdoom))
\ No newline at end of file
+$(eval $(call AUTOTARGETS,package/games,lxdoom))

Copied: trunk/buildroot/package/games/magiccube4d (from rev 23274, trunk/buildroot/package/magiccube4d)

Modified: trunk/buildroot/package/games/magiccube4d/magiccube4d.mk
===================================================================
--- trunk/buildroot/package/magiccube4d/magiccube4d.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/magiccube4d/magiccube4d.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -6,12 +6,11 @@
 MAGICCUBE4D_VERSION = 2_2
 MAGICCUBE4D_SOURCE = magiccube4d-src-$(MAGICCUBE4D_VERSION).tar.gz
 MAGICCUBE4D_SITE = http://avr32linux.org/twiki/pub/Main/MagicCube4D
-MAGICCUBE4D_AUTORECONF = NO
 MAGICCUBE4D_INSTALL_STAGING = NO
 MAGICCUBE4D_INSTALL_TARGET = YES
 MAGICCUBE4D_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 
 MAGICCUBE4D_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,magiccube4d))
+$(eval $(call AUTOTARGETS,package/games,magiccube4d))
 

Copied: trunk/buildroot/package/games/rubix (from rev 23274, trunk/buildroot/package/rubix)

Modified: trunk/buildroot/package/games/rubix/rubix.mk
===================================================================
--- trunk/buildroot/package/rubix/rubix.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/rubix/rubix.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -6,7 +6,6 @@
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
 RUBIX_SITE = http://avr32linux.org/twiki/pub/Main/Rubix
-RUBIX_AUTORECONF = NO
 RUBIX_INSTALL_STAGING = NO
 RUBIX_INSTALL_TARGET = YES
 RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
@@ -15,5 +14,5 @@
 
 RUBIX_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,rubix))
+$(eval $(call AUTOTARGETS,package/games,rubix))
 

Copied: trunk/buildroot/package/games/vice (from rev 23274, trunk/buildroot/package/vice)

Modified: trunk/buildroot/package/games/vice/vice.mk
===================================================================
--- trunk/buildroot/package/vice/vice.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/vice/vice.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -6,7 +6,6 @@
 VICE_VERSION = 1.22
 VICE_SOURCE = vice-$(VICE_VERSION).tar.gz
 VICE_SITE = http://www.viceteam.org/online
-VICE_AUTORECONF = NO
 VICE_INSTALL_STAGING = NO
 VICE_INSTALL_TARGET = YES
 
@@ -14,5 +13,5 @@
 
 VICE_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,vice))
+$(eval $(call AUTOTARGETS,package/games,vice))
 

Copied: trunk/buildroot/package/games/xboard (from rev 23274, trunk/buildroot/package/xboard)

Modified: trunk/buildroot/package/games/xboard/xboard.mk
===================================================================
--- trunk/buildroot/package/xboard/xboard.mk	2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/games/xboard/xboard.mk	2008-08-29 13:27:37 UTC (rev 23283)
@@ -6,7 +6,6 @@
 XBOARD_VERSION = 4.2.7
 XBOARD_SOURCE = xboard-$(XBOARD_VERSION).tar.gz
 XBOARD_SITE = $(BR2_GNU_MIRROR)/xboard
-XBOARD_AUTORECONF = NO
 XBOARD_INSTALL_STAGING = NO
 XBOARD_INSTALL_TARGET = YES
 XBOARD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -15,5 +14,5 @@
 
 XBOARD_DEPENDENCIES = uclibc gnuchess
 
-$(eval $(call AUTOTARGETS,package,xboard))
+$(eval $(call AUTOTARGETS,package/games,xboard))
 

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Hans-Christian Egtvedt]

On Fri, 29 Aug 2008 06:27:37 -0700 (PDT)
laird at uclibc.org wrote:

> Author: laird
> Date: 2008-08-29 06:27:37 -0700 (Fri, 29 Aug 2008)
> New Revision: 23283
> 
> Log:
> games: Move all games into games subdir
> 
> Moved all games into a subdir called games and
> then updated makefiles as necessary.
> 
> If not one objects to this one then I will
> probably do the same for audio next.
> 

EEEEk ;)

The patching done with Makefile.autotools.in does not work with sub
directories in package/ directory, so this will not work anymore.

I have it on my TODO to look into how to fix Makefile.autotools.in to
look for patches in the proper directory.

PS! This might be fixed as well, but it was not fixed 1-2 weeks ago.

-- 
Best regards,
Hans-Christian Egtvedt

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Daniel Laird]

I have tried building the games/ace_of_penguins and packages in java/jamvm
and it is applying the patches that I expect it to.
If anyone else finds this to be wrong then I will reverse this change or fix
Makefile.autotools.in but for now it appears to be patching all correctly.

Daniel Laird
-- 
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package%3A-games-games-ace_of_penguins-games-gnuch-etc...-tp19219940p19220408.html
Sent from the BuildRoot mailing list archive at Nabble.com.

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[hartleys]

On Friday, August 29, 2008 6:39 AM, Hans-Christian Egtvedt wrote:
> On Fri, 29 Aug 2008 06:27:37 -0700 (PDT) laird at uclibc.org wrote:
>> Author: laird
>> Date: 2008-08-29 06:27:37 -0700 (Fri, 29 Aug 2008) New Revision:
23283
>> 
>> Log:
>> games: Move all games into games subdir
>> 
>> Moved all games into a subdir called games and then updated makefiles

>> as necessary.
>> 
>> If not one objects to this one then I will probably do the same for 
>> audio next.
>> 
>
> EEEEk ;)
>
> The patching done with Makefile.autotools.in does not work with sub
> directories in package/ directory, so this will not work anymore.
>
> I have it on my TODO to look into how to fix Makefile.autotools.in
> to look for patches in the proper directory.
>
> PS! This might be fixed as well, but it was not fixed 1-2 weeks ago.

In another post Daniel Laird says:

> I have tried building the games/ace_of_penguins and packages in
> java/jamvm and it is applying the patches that I expect it to.
> If anyone else finds this to be wrong then I will reverse this
> change or fix Makefile.autotools.in but for now it appears to be
> patching all correctly.

I brought up this problem with last week with a different package so I
tried building it again based on the current svn. Still no luck getting
the patches to apply. My .mk looks pretty much like the one for
ace_of_penguins so I think Makefile.autotools.in still has a problem
patching sub directories.

Just my 2 cents....

Hartley Sweeten

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Daniel Laird]

what package were you having issues with?
The more I can test the better currently I can see that the patch target
succeeds and patches the correct files if I build jamvm or ace_of_penguins
both of which live in subdirs.

I will try again ASAP (monday now) but the more bad cases I have the better
I can solve this - I want to try and keep this change but not at the expense
of everyone else :-)

Daniel 
-- 
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package%3A-games-games-ace_of_penguins-games-gnuch-etc...-tp19219940p19223815.html
Sent from the BuildRoot mailing list archive at Nabble.com.

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[danieljlaird at hotmail.com]

Not sure my ace_of_penguins check was valid.

However jamvm is definately ok and that lives in a subdir.
I believe that the problem might lie not in subdirs specifically but in 
Makefile.autotools.in handling of packages called one thing and living in 
another directory or a combination of packages in subdirs with a name that 
does not match the extracted directory path

ace_of_penguins lives in a directory called ace.
Maybe this is common to the packages you have suggested are failing.

I will look into this on monday
Daniel

--------------------------------------------------
From: "Daniel Laird" <daniel.j.laird@nxp.com>
Sent: Friday, August 29, 2008 5:59 PM
To: <buildroot@uclibc.org>
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package: games 
games/ace_of_penguins games/gnuch etc...

>
> what package were you having issues with?
> The more I can test the better currently I can see that the patch target
> succeeds and patches the correct files if I build jamvm or ace_of_penguins
> both of which live in subdirs.
>
> I will try again ASAP (monday now) but the more bad cases I have the 
> better
> I can solve this - I want to try and keep this change but not at the 
> expense
> of everyone else :-)
>
> Daniel
> -- 
> View this message in context: 
> http://www.nabble.com/svn-commit%3A-trunk-buildroot-package%3A-games-games-ace_of_penguins-games-gnuch-etc...-tp19219940p19223815.html
> Sent from the BuildRoot mailing list archive at Nabble.com.
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
> 

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Daniel Laird]

I have just tried to patch various games packages and java ones
jamvm (packages/java/jamvm) works fine patch-version and patch-version.arch
work

ace_of_penguins - the libtool patch fails I think this a fault with libtool
patch not the dir move
lxdoom - patch target works
rubix - patch target works
gnuchess - patch target works
vice - patch target works

So I think the move is fine and that the issues are with making the libtool
patch apply to more targets
Daniel Laird

-- 
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package%3A-games-games-ace_of_penguins-games-gnuch-etc...-tp19219940p19250901.html
Sent from the BuildRoot mailing list archive at Nabble.com.

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[hartleys]

On Monday, September 01, 2008 2:07 AM, Daniel Laird wrote:
> I have just tried to patch various games packages and java
> ones jamvm (packages/java/jamvm) works fine patch-version
> and patch-version.arch work
>
> ace_of_penguins - the libtool patch fails I think this a
> fault with libtool patch not the dir move lxdoom - patch
> target works rubix - patch target works gnuchess - patch
> target works vice - patch target works
>
> So I think the move is fine and that the issues are with
> making the libtool patch apply to more targets Daniel Laird

Daniel, I still don't see how the patches can be applied correctly with
the current rule in Makefile.autotools.in.

I tried to test it this morning by building one of the games packages
(gnuchess) and it never even gets processed. I think there needs to be a
games.mk in package/games that does a:

include package/games/*/*.mk

Hartley

[Buildroot] svn commit: trunk/buildroot/package: gamesgames/ace_of_penguins games/gnuch etc...

[hartleys]

Tuesday, September 02, 2008 10:49 AM, hartleys wrote:
>> I have just tried to patch various games packages and java ones jamvm

>> (packages/java/jamvm) works fine patch-version and patch-version.arch

>> work
>>
>> ace_of_penguins - the libtool patch fails I think this a fault with 
>> libtool patch not the dir move lxdoom - patch target works rubix - 
>> patch target works gnuchess - patch target works vice - patch target 
>> works
>>
>> So I think the move is fine and that the issues are with making the 
>> libtool patch apply to more targets Daniel Laird
>
> Daniel, I still don't see how the patches can be applied correctly
with
> the current rule in Makefile.autotools.in.

Dumb, dumb, dumb.... Ok. I get how the patches are installed...

In the comments at the top of Makefile.autotools.in there is an example
of the AUTOTARGETS call:

$(eval $(call AUTOTARGETS,foo))

At some point another argument was added to the call:

$(eval $(call AUTOTARGETS,package_dir,foo))

This is explained later in the file but I missed it. For the package I
was trying to patch/build in a subdirectory of package/customize I had
the package_dir argument set wrong. After I chaged it my source does get
patched correctly.

> I tried to test it this morning by building one of the games packages
> (gnuchess) and it never even gets processed. I think there needs to be
> a games.mk in package/games that does a:
>
> include package/games/*/*.mk

BTW, as far as I can tell this is still needed to get any of the games
to build.

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Peter Korsgaard]

>>>>> "hartleys" == hartleys  <hartleys@visionengravers.com> writes:

Hi,

 hartleys> I tried to test it this morning by building one of the
 hartleys> games packages (gnuchess) and it never even gets
 hartleys> processed. I think there needs to be a games.mk in
 hartleys> package/games that does a:

 hartleys> include package/games/*/*.mk

Yes, that's needed - I've added it as r23309.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package: games games/ace_of_penguins games/gnuch etc...

[Daniel Laird]

Apologies,
Thats what comes from patching one tree and using a different one for
testing :-(

Is there any reason to not do the same for audio packages (the list in the
audio menu).

Daniel
-- 
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package%3A-games-games-ace_of_penguins-games-gnuch-etc...-tp19219940p19283994.html
Sent from the BuildRoot mailing list archive at Nabble.com.