| Message ID | 1392108199-14612-1-git-send-email-julien.boibessot@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
On 11/02/14 09:43, julien.boibessot@free.fr wrote: > From: Julien Boibessot <julien.boibessot@armadeus.com> > > > Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (untested) Normally there should be two separate patches for the two packages, but I think it's OK to go in as it is. BTW, please submit revised patches with --subject-prefix='PATCH v2' even if the first revision was an RFC. Regards, Arnout
>>>>> "julien" == julien boibessot <julien.boibessot@free.fr> writes: > From: Julien Boibessot <julien.boibessot@armadeus.com> > Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> > --- > Changes since RFC: > - Took Arnout & Thomas comments into account: > * installation of executable in /usr/bin instead of /usr/games > * removing of double BR2_PACKAGE_SDL_NET > * usage of /bin/true for STRIP > * lowercase for .mk banner > * creation of a dedicated package for game data > package/Config.in | 2 + > package/opentyrian-data/Config.in | 8 ++++++ > package/opentyrian-data/opentyrian-data.mk | 23 +++++++++++++++++ > package/opentyrian/Config.in | 24 ++++++++++++++++++ > package/opentyrian/opentyrian.mk | 36 ++++++++++++++++++++++++++++ > 5 files changed, 93 insertions(+), 0 deletions(-) > create mode 100644 package/opentyrian-data/Config.in > create mode 100644 package/opentyrian-data/opentyrian-data.mk > create mode 100644 package/opentyrian/Config.in > create mode 100644 package/opentyrian/opentyrian.mk > diff --git a/package/Config.in b/package/Config.in > index 631d8b2..c89f303 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -159,6 +159,8 @@ source "package/doom-wad/Config.in" > source "package/gnuchess/Config.in" > source "package/lbreakout2/Config.in" > source "package/ltris/Config.in" > +source "package/opentyrian/Config.in" > +source "package/opentyrian-data/Config.in" > source "package/prboom/Config.in" > source "package/rubix/Config.in" > endmenu > diff --git a/package/opentyrian-data/Config.in b/package/opentyrian-data/Config.in > new file mode 100644 > index 0000000..ee3d8be > --- /dev/null > +++ b/package/opentyrian-data/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_OPENTYRIAN_DATA > + bool "OpenTyrian data" > + help I don't think it makes much sense for people to select opentyrian-data without opentyrian, so I've added a 'depends on BR2_PACKAGE_OPENTYRIAN' and committed to next, thanks.
diff --git a/package/Config.in b/package/Config.in index 631d8b2..c89f303 100644 --- a/package/Config.in +++ b/package/Config.in @@ -159,6 +159,8 @@ source "package/doom-wad/Config.in" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" +source "package/opentyrian/Config.in" +source "package/opentyrian-data/Config.in" source "package/prboom/Config.in" source "package/rubix/Config.in" endmenu diff --git a/package/opentyrian-data/Config.in b/package/opentyrian-data/Config.in new file mode 100644 index 0000000..ee3d8be --- /dev/null +++ b/package/opentyrian-data/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_OPENTYRIAN_DATA + bool "OpenTyrian data" + help + Data files to use with OpenTyrian game. Currently only the original + Tyrian 2.1 data files, that have been released as Freeware in 2004, + are compatible. + + http://code.google.com/p/opentyrian/wiki/FAQ diff --git a/package/opentyrian-data/opentyrian-data.mk b/package/opentyrian-data/opentyrian-data.mk new file mode 100644 index 0000000..75fa3d9 --- /dev/null +++ b/package/opentyrian-data/opentyrian-data.mk @@ -0,0 +1,23 @@ +############################################################################### +# +# opentyrian-data +# +############################################################################### + +OPENTYRIAN_DATA_VERSION = 2.1 +OPENTYRIAN_DATA_SITE = http://www.camanis.net/opentyrian/ +OPENTYRIAN_DATA_SOURCE = tyrian21.zip +OPENTYRIAN_DATA_LICENSE = Freeware + +define OPENTYRIAN_DATA_EXTRACT_CMDS + unzip -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE) +endef + +define OPENTYRIAN_DATA_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/share/opentyrian/data/ + cp $(@D)/tyrian21/* $(TARGET_DIR)/usr/share/opentyrian/data/ + rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.doc + rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.exe +endef + +$(eval $(generic-package)) diff --git a/package/opentyrian/Config.in b/package/opentyrian/Config.in new file mode 100644 index 0000000..3ebcf08 --- /dev/null +++ b/package/opentyrian/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_OPENTYRIAN + bool "OpenTyrian" + select BR2_PACKAGE_SDL + select BR2_PACKAGE_OPENTYRIAN_DATA + help + OpenTyrian is a port of the DOS shoot-em-up Tyrian. It uses SDL, + making it easily cross-platform. + It requires the original data files to run. + A display with minimum 640x480 resolution and a keyboard are needed + to play the game. + If you want some sound, activate ALSA with OSS emulation. + + http://code.google.com/p/opentyrian/ + +if BR2_PACKAGE_OPENTYRIAN + +config BR2_PACKAGE_OPENTYRIAN_NET + bool "network support" + default y + select BR2_PACKAGE_SDL_NET + help + Activates network support in OpenTyrian. Will add SDL_net. + +endif diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk new file mode 100644 index 0000000..80465a3 --- /dev/null +++ b/package/opentyrian/opentyrian.mk @@ -0,0 +1,36 @@ +############################################################################### +# +# opentyrian +# +############################################################################### + +OPENTYRIAN_VERSION = 2.1.20130907 +OPENTYRIAN_SITE = http://www.camanis.net/opentyrian/releases/ +OPENTYRIAN_SOURCE = opentyrian-$(OPENTYRIAN_VERSION)-src.tar.gz +OPENTYRIAN_LICENSE = GPLv2+ +OPENTYRIAN_LICENSE_FILES = COPYING + +OPENTYRIAN_DEPENDENCIES = sdl + +ifeq ($(BR2_PACKAGE_OPENTYRIAN_NET),y) +OPENTYRIAN_DEPENDENCIES += sdl_net +OPENTYRIAN_NETWORK = true +else +OPENTYRIAN_NETWORK = false +endif + +define OPENTYRIAN_BUILD_CMDS + $(MAKE) PLATFORM=UNIX \ + CC="$(TARGET_CC)" \ + STRIP="/bin/true" \ + SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ + LDFLAGS="-lm" \ + WITH_NETWORK="$(OPENTYRIAN_NETWORK)" \ + -C $(@D) release +endef + +define OPENTYRIAN_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/opentyrian $(TARGET_DIR)/usr/bin/opentyrian +endef + +$(eval $(generic-package))