From 1b5c1e7bdbdf496078a8556c2906919432f60d52 Mon Sep 17 00:00:00 2001 From: Daniel Laird Date: Fri, 29 Aug 2008 13:27:37 +0000 Subject: [PATCH] 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 --- package/Config.in | 17 ++--------------- package/games/Config.in | 15 +++++++++++++++ package/{ => games}/ace_of_penguins/Config.in | 0 .../ace_of_penguins-1.2-update.patch | 0 .../ace_of_penguins/ace_of_penguins.mk | 3 +-- package/{ => games}/gnuchess/Config.in | 0 .../{ => games}/gnuchess/gnuchess-5.07.patch | 0 package/{ => games}/gnuchess/gnuchess.mk | 3 +-- package/{ => games}/lxdoom/Config.in | 0 .../lxdoom/lxdoom-1.4.4-updated.patch | 0 package/{ => games}/lxdoom/lxdoom-wad.mk | 0 package/{ => games}/lxdoom/lxdoom.mk | 4 +--- package/{ => games}/magiccube4d/Config.in | 0 .../magiccube4d-2_2-add-installer.patch | 0 .../magiccube4d-2_2-no-warn-err.patch | 0 package/{ => games}/magiccube4d/magiccube4d.mk | 3 +-- package/{ => games}/rubix/Config.in | 0 package/{ => games}/rubix/rubix-1.0.5.patch | 0 package/{ => games}/rubix/rubix.mk | 3 +-- package/{ => games}/vice/Config.in | 0 .../vice/vice-1.22-remove-bzero.patch | 0 package/{ => games}/vice/vice.mk | 3 +-- package/{ => games}/xboard/Config.in | 0 .../xboard/xboard-4.2.7-installer.patch | 0 package/{ => games}/xboard/xboard.mk | 3 +-- 25 files changed, 24 insertions(+), 30 deletions(-) create mode 100644 package/games/Config.in rename package/{ => games}/ace_of_penguins/Config.in (100%) rename package/{ => games}/ace_of_penguins/ace_of_penguins-1.2-update.patch (100%) rename package/{ => games}/ace_of_penguins/ace_of_penguins.mk (88%) rename package/{ => games}/gnuchess/Config.in (100%) rename package/{ => games}/gnuchess/gnuchess-5.07.patch (100%) rename package/{ => games}/gnuchess/gnuchess.mk (86%) rename package/{ => games}/lxdoom/Config.in (100%) rename package/{ => games}/lxdoom/lxdoom-1.4.4-updated.patch (100%) rename package/{ => games}/lxdoom/lxdoom-wad.mk (100%) rename package/{ => games}/lxdoom/lxdoom.mk (90%) rename package/{ => games}/magiccube4d/Config.in (100%) rename package/{ => games}/magiccube4d/magiccube4d-2_2-add-installer.patch (100%) rename package/{ => games}/magiccube4d/magiccube4d-2_2-no-warn-err.patch (100%) rename package/{ => games}/magiccube4d/magiccube4d.mk (86%) rename package/{ => games}/rubix/Config.in (100%) rename package/{ => games}/rubix/rubix-1.0.5.patch (100%) rename package/{ => games}/rubix/rubix.mk (89%) rename package/{ => games}/vice/Config.in (100%) rename package/{ => games}/vice/vice-1.22-remove-bzero.patch (100%) rename package/{ => games}/vice/vice.mk (85%) rename package/{ => games}/xboard/Config.in (100%) rename package/{ => games}/xboard/xboard-4.2.7-installer.patch (100%) rename package/{ => games}/xboard/xboard.mk (86%) diff --git a/package/Config.in b/package/Config.in index 72fd03d3d3..cccd455a24 100644 --- a/package/Config.in +++ b/package/Config.in @@ -485,20 +485,7 @@ endif # java support source "package/java/Config.in" -menuconfig BR2_GAMES - bool "Games" - default y - help - Support for games - -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 +# various games packages +source "package/games/Config.in" endmenu diff --git a/package/games/Config.in b/package/games/Config.in new file mode 100644 index 0000000000..45d3c82661 --- /dev/null +++ b/package/games/Config.in @@ -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 diff --git a/package/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in similarity index 100% rename from package/ace_of_penguins/Config.in rename to package/games/ace_of_penguins/Config.in diff --git a/package/ace_of_penguins/ace_of_penguins-1.2-update.patch b/package/games/ace_of_penguins/ace_of_penguins-1.2-update.patch similarity index 100% rename from package/ace_of_penguins/ace_of_penguins-1.2-update.patch rename to package/games/ace_of_penguins/ace_of_penguins-1.2-update.patch diff --git a/package/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk similarity index 88% rename from package/ace_of_penguins/ace_of_penguins.mk rename to package/games/ace_of_penguins/ace_of_penguins.mk index b067fa8b65..2aaf7aac87 100644 --- a/package/ace_of_penguins/ace_of_penguins.mk +++ b/package/games/ace_of_penguins/ace_of_penguins.mk @@ -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_TARGET = YES 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)) diff --git a/package/gnuchess/Config.in b/package/games/gnuchess/Config.in similarity index 100% rename from package/gnuchess/Config.in rename to package/games/gnuchess/Config.in diff --git a/package/gnuchess/gnuchess-5.07.patch b/package/games/gnuchess/gnuchess-5.07.patch similarity index 100% rename from package/gnuchess/gnuchess-5.07.patch rename to package/games/gnuchess/gnuchess-5.07.patch diff --git a/package/gnuchess/gnuchess.mk b/package/games/gnuchess/gnuchess.mk similarity index 86% rename from package/gnuchess/gnuchess.mk rename to package/games/gnuchess/gnuchess.mk index f8f18e0a30..b1ff3b73ad 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/games/gnuchess/gnuchess.mk @@ -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_CONF_ENV = ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull GNUCHESS_DEPENDENCIES = uclibc -$(eval $(call AUTOTARGETS,package,gnuchess)) +$(eval $(call AUTOTARGETS,package/games,gnuchess)) diff --git a/package/lxdoom/Config.in b/package/games/lxdoom/Config.in similarity index 100% rename from package/lxdoom/Config.in rename to package/games/lxdoom/Config.in diff --git a/package/lxdoom/lxdoom-1.4.4-updated.patch b/package/games/lxdoom/lxdoom-1.4.4-updated.patch similarity index 100% rename from package/lxdoom/lxdoom-1.4.4-updated.patch rename to package/games/lxdoom/lxdoom-1.4.4-updated.patch diff --git a/package/lxdoom/lxdoom-wad.mk b/package/games/lxdoom/lxdoom-wad.mk similarity index 100% rename from package/lxdoom/lxdoom-wad.mk rename to package/games/lxdoom/lxdoom-wad.mk diff --git a/package/lxdoom/lxdoom.mk b/package/games/lxdoom/lxdoom.mk similarity index 90% rename from package/lxdoom/lxdoom.mk rename to package/games/lxdoom/lxdoom.mk index bc688eb782..71d36f4981 100644 --- a/package/lxdoom/lxdoom.mk +++ b/package/games/lxdoom/lxdoom.mk @@ -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_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ LXDOOM_DEPENDENCIES = uclibc -$(eval $(call AUTOTARGETS,package,lxdoom)) \ No newline at end of file +$(eval $(call AUTOTARGETS,package/games,lxdoom)) diff --git a/package/magiccube4d/Config.in b/package/games/magiccube4d/Config.in similarity index 100% rename from package/magiccube4d/Config.in rename to package/games/magiccube4d/Config.in diff --git a/package/magiccube4d/magiccube4d-2_2-add-installer.patch b/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch similarity index 100% rename from package/magiccube4d/magiccube4d-2_2-add-installer.patch rename to package/games/magiccube4d/magiccube4d-2_2-add-installer.patch diff --git a/package/magiccube4d/magiccube4d-2_2-no-warn-err.patch b/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch similarity index 100% rename from package/magiccube4d/magiccube4d-2_2-no-warn-err.patch rename to package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch diff --git a/package/magiccube4d/magiccube4d.mk b/package/games/magiccube4d/magiccube4d.mk similarity index 86% rename from package/magiccube4d/magiccube4d.mk rename to package/games/magiccube4d/magiccube4d.mk index b6f11f814e..fa36be2895 100644 --- a/package/magiccube4d/magiccube4d.mk +++ b/package/games/magiccube4d/magiccube4d.mk @@ -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)) diff --git a/package/rubix/Config.in b/package/games/rubix/Config.in similarity index 100% rename from package/rubix/Config.in rename to package/games/rubix/Config.in diff --git a/package/rubix/rubix-1.0.5.patch b/package/games/rubix/rubix-1.0.5.patch similarity index 100% rename from package/rubix/rubix-1.0.5.patch rename to package/games/rubix/rubix-1.0.5.patch diff --git a/package/rubix/rubix.mk b/package/games/rubix/rubix.mk similarity index 89% rename from package/rubix/rubix.mk rename to package/games/rubix/rubix.mk index e9c1e063d7..586f9cf60c 100644 --- a/package/rubix/rubix.mk +++ b/package/games/rubix/rubix.mk @@ -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_MAKE_OPT = CC=$(TARGET_CC) XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="- RUBIX_DEPENDENCIES = uclibc -$(eval $(call AUTOTARGETS,package,rubix)) +$(eval $(call AUTOTARGETS,package/games,rubix)) diff --git a/package/vice/Config.in b/package/games/vice/Config.in similarity index 100% rename from package/vice/Config.in rename to package/games/vice/Config.in diff --git a/package/vice/vice-1.22-remove-bzero.patch b/package/games/vice/vice-1.22-remove-bzero.patch similarity index 100% rename from package/vice/vice-1.22-remove-bzero.patch rename to package/games/vice/vice-1.22-remove-bzero.patch diff --git a/package/vice/vice.mk b/package/games/vice/vice.mk similarity index 85% rename from package/vice/vice.mk rename to package/games/vice/vice.mk index b595dd336f..e59c6bfa12 100644 --- a/package/vice/vice.mk +++ b/package/games/vice/vice.mk @@ -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_CONF_OPT = --without-resid --with-alsa CFLAGS="-O0" VICE_DEPENDENCIES = uclibc -$(eval $(call AUTOTARGETS,package,vice)) +$(eval $(call AUTOTARGETS,package/games,vice)) diff --git a/package/xboard/Config.in b/package/games/xboard/Config.in similarity index 100% rename from package/xboard/Config.in rename to package/games/xboard/Config.in diff --git a/package/xboard/xboard-4.2.7-installer.patch b/package/games/xboard/xboard-4.2.7-installer.patch similarity index 100% rename from package/xboard/xboard-4.2.7-installer.patch rename to package/games/xboard/xboard-4.2.7-installer.patch diff --git a/package/xboard/xboard.mk b/package/games/xboard/xboard.mk similarity index 86% rename from package/xboard/xboard.mk rename to package/games/xboard/xboard.mk index 1007266395..b14aaf5ca1 100644 --- a/package/xboard/xboard.mk +++ b/package/games/xboard/xboard.mk @@ -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_CONF_OPT --prefix=/usr XBOARD_DEPENDENCIES = uclibc gnuchess -$(eval $(call AUTOTARGETS,package,xboard)) +$(eval $(call AUTOTARGETS,package/games,xboard)) -- 2.30.2