# HG changeset patch # User Aleksej Bobylev # Date 1546853271 -7200 # Node ID f29965805403d9917d3dc48d3bb2291a416c1689 # Parent ab0a20fa8bd0366f32839324186947e35161f6aa Small updates. diff -r ab0a20fa8bd0 -r f29965805403 cairomm/receipt --- a/cairomm/receipt Mon Jan 07 11:16:02 2019 +0200 +++ b/cairomm/receipt Mon Jan 07 11:27:51 2019 +0200 @@ -11,10 +11,14 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="http://cairographics.org/releases/$TARBALL" +TARBALL_SHA1="621546f32221a2ddc079167a13ce5b5409bed704" BUILD_DEPENDS="cairo-dev libsigc++-dev" SPLIT="$PACKAGE-dev" +DEPENDS_std="libcairo libsigc++" +DEPENDS_dev="$PACKAGE cairo-dev libsigc++-dev" + compile_rules() { sed -i "/^libdocdir =/ s|\$(book_name)|cairomm-$VERSION|" docs/Makefile.in @@ -23,16 +27,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - cairomm) - copy @std - DEPENDS="libcairo libsigc++" - ;; - cairomm-dev) - copy @dev - DEPENDS="cairomm cairo-dev libsigc++-dev" - ;; - esac -} diff -r ab0a20fa8bd0 -r f29965805403 cdparanoia/receipt --- a/cdparanoia/receipt Mon Jan 07 11:16:02 2019 +0200 +++ b/cdparanoia/receipt Mon Jan 07 11:27:51 2019 +0200 @@ -10,6 +10,7 @@ TARBALL="$PACKAGE-III-$VERSION.src.tgz" WGET_URL="http://downloads.xiph.org/releases/$PACKAGE/$TARBALL" +TARBALL_SHA1="1901e20d3a370ca6afa4c76a9ef30d3f03044320" SPLIT="$PACKAGE-dev" @@ -21,5 +22,7 @@ ./configure $CONFIGURE_ARGS && make -j1 && - make install + make install || return 1 + + find $install -type f \( -name '*.so*' -o -name '*.a' \) -exec chmod a+x '{}' \; # 644->755 } diff -r ab0a20fa8bd0 -r f29965805403 cdrkit/receipt --- a/cdrkit/receipt Mon Jan 07 11:16:02 2019 +0200 +++ b/cdrkit/receipt Mon Jan 07 11:27:51 2019 +0200 @@ -3,65 +3,50 @@ PACKAGE="cdrkit" VERSION="1.1.11" CATEGORY="utilities" -SHORT_DESC="Wodim for recording/blanking CDs/DVDs and genisoimage for ISO" +SHORT_DESC="A collection of CD/DVD utilities" MAINTAINER="devel@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://www.cdrkit.org/" +WEB_SITE="http://www.cdrkit.org/" # website is empty TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://cdrkit.org/releases/$TARBALL" +#WGET_URL="http://cdrkit.org/releases/$TARBALL" # website is empty +WGET_URL="https://dev.alpinelinux.org/archive/cdrkit/$TARBALL" +TARBALL_SHA1="3f7ddc06db0272942e1a4cd98c3c96462df77387" + EXTRA_SOURCE_FILES="cdrkit-1.1.9-efi-boot.patch" -BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev" +BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev libzstd" SPLIT="$PACKAGE-audio $PACKAGE-isoinfo readom" +COPY_std="genisoimage wodim cdrecord mkisofs mkhybrid" +COPY_audio="cdda2mp3 cdda2ogg cdda2wav icedax pitchplay" +COPY_isoinfo="isoinfo" +COPY_readom="readom readcd" + +CAT_audio="multimedia|extracting audio files" +CAT_isoinfo="multimedia|work with iso9660 images" +CAT_readom="utilities|for use with graveman" + +DEPENDS_std="libcap zlib libbzip2 attr" + compile_rules() { - sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \ - genisoimage/CMakeLists.txt - [ -s $SRC/cdrkit-1.1.9-efi-boot.patch ] || - wget -P $SRC https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch - patch -p1 < $SRC/cdrkit-1.1.9-efi-boot.patch + LDFLAGS="$LDFLAGS -Wno-dev" # mute cmake developer warnings + sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' genisoimage/CMakeLists.txt make PREFIX=/usr && - make PREFIX=/usr install + make PREFIX=/usr install || return 1 + + # make symlinks for cdrtools compatibility + cd $install/usr/bin + ln -s genisoimage mkhybrid + ln -s genisoimage mkisofs + ln -s icedax cdda2wav + ln -s readom readcd + ln -s wodim cdrecord + cd $install/usr/share/man/man1 + ln -s genisoimage.1 mkhybrid.1 + ln -s genisoimage.1 mkisofs.1 + ln -s icedax.1 cdda2wav.1 + ln -s readom.1 readcd.1 + ln -s wodim.1 cdrecord.1 } - -genpkg_rules() { - case $PACKAGE in - cdrkit) - DEPENDS="libcap zlib libbzip2 attr" - mkdir -p $fs/usr/bin - cp $install/usr/bin/genisoimage $fs/usr/bin - cp $install/usr/bin/wodim $fs/usr/bin - # Make symlinks for cdrtools compatibility - cd $fs/usr/bin - ln -s wodim cdrecord - ln -s genisoimage mkisofs - ln -s genisoimage mkhybrid - ;; - cdrkit-audio) - CAT="multimedia|Icedax, cdda2ogg and other tools for extracting audio files." - mkdir -p $fs/usr/bin - cp -a $install/usr/bin/cdda* $fs/usr/bin - cp $install/usr/bin/icedax $fs/usr/bin - cp $install/usr/bin/pitchplay $fs/usr/bin - # Make symlinks for cdrtools compatibility - cd $fs/usr/bin - ln -s icedax cdda2wav - ;; - cdrkit-isoinfo) - CAT="multimedia|Isoinfo Utility programs for iso9660 images" - mkdir -p $fs/usr/bin - cp -a $install/usr/bin/isoinfo $fs/usr/bin - ;; - readom) - CAT="utilities|readom as readcd for use with graveman" - mkdir -p $fs/usr/bin - cp $install/usr/bin/readom $fs/usr/bin - - # Make symlinks for cdrtools compatibility - cd $fs/usr/bin - ln -s readom readcd - ;; - esac -} diff -r ab0a20fa8bd0 -r f29965805403 cdrkit/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cdrkit/stuff/patches/series Mon Jan 07 11:27:51 2019 +0200 @@ -0,0 +1,1 @@ +-p1|https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch|sha1=05b36806a6df54752d1407161509a71d827f93c1 diff -r ab0a20fa8bd0 -r f29965805403 check/receipt --- a/check/receipt Mon Jan 07 11:16:02 2019 +0200 +++ b/check/receipt Mon Jan 07 11:27:51 2019 +0200 @@ -11,11 +11,15 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/libcheck/check/releases/download/$VERSION/$TARBALL" +TARBALL_SHA1="f6d95392b8c6b9efdab559e6dba239b30a389b56" SPLIT="$PACKAGE-dev" COOKOPTS="force-arch" # different .h +COPY_std="*.so*" +COPY_dev="@dev checkmk" + compile_rules() { ./configure \ --disable-static \ @@ -24,15 +28,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - check) - copy *.so* - ;; - *-dev) - copy @dev checkmk - rm -r $fs/usr/share/doc - ;; - esac -} diff -r ab0a20fa8bd0 -r f29965805403 cookutils/receipt --- a/cookutils/receipt Mon Jan 07 11:16:02 2019 +0200 +++ b/cookutils/receipt Mon Jan 07 11:27:51 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="cookutils" -VERSION="1127" +VERSION="1130" CATEGORY="base-system" SHORT_DESC="SliTaz packages builder new generation" MAINTAINER="devel@slitaz.org" diff -r ab0a20fa8bd0 -r f29965805403 zstd/receipt --- a/zstd/receipt Mon Jan 07 11:16:02 2019 +0200 +++ b/zstd/receipt Mon Jan 07 11:27:51 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="zstd" -VERSION="1.3.7" +VERSION="1.3.8" CATEGORY="base-system" SHORT_DESC="Zstandard - Fast real-time compression algorithm" MAINTAINER="pascal.bellard@slitaz.org" @@ -10,9 +10,14 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/facebook/zstd/archive/v$VERSION.tar.gz" +TARBALL_SHA1="c9a15a6866df9529e2c66935225d2b51487fd84c" BUILD_DEPENDS="grep zlib-dev xz-dev lz4-dev" -SPLIT="$PACKAGE-dev" +SPLIT="lib$PACKAGE $PACKAGE $PACKAGE-dev" +# zstd binaries doesn't depends on zstd library + +DEPENDS_libzstd=" " +DEPENDS_std="liblz4 liblzma zlib" TAGS_std="compression"