diff --git a/packages/games/supertux/build b/packages/games/supertux/build index 49e251049b..4155e82a66 100755 --- a/packages/games/supertux/build +++ b/packages/games/supertux/build @@ -3,19 +3,23 @@ . config/options $SCRIPTS/build toolchain +$SCRIPTS/build cmake +$SCRIPTS/build physfs +$SCRIPTS/build openal-soft $SCRIPTS/build SDL $SCRIPTS/build SDL_image $SCRIPTS/build SDL_mixer cd $BUILD/$1* -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ + +mkdir -p .build + +cd .build + +cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr \ + -D CMAKE_FIND_ROOT_PATH:PATH=$SYSROOT_PREFIX \ + .. make -$STRIP src/$1 \ No newline at end of file +$STRIP ../supertux2 diff --git a/packages/games/supertux/install b/packages/games/supertux/install index 1f4d00067c..649ce2dde0 100755 --- a/packages/games/supertux/install +++ b/packages/games/supertux/install @@ -2,14 +2,16 @@ . config/options +$SCRIPTS/install physfs +$SCRIPTS/install openal-soft $SCRIPTS/install SDL $SCRIPTS/install SDL_image $SCRIPTS/install SDL_mixer mkdir -p $INSTALL/usr/bin -cp $BUILD/$1*/src/supertux $INSTALL/usr/bin +cp $BUILD/$1*/supertux2 $INSTALL/usr/bin -mkdir -p $INSTALL/usr/share/supertux -cp -a $BUILD/$1*/data/* $INSTALL/usr/share/supertux -rm $INSTALL/usr/share/supertux/Makefile* -cp $BUILD/$1*/supertux.png $INSTALL/usr/share/supertux +mkdir -p $INSTALL/usr/share/games/supertux2 +cp -a $BUILD/$1*/data/* $INSTALL/usr/share/games/supertux2 +rm $INSTALL/usr/share/games/supertux2/Jamfile +#cp $BUILD/$1*/supertux.png $INSTALL/usr/share/supertux diff --git a/packages/games/supertux/patches/10_compile-fix.diff b/packages/games/supertux/patches/10_compile-fix.diff deleted file mode 100644 index 52a2ad72a9..0000000000 --- a/packages/games/supertux/patches/10_compile-fix.diff +++ /dev/null @@ -1,12 +0,0 @@ -# Patch from Debian by Martin Michlmayr ---- supertux-0.1.3.orig/src/menu.h -+++ supertux-0.1.3/src/menu.h -@@ -207,7 +207,7 @@ - - bool isToggled(int id); - -- void Menu::get_controlfield_key_into_input(MenuItem *item); -+ void get_controlfield_key_into_input(MenuItem *item); - - void draw (); - void draw_item(int index, int menu_width, int menu_height); diff --git a/packages/games/supertux/url b/packages/games/supertux/url index 36c549a68d..56aea530be 100644 --- a/packages/games/supertux/url +++ b/packages/games/supertux/url @@ -1 +1 @@ -http://download.berlios.de/supertux/supertux-0.1.3.tar.bz2 +http://download.berlios.de/supertux/supertux-0.3.1d.tar.bz2 diff --git a/packages/toolchain/archivers/lzma/url b/packages/toolchain/archivers/lzma/url index 22119cdae6..ad7bb35542 100644 --- a/packages/toolchain/archivers/lzma/url +++ b/packages/toolchain/archivers/lzma/url @@ -1 +1 @@ -GEEXBOX_SRCS/lzma-4.57.tar.bz2 +http://sources.openelec.tv/svn/lzma-4.57.tar.bz2