From e41a2ab2286e96c1e681e51eb874e7f614bfeec6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Jul 2010 20:09:28 +0200 Subject: [PATCH] mame: update package for new create_addon script Signed-off-by: Stephan Raue --- packages/addons/emulators/mame/addon | 9 ++++++ packages/addons/emulators/mame/build | 25 +---------------- .../mame/{scripts => }/changelog.txt | 0 .../emulators/mame/{scripts => icon}/icon.png | Bin packages/addons/emulators/mame/install | 15 ---------- packages/addons/emulators/mame/meta | 14 ++++++++++ .../addons/emulators/mame/scripts/addon.xml | 21 -------------- .../addons/emulators/mame/scripts/default.py | 26 ------------------ .../addons/emulators/mame/scripts/start.sh | 8 ++++-- packages/addons/emulators/mame/url | 1 - 10 files changed, 30 insertions(+), 89 deletions(-) create mode 100755 packages/addons/emulators/mame/addon rename packages/addons/emulators/mame/{scripts => }/changelog.txt (100%) rename packages/addons/emulators/mame/{scripts => icon}/icon.png (100%) delete mode 100755 packages/addons/emulators/mame/install create mode 100644 packages/addons/emulators/mame/meta delete mode 100644 packages/addons/emulators/mame/scripts/addon.xml delete mode 100644 packages/addons/emulators/mame/scripts/default.py delete mode 100644 packages/addons/emulators/mame/url diff --git a/packages/addons/emulators/mame/addon b/packages/addons/emulators/mame/addon new file mode 100755 index 0000000000..e04f1ed1c4 --- /dev/null +++ b/packages/addons/emulators/mame/addon @@ -0,0 +1,9 @@ +#!/bin/sh + +. config/options $1 + +mkdir -p $ADDON_BUILD/mkimage + cp $PKG_DIR/config/mame.ini $ADDON_BUILD/mkimage + +mkdir -p $ADDON_BUILD/mkimage/bin + cp $PKG_BUILD/mame $ADDON_BUILD/mkimage/bin diff --git a/packages/addons/emulators/mame/build b/packages/addons/emulators/mame/build index da93b81764..1ce9eaf819 100755 --- a/packages/addons/emulators/mame/build +++ b/packages/addons/emulators/mame/build @@ -1,16 +1,6 @@ #!/bin/sh -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build SDL -$SCRIPTS/build expat -$SCRIPTS/build zlib - -ADDON_ID="addon.emulators.$1" -ADDON_VERSION="2" - -PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1` +. config/options $1 cd $PKG_BUILD @@ -63,16 +53,3 @@ cd $PKG_BUILD SUFFIX64="" \ $ARCH_OPTS \ $DEBUG_OPTS - -mkdir -p .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 - - cp $PKG_DIR/config/mame.ini .addons/$ADDON_ID - -mkdir -p .addons/$ADDON_ID/bin - cp mame .addons/$ADDON_ID/bin - -cd .addons - zip -rq $ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $ADDON_ID diff --git a/packages/addons/emulators/mame/scripts/changelog.txt b/packages/addons/emulators/mame/changelog.txt similarity index 100% rename from packages/addons/emulators/mame/scripts/changelog.txt rename to packages/addons/emulators/mame/changelog.txt diff --git a/packages/addons/emulators/mame/scripts/icon.png b/packages/addons/emulators/mame/icon/icon.png similarity index 100% rename from packages/addons/emulators/mame/scripts/icon.png rename to packages/addons/emulators/mame/icon/icon.png diff --git a/packages/addons/emulators/mame/install b/packages/addons/emulators/mame/install deleted file mode 100755 index ea7ae0f298..0000000000 --- a/packages/addons/emulators/mame/install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -. config/options - -ADDON_ID="addon.emulators.$1" -ADDON_VERSION="2" - -PKG_DIR=`find $PACKAGES -type d -name $1` - -if [ "$2" = addons ]; then - mkdir -p $TARGET_ADDONS/$ADDON_ID - cp $PKG_BUILD/.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 \ No newline at end of file diff --git a/packages/addons/emulators/mame/meta b/packages/addons/emulators/mame/meta new file mode 100644 index 0000000000..a1e2ce3b5e --- /dev/null +++ b/packages/addons/emulators/mame/meta @@ -0,0 +1,14 @@ +PKG_NAME="mame" +PKG_VERSION="0138s" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="free" +PKG_SITE="http://www.mame.org" +PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="libX11 libXinerama SDL expat zlib" +PKG_BUILD_DEPENDS="toolchain libX11 libXinerama SDL expat zlib" +PKG_PRIORITY="optional" +PKG_SECTION="emulators" +PKG_SHORTDESC="(Emulator) MAME: Multiple Arcade Machine Emulator" +PKG_LONGDESC="MAME stands for Multiple Arcade Machine Emulator. When used in conjunction with images of the original arcade game's ROM and disk data, MAME attempts to reproduce that game as faithfully as possible on a more modern general-purpose computer. MAME can currently emulate several thousand different classic arcade video games from the late 1970s through the modern era." +PKG_IS_ADDON="yes" diff --git a/packages/addons/emulators/mame/scripts/addon.xml b/packages/addons/emulators/mame/scripts/addon.xml deleted file mode 100644 index cf4d311595..0000000000 --- a/packages/addons/emulators/mame/scripts/addon.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - executable - - - MAME - Multiple Arcade Machine Emulator - -MAME stands for Multiple Arcade Machine Emulator. When used in conjunction with images of the original arcade game's ROM and disk data, MAME attempts to reproduce that game as faithfully as possible on a more modern general-purpose computer. MAME can currently emulate several thousand different classic arcade video games from the late 1970s through the modern era. - - all - - diff --git a/packages/addons/emulators/mame/scripts/default.py b/packages/addons/emulators/mame/scripts/default.py deleted file mode 100644 index 6ad5d8a9a5..0000000000 --- a/packages/addons/emulators/mame/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/emulators/mame/scripts/start.sh b/packages/addons/emulators/mame/scripts/start.sh index b98ca9d0a1..7133bc8d8f 100755 --- a/packages/addons/emulators/mame/scripts/start.sh +++ b/packages/addons/emulators/mame/scripts/start.sh @@ -30,7 +30,11 @@ mkdir -p $HOME/emulators/mame/cheat mkdir -p $HOME/emulators/mame/crosshair -# fix permissions lost after unpack - chmod +x ./bin/mame +mkdir -p image + mount -o loop mame.img image +ln -sf image/* . ./bin/mame $@ + +umount image + diff --git a/packages/addons/emulators/mame/url b/packages/addons/emulators/mame/url deleted file mode 100644 index 328f551ebb..0000000000 --- a/packages/addons/emulators/mame/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/mame-0138s.tar.bz2