From 267fbd717f49da8f78e1725e44e2a4f4270f4c55 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Jul 2010 20:10:25 +0200 Subject: [PATCH] sauerbraten: update package for new create_addon script Signed-off-by: Stephan Raue --- packages/addons/games/sauerbraten/addon | 12 +++++++ packages/addons/games/sauerbraten/build | 30 ------------------ .../sauerbraten/{scripts => }/changelog.txt | 0 .../sauerbraten/{scripts => icon}/icon.png | Bin packages/addons/games/sauerbraten/install | 13 -------- packages/addons/games/sauerbraten/meta | 14 ++++++++ .../games/sauerbraten/scripts/addon.xml | 21 ------------ .../games/sauerbraten/scripts/default.py | 26 --------------- .../addons/games/sauerbraten/scripts/start.sh | 10 +++--- packages/addons/games/sauerbraten/url | 1 - 10 files changed, 32 insertions(+), 95 deletions(-) create mode 100755 packages/addons/games/sauerbraten/addon rename packages/addons/games/sauerbraten/{scripts => }/changelog.txt (100%) rename packages/addons/games/sauerbraten/{scripts => icon}/icon.png (100%) delete mode 100755 packages/addons/games/sauerbraten/install create mode 100644 packages/addons/games/sauerbraten/meta delete mode 100644 packages/addons/games/sauerbraten/scripts/addon.xml delete mode 100644 packages/addons/games/sauerbraten/scripts/default.py delete mode 100644 packages/addons/games/sauerbraten/url diff --git a/packages/addons/games/sauerbraten/addon b/packages/addons/games/sauerbraten/addon new file mode 100755 index 0000000000..176e3a77ba --- /dev/null +++ b/packages/addons/games/sauerbraten/addon @@ -0,0 +1,12 @@ +#!/bin/sh + +. config/options $1 + +mkdir -p $ADDON_BUILD/mkimage + cp -R $BUILD/$1/data $ADDON_BUILD/mkimage + cp -R $BUILD/$1/packages $ADDON_BUILD/mkimage + cp $BUILD/$1/*.cfg $ADDON_BUILD/mkimage + +mkdir -p $ADDON_BUILD/mkimage/bin + cp $BUILD/$1/src/sauer_client $ADDON_BUILD/mkimage/bin + cp $BUILD/$1/src/sauer_server $ADDON_BUILD/mkimage/bin diff --git a/packages/addons/games/sauerbraten/build b/packages/addons/games/sauerbraten/build index ff0673a92e..31f182879b 100755 --- a/packages/addons/games/sauerbraten/build +++ b/packages/addons/games/sauerbraten/build @@ -2,19 +2,6 @@ . config/options $1 -$SCRIPTS/build toolchain -$SCRIPTS/build zlib -$SCRIPTS/build libpng -$SCRIPTS/build $LIBJPEG -$SCRIPTS/build libX11 -$SCRIPTS/build SDL -$SCRIPTS/build SDL_image -$SCRIPTS/build SDL_mixer -$SCRIPTS/build Mesa - -ADDON_ID="addon.games.$1" -ADDON_VERSION="1" - cd $BUILD/$1/src cd enet @@ -24,20 +11,3 @@ cd enet cd .. make - -cd .. - -mkdir -p .addons/$ADDON_ID - cp -R data .addons/$ADDON_ID - cp -R packages .addons/$ADDON_ID - cp *.cfg .addons/$ADDON_ID - cp -R $PKG_DIR/scripts/* .addons/$ADDON_ID - $SED "s|@ADDON_VERSION@|$OS_VERSION.$ADDON_VERSION|g" -i .addons/$ADDON_ID/addon.xml - $SED "s|@ADDON_ID@|$ADDON_ID|g" -i .addons/$ADDON_ID/addon.xml - -mkdir -p .addons/$ADDON_ID/bin - cp src/sauer_client .addons/$ADDON_ID/bin - cp src/sauer_server .addons/$ADDON_ID/bin - -cd .addons - zip -rq $ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $ADDON_ID diff --git a/packages/addons/games/sauerbraten/scripts/changelog.txt b/packages/addons/games/sauerbraten/changelog.txt similarity index 100% rename from packages/addons/games/sauerbraten/scripts/changelog.txt rename to packages/addons/games/sauerbraten/changelog.txt diff --git a/packages/addons/games/sauerbraten/scripts/icon.png b/packages/addons/games/sauerbraten/icon/icon.png similarity index 100% rename from packages/addons/games/sauerbraten/scripts/icon.png rename to packages/addons/games/sauerbraten/icon/icon.png diff --git a/packages/addons/games/sauerbraten/install b/packages/addons/games/sauerbraten/install deleted file mode 100755 index ca3fa0e36e..0000000000 --- a/packages/addons/games/sauerbraten/install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -. config/options $1 - -ADDON_ID="addon.games.$1" -ADDON_VERSION="1" - -if [ "$2" = addons ]; then - mkdir -p $TARGET_ADDONS/$ADDON_ID - cp $BUILD/$1/.addons/$ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_ID - cp $PKG_DIR/scripts/changelog.txt $TARGET_ADDONS/$ADDON_ID/changelog-$OS_VERSION.$ADDON_VERSION.txt - cp $PKG_DIR/scripts/icon.png $TARGET_ADDONS/$ADDON_ID/icon.png -fi diff --git a/packages/addons/games/sauerbraten/meta b/packages/addons/games/sauerbraten/meta new file mode 100644 index 0000000000..a5a8965358 --- /dev/null +++ b/packages/addons/games/sauerbraten/meta @@ -0,0 +1,14 @@ +PKG_NAME="sauerbraten" +PKG_VERSION="2009_05_04" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://sauerbraten.org/" +PKG_URL="http://downloads.sourceforge.net/project/sauerbraten/sauerbraten/$PKG_VERSION/${PKG_NAME}_${PKG_VERSION}_trooper_edition_linux.tar.bz2" +PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa" +PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa" +PKG_PRIORITY="optional" +PKG_SECTION="games" +PKG_SHORTDESC="(Game) Cube 2: Sauerbraten" +PKG_LONGDESC="Sauerbraten is a free multiplayer/singleplayer first person shooter, built as a major redesign of the Cube FPS. Much like the original Cube, the aim of this game is not necessarily to produce the most features and eyecandy possible, but rather to allow map/geometry editing to be done dynamically in-game, to create fun gameplay and an elegant engine." +PKG_IS_ADDON="yes" diff --git a/packages/addons/games/sauerbraten/scripts/addon.xml b/packages/addons/games/sauerbraten/scripts/addon.xml deleted file mode 100644 index a70c0f8384..0000000000 --- a/packages/addons/games/sauerbraten/scripts/addon.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - executable - - - Cube 2: Sauerbraten - -Sauerbraten is a free multiplayer/singleplayer first person shooter, built as a major redesign of the Cube FPS. -Much like the original Cube, the aim of this game is not necessarily to produce the most features and eyecandy possible, but rather to allow map/geometry editing to be done dynamically in-game, to create fun gameplay and an elegant engine. - all - - diff --git a/packages/addons/games/sauerbraten/scripts/default.py b/packages/addons/games/sauerbraten/scripts/default.py deleted file mode 100644 index 6ad5d8a9a5..0000000000 --- a/packages/addons/games/sauerbraten/scripts/default.py +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -import sys -import xbmcaddon -import os - -if ( __name__ == "__main__" ): - os.system("sh start.sh") diff --git a/packages/addons/games/sauerbraten/scripts/start.sh b/packages/addons/games/sauerbraten/scripts/start.sh index 2d0b044d4e..b2aee1e3d6 100755 --- a/packages/addons/games/sauerbraten/scripts/start.sh +++ b/packages/addons/games/sauerbraten/scripts/start.sh @@ -25,10 +25,12 @@ RESOLUTION_WIDTH=`echo $RESOLUTION | cut -f1 -d "x"` RESOLUTION_HEIGHT=`echo $RESOLUTION | cut -f2 -d "x"` SAUER_DATA=. -SAUER_OPTIONS="-q${HOME}/.sauerbraten -r" +SAUER_OPTIONS="-q${HOME}/.config/.sauerbraten -r" -# fix permissions lost after unpack - chmod +x ./bin/sauer_client - chmod +x ./bin/sauer_server +mkdir -p image + mount -o loop,ro sauerbraten.img image +ln -sf image/* . ./bin/sauer_client ${SAUER_OPTIONS} "$@" + +umount image diff --git a/packages/addons/games/sauerbraten/url b/packages/addons/games/sauerbraten/url deleted file mode 100644 index 867322d8ab..0000000000 --- a/packages/addons/games/sauerbraten/url +++ /dev/null @@ -1 +0,0 @@ -http://downloads.sourceforge.net/project/sauerbraten/sauerbraten/2009_05_04/sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2 \ No newline at end of file