# HG changeset patch # User Christophe Lincoln # Date 1394994866 -3600 # Node ID 38c69652a6530bf0754a971e9a80f47956d89250 # Parent 1e9ca6f4ca16e876f6966a02142f0766c209c921 ARMadd fbff, fbgrab, fbida, fbvnc, libexif. Fixe and update receipt diff -r 1e9ca6f4ca16 -r 38c69652a653 fbff/receipt --- a/fbff/receipt Sun Mar 16 14:51:45 2014 +0000 +++ b/fbff/receipt Sun Mar 16 19:34:26 2014 +0100 @@ -1,14 +1,16 @@ # SliTaz package receipt. PACKAGE="fbff" -VERSION="20120427" +VERSION="20130221" CATEGORY="multimedia" SHORT_DESC="FFmpeg client in frame buffer." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://repo.or.cz/w/fbff.git" -TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="git|git://repo.or.cz/fbff.git" TAGS="video" +HOST_ARCH="i486 arm" DEPENDS="ffmpeg zlib" BUILD_DEPENDS="ffmpeg-dev zlib-dev" @@ -16,15 +18,11 @@ # Rules to configure and make the package. compile_rules() { - [ -s $SOURCES_REPOSITORY/$TARBALL ] || - wget -O $SOURCES_REPOSITORY/$TARBALL \ - $WEB_SITE//snapshot/bcf8322de9d8b5d94f82db6fc6c6266fd5616fa7.tar.gz - mkdir -p $src - cd $src - tar xzf $SOURCES_REPOSITORY/$TARBALL - mkdir $DESTDIR - cd fbff - make && cp fbff $DESTDIR + case "$ARCH" in + arm*) sed -i s"#/opt#/cross/$ARCH/sysroot/usr#" Makefile ;; + esac && + sed -i s"/cc/${HOST_SYSTEM}-gcc/" Makefile && + make } @@ -32,5 +30,5 @@ genpkg_rules() { mkdir -p $fs/usr/bin - cp $install/fbff $fs/usr/bin + cp $src/fbff $fs/usr/bin } diff -r 1e9ca6f4ca16 -r 38c69652a653 fbgrab/receipt --- a/fbgrab/receipt Sun Mar 16 14:51:45 2014 +0000 +++ b/fbgrab/receipt Sun Mar 16 19:34:26 2014 +0100 @@ -1,14 +1,15 @@ # SliTaz package receipt. PACKAGE="fbgrab" -VERSION="1.0" +VERSION="1.2" CATEGORY="misc" SHORT_DESC="Frame buffer grabber." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://hem.bredband.net/gmogmo/fbgrab/" +WEB_SITE="http://fbgrab.monells.se/" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="${WEB_SITE}$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="libpng zlib" BUILD_DEPENDS="libpng-dev zlib-dev" @@ -16,8 +17,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src - sed -i '/splint/d' Makefile + #sed -i '/splint/d' Makefile make } diff -r 1e9ca6f4ca16 -r 38c69652a653 fbida/receipt --- a/fbida/receipt Sun Mar 16 14:51:45 2014 +0000 +++ b/fbida/receipt Sun Mar 16 19:34:26 2014 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fbida" -VERSION="2.07" +VERSION="2.09" CATEGORY="utilities" SHORT_DESC="Image viewer for the framebuffer console" MAINTAINER="devl547@gmail.com" @@ -9,6 +9,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://linux.bytesex.org/fbida/" WGET_URL="http://dl.bytesex.org/releases/$PACKAGE/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="libpng giflib tiff jpeg ttf-bitstream-vera libexif zlib \ libcurl freetype fontconfig" @@ -17,14 +18,14 @@ # Rules to configure and make the package. compile_rules() { - cd $src - make -j2 && make DESTDIR=$DESTDIR install + make } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - cp -a $install/usr/local/bin $fs/usr + mkdir -p $fs/usr/bin + for tool in fbi fbgs exiftran; do + cp -a ${src}/${tool} $fs/usr/bin + done } - diff -r 1e9ca6f4ca16 -r 38c69652a653 fbvnc/receipt --- a/fbvnc/receipt Sun Mar 16 14:51:45 2014 +0000 +++ b/fbvnc/receipt Sun Mar 16 19:34:26 2014 +0100 @@ -1,34 +1,33 @@ # SliTaz package receipt. PACKAGE="fbvnc" -VERSION="20110416" +VERSION="20130314" CATEGORY="network" SHORT_DESC="VNC client in frame buffer." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://repo.or.cz/w/fbvnc.git" -TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="git|git://repo.or.cz/fbvnc.git" TAGS="vnc remote-desktop" +HOST_ARCH="i486 arm" + +# Git must be installed in a cross chroot +case "$ARCH" in + i?86) BUILD_DEPENDS="git" ;; +esac # Rules to configure and make the package. compile_rules() { - [ -s $SOURCES_REPOSITORY/$TARBALL ] || - wget -O $SOURCES_REPOSITORY/$TARBALL \ - $WEB_SITE/snapshot/e42bc02b14b3331e7c7f45c6b42179d0af99ed7b.tar.gz - mkdir -p $src - cd $src - tar xzf $SOURCES_REPOSITORY/$TARBALL - mkdir $DESTDIR - cd fbvnc - patch -p0 < $stuff/fbvnc.u && - make && cp fbvnc $DESTDIR + #patch -p0 < $stuff/fbvnc.u && + sed -i s"/cc/${HOST_SYSTEM}-gcc/" Makefile && + make } - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin - cp $install/fbvnc $fs/usr/bin + cp -a $src/fbvnc $fs/usr/bin } diff -r 1e9ca6f4ca16 -r 38c69652a653 libexif-dev/receipt --- a/libexif-dev/receipt Sun Mar 16 14:51:45 2014 +0000 +++ b/libexif-dev/receipt Sun Mar 16 19:34:26 2014 +0100 @@ -8,6 +8,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" WEB_SITE="http://libexif.sourceforge.net/" +HOST_ARCH="i486 arm" DEPENDS="libexif pkg-config" diff -r 1e9ca6f4ca16 -r 38c69652a653 libexif/receipt --- a/libexif/receipt Sun Mar 16 14:51:45 2014 +0000 +++ b/libexif/receipt Sun Mar 16 19:34:26 2014 +0100 @@ -9,11 +9,11 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://libexif.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" +HOST_ARCH="i486 arm" # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ $CONFIGURE_ARGS