# HG changeset patch # User Pascal Bellard # Date 1356450045 -3600 # Node ID 72b5cd3cb23adffde38e3da47a57175f48b28a62 # Parent 4ca63ea76ba0844790116a23b55cb42b2e7535ae Add xdigger diff -r 4ca63ea76ba0 -r 72b5cd3cb23a lz4/receipt --- a/lz4/receipt Sun Dec 23 17:59:51 2012 +0000 +++ b/lz4/receipt Tue Dec 25 16:40:45 2012 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="lz4" -VERSION="74" +VERSION="87" CATEGORY="base-system" SHORT_DESC="High speed compressor." MAINTAINER="pascal.bellard@slitaz.org" diff -r 4ca63ea76ba0 -r 72b5cd3cb23a syslinux/stuff/iso2exe/bootlinux.c --- a/syslinux/stuff/iso2exe/bootlinux.c Sun Dec 23 17:59:51 2012 +0000 +++ b/syslinux/stuff/iso2exe/bootlinux.c Tue Dec 25 16:40:45 2012 +0100 @@ -22,7 +22,9 @@ #define SETUP_SEGMENT 0x9000 #define CMDLINE_OFFSET 0x9E00 -#define BUFFERSZ 2*1024 +#define PAGE_BITS 12 +#define PAGE_SIZE 4096 +#define BUFFERSZ PAGE_SIZE static char buffer[BUFFERSZ]; static unsigned long initrd_addr, initrd_size; @@ -88,6 +90,8 @@ #endasm } +#undef ZIMAGE_SUPPORT /* Does not work... */ + static int versiondos; static int dosversion(void) { @@ -111,7 +115,7 @@ printf("DOS %d not supported.\nTrying anyway...\n", versiondos); } - p->align = 4096; + p->align = PAGE_SIZE; break; case 4096: // first initrd initrd_addr = p->base; @@ -169,8 +173,35 @@ #define HDRS 0x53726448 if (* (unsigned long *) (buffer + HEADER) != HDRS) version = 0; + if (version < 0x204) + syssize &= 0x000FFFFFUL; + if (version) { +#ifdef REALMODE_SWITCH + extern int far_realmode_switch(); +#asm + jmp end_realmode_switch +_far_realmode_switch: + call _realmode_switch + cli + mov al, #0x80 // Disable NMI + out 0x70, al + retf +end_realmode_switch: +#endasm + * (unsigned short *) (buffer + RMSWOFS) = + far_realmode_switch; + * (unsigned short *) (buffer + RMSWSEG) = + getcs(); +#endif + kernelmem.base = + * (unsigned long *) (buffer + SYSTEMCODE); + * (unsigned short *) (buffer + HEAPPTR) = + 0x9B00; + // buffer[LOADFLAGS] |= 0x80; + * (unsigned short *) (buffer + LOADERTYPE) |= + 0x80FF; + } if (!version || !(buffer[LOADFLAGS] & 1)) { -#undef ZIMAGE_SUPPORT /* Does not work... */ #ifdef ZIMAGE_SUPPORT #asm pusha @@ -199,21 +230,6 @@ #endif die("Not a bzImage format"); } - if (version < 0x204) - syssize &= 0x000FFFFFUL; - if (version) { -#ifdef REALMODE_SWITCH - * (unsigned short *) (buffer + RMSWOFS) = - realmode_switch; - * (unsigned short *) (buffer + RMSWSEG) = - getcs(); -#endif - * (unsigned short *) (buffer + HEAPPTR) = - 0x9B00; - // buffer[LOADFLAGS] |= 0x80; - * (unsigned short *) (buffer + LOADERTYPE) |= - 0x80FF; - } } movesetup(); setup -= n; diff -r 4ca63ea76ba0 -r 72b5cd3cb23a syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Sun Dec 23 17:59:51 2012 +0000 +++ b/syslinux/stuff/iso2exe/init Tue Dec 25 16:40:45 2012 +0100 @@ -330,13 +330,13 @@ exec 3>&1 format=`$DIALOG --clear \ --title " Select the filesystem " \ - --menu "\nPlease select the filesystem type to create.\n\n\ + --radiolist "\nPlease select the filesystem type to create.\n\n\ The filesystem creation will erase all the data \ in the USB key." 14 70 4 \ - "none" "Do not erase the USB key" \ - "ext3" "Ext3 journaling filesystem" \ - "ext2" "Ext2 filesystem" \ - "fat32" "Windows FAT32 filesystem" \ + "none" "Do not erase the USB key" on \ + "ext3" "Ext3 journaling filesystem" off \ + "ext2" "Ext2 filesystem" off \ + "fat32" "Windows FAT32 filesystem" off \ 2>&1 1>&3` retval=$? exec 3>&- diff -r 4ca63ea76ba0 -r 72b5cd3cb23a xdigger/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xdigger/receipt Tue Dec 25 16:40:45 2012 +0100 @@ -0,0 +1,30 @@ +# SliTaz package receipt. + +PACKAGE="xdigger" +VERSION="1.0.10" +CATEGORY="games" +SHORT_DESC="Digger rewritten for X11." +MAINTAINER="pascal.bellard@slitaz.org" +WEB_SITE="http://www.ibiblio.org/pub/Linux/games/arcade/xdigger.lsm" +TARBALL="$PACKAGE-$VERSION.tgz" +WGET_URL="$(dirname $WEB_SITE)/$TARBALL" + +DEPENDS="xorg" +BUILD_DEPENDS="xorg-imake xorg-dev" + +# Rules to configure and make the package. +compile_rules() +{ + cd $src + sed -i 's| inpause) step = Tr.*|&\nwait_count = 0;|' runlevels.c + xmkmf + make && make DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin + cp -a $install/usr/lib $fs/usr + cp -a $install/usr/bin/X11/xdigger $fs/usr/bin +}