# HG changeset patch # User Aleksej Bobylev # Date 1521041277 -7200 # Node ID 14cdf41afa35eb2682f606d2b666da83843078ea # Parent 96912f5312d86b305c8927b408c8a4826677b1ee Unsuccessful fixings (just to totally synchronize wok-hg with wok): assaultcube, astromenace, chocolate-doom, dmraid, enigma, gpm, zsnes. diff -r 96912f5312d8 -r 14cdf41afa35 assaultcube/receipt --- a/assaultcube/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/assaultcube/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -12,8 +12,8 @@ WEB_SITE="http://assault.cubers.net/" WGET_URL="$SF_MIRROR/actiongame/$TARBALL" -DEPENDS="openal libsdl-image libsdl-mixer mesa libglu-mesa assaultcube-data" -BUILD_DEPENDS="openal-dev libsdl-image-dev libsdl-mixer-dev mesa-dev \ +DEPENDS="openal libsdl-image libsdl-mixer mesa17 libglu-mesa assaultcube-data" +BUILD_DEPENDS="openal-dev libsdl-image-dev libsdl-mixer-dev mesa17-dev \ libglu-mesa-dev zlib-dev" # Rules to configure and make the package. @@ -39,4 +39,3 @@ chmod +x $fs/usr/bin/assaultcube chmod +x $fs/usr/bin/assaultcube-server } - diff -r 96912f5312d8 -r 14cdf41afa35 astromenace/receipt --- a/astromenace/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/astromenace/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -17,7 +17,7 @@ xorg-libXinerama freetype" BUILD_DEPENDS="gcc cmake make libsdl-dev libogg-dev libvorbis-dev libglu-mesa-dev \ -openal-dev freealut-dev xorg-libXinerama-dev freetype-dev mesa-dev" +openal-dev freealut-dev xorg-libXinerama-dev freetype-dev mesa17-dev" # Rules to configure and make the package. compile_rules() diff -r 96912f5312d8 -r 14cdf41afa35 chocolate-doom/receipt --- a/chocolate-doom/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/chocolate-doom/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -1,32 +1,34 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="chocolate-doom" VERSION="1.4.0" CATEGORY="games" -SHORT_DESC="Doom source port as close as possible to vanilla Doom." +SHORT_DESC="Doom source port as close as possible to vanilla Doom" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://$PACKAGE.sourceforge.net/" + TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" DEPENDS="libsdl libsdl-mixer libsdl-net libsamplerate" -BUILD_DEPENDS="libsdl-mixer-dev libsdl-net-dev libsdl-dev" +BUILD_DEPENDS="libsdl-mixer-dev libsdl-net-dev libsdl-dev libsamplerate-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm" - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS && - make $MAKEFLAGS + ./configure \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && + make $MAKEFLAGS || return 1 + + mkdir -p $install/usr/bin $install/usr/share/games/doom + cp $src/src/chocolate-doom $install/usr/bin cook_pick_manpages man/*.5 man/*.6 } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin $fs/usr/share/games/doom - cp $src/src/chocolate-doom $fs/usr/bin +genpkg_rules() { + copy @std } diff -r 96912f5312d8 -r 14cdf41afa35 dmraid/receipt --- a/dmraid/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/dmraid/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -25,8 +25,8 @@ mkdir -p $install/usr/sbin $install/usr/lib cp -a $src/lib/libdmraid.so $install/usr/lib/libdmraid.so.1 cp -a $src/tools/dmraid $install/usr/sbin - cp -a stuff/grub-dmraid $install/usr/sbin - cp -a stuff/dmraid-start $install/usr/sbin + cp -a $stuff/grub-dmraid $install/usr/sbin + cp -a $stuff/dmraid-start $install/usr/sbin } genpkg_rules() { diff -r 96912f5312d8 -r 14cdf41afa35 enigma/receipt --- a/enigma/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/enigma/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -1,38 +1,34 @@ # SliTaz package receipt. PACKAGE="enigma" -VERSION="1.01" -REVISION="r1914" +VERSION="1.21" +REVISION="r2513" CATEGORY="games" -SHORT_DESC="puzzle game similar to Oxyd" +SHORT_DESC="Puzzle game similar to Oxyd" MAINTAINER="devl547@gmail.com" LICENSE="GPL2" -TARBALL="$PACKAGE-$VERSION-$REVISION.tar.gz" WEB_SITE="http://www.nongnu.org/enigma/" -WGET_URL="http://download.berlios.de/enigma-game/$TARBALL" -DEPENDS="libsdl libsdl-ttf libsdl-mixer libsdl-image xerces-c" -BUILD_DEPENDS="gettext libsdl-ttf-dev libsdl-mixer-dev libsdl-image-dev libsdl-dev xerces-c-dev" +#TARBALL="$PACKAGE-$VERSION-$REVISION.tar.gz" +#WGET_URL="http://download.berlios.de/enigma-game/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="$SF_MIRROR/enigma-game/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $src +BUILD_DEPENDS="gettext libsdl-ttf-dev libsdl-mixer-dev libsdl-image-dev \ +libsdl-dev xerces-c-dev" + +compile_rules() { sed -i 's/stdexcept>/&\n#include /' lib-src/zipios++/src/directory.h sed -i 's/#ifndef.*/&\n#include /' lib-src/enigma-core/ecl_dict.hh ./configure \ - --build=$HOST_SYSTEM \ - --host=$HOST_SYSTEM \ - --enable-optimize 2>&1 | grep -v 'config.rpath: No such file' && + --enable-optimize \ + CPPFLAGS="-I/usr/include/SDL" \ + $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $install/usr/share/enigma $fs/usr/share +genpkg_rules() { + copy @std + DEPENDS="libsdl libsdl-ttf libsdl-mixer libsdl-image xerces-c" } diff -r 96912f5312d8 -r 14cdf41afa35 gpm/receipt --- a/gpm/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/gpm/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="gpm" -VERSION="1.20.7" +VERSION="1.99.7" CATEGORY="misc" SHORT_DESC="Mouse server for console." MAINTAINER="pascal.bellard@slitaz.org" @@ -11,67 +11,48 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="${WEB_SITE}archives/$TARBALL" +BUILD_DEPENDS_arm=" " BUILD_DEPENDS="gawk bison ncurses-dev automake autoconf libtool texinfo" SPLIT="gpm gpm-dev gpm-extra" -# When cross compiling gawk and bison build system are used. -case "$ARCH" in - arm) BUILD_DEPENDS="" ;; -esac +compile_rules() { + sed -i 's|-Werror||' Makefile.include.in -# Rules to configure and make the package. -compile_rules() -{ ./autogen.sh ln -s headers/gpm.h src # ??? - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - $CONFIGURE_ARGS && - make && make install + ./configure $CONFIGURE_ARGS && + make && make install || return 1 + +# chmod a+x $install/usr/lib/* + cp -a $stuff/* $install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - gpm) - DEPENDS="ncurses" - mkdir -p $fs/usr/lib - cp -a $install/usr/sbin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib - chmod a+x $fs/usr/lib/* - cp -a $stuff/* $fs - ;; - gpm-dev) - CAT="development|Mouse server for console, development files." - DEPENDS="gpm" - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*a $fs/usr/lib - ;; - gpm-extra) - CAT="misc|Mouse server for console, extra files." - DEPENDS="gpm" - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr - ;; + gpm-extra) + copy bin/ + CAT="misc|extra files" + DEPENDS="gpm" + ;; + gpm) + copy @std @rm + DEPENDS="ncurses" + ;; + gpm-dev) + copy @dev + ;; esac } -# Pre and post install commands for Tazpkg. -pre_remove_gpm() -{ +pre_remove_gpm() { [ -n "$1" ] || /etc/init.d/gpm stop } -post_install_gpm() -{ +post_install_gpm() { [ -n "$1" -o -s /aufs-umount.sh ] || /etc/init.d/gpm start } # Just to be sure when cross-compiling. -testsuite_gpm_extra() -{ +testsuite_gpm_extra() { readelf -h $install/usr/bin/gpm-root } diff -r 96912f5312d8 -r 14cdf41afa35 zsnes/receipt --- a/zsnes/receipt Wed Mar 14 17:22:06 2018 +0200 +++ b/zsnes/receipt Wed Mar 14 17:27:57 2018 +0200 @@ -1,32 +1,31 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="zsnes" VERSION="1.51" CATEGORY="games" +SHORT_DESC="Super Nintendo emulator" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" -SHORT_DESC="Super Nintendo emulator" WEB_SITE="http://www.zsnes.com/" + TARBALL="$PACKAGE${VERSION//./}src.tar.bz2" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -TAGS="emulator nintendo snes" -DEPENDS="gcc-lib-base libsdl libpng16 ncurses mesa zlib" -BUILD_DEPENDS="$DEPENDS nasm libsdl-dev libpng16-dev ncurses-dev mesa-dev \ +BUILD_DEPENDS="nasm libsdl-dev libpng16-dev ncurses-dev mesa17-dev \ automake autoconf zlib-dev patch" -# Rules to configure and make the package. - -compile_rules() -{ +compile_rules() { sed -i -e '/info_ptr->color_type = /d' \ -e 's/info_ptr->color_type/png_get_color_type(png_ptr, info_ptr)/' \ src/zip/zpng.c sed -i 's/cstdio.*/&\n#include /' src/tools/depbuild.cpp - patch -p1 -i $stuff/zsnes.patch + patch -p1 -i $stuff/zsnes.patch + cd $src/src + sed -i 's|/usr/man/|/usr/share/man/|' Makefile* - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --x-libraries=/usr/lib \ --enable-release \ force_arch=$ARCH \ @@ -34,10 +33,11 @@ make && make -j 1 install } - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/src/zsnes $fs/usr/bin + +genpkg_rules() { + copy @std +# mkdir -p $fs/usr/bin +# cp -a $src/src/zsnes $fs/usr/bin + DEPENDS="gcc-lib-base libsdl libpng16 ncurses mesa17 zlib" + TAGS="emulator nintendo snes" }