wok-next rev 21108

Small updates.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jan 07 11:27:51 2019 +0200 (2019-01-07)
parents ab0a20fa8bd0
children f4619575d2ae
files cairomm/receipt cdparanoia/receipt cdrkit/receipt cdrkit/stuff/patches/series check/receipt cookutils/receipt zstd/receipt
line diff
     1.1 --- a/cairomm/receipt	Mon Jan 07 11:16:02 2019 +0200
     1.2 +++ b/cairomm/receipt	Mon Jan 07 11:27:51 2019 +0200
     1.3 @@ -11,10 +11,14 @@
     1.4  
     1.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.6  WGET_URL="http://cairographics.org/releases/$TARBALL"
     1.7 +TARBALL_SHA1="621546f32221a2ddc079167a13ce5b5409bed704"
     1.8  
     1.9  BUILD_DEPENDS="cairo-dev libsigc++-dev"
    1.10  SPLIT="$PACKAGE-dev"
    1.11  
    1.12 +DEPENDS_std="libcairo libsigc++"
    1.13 +DEPENDS_dev="$PACKAGE cairo-dev libsigc++-dev"
    1.14 +
    1.15  compile_rules() {
    1.16  	sed -i "/^libdocdir =/ s|\$(book_name)|cairomm-$VERSION|" docs/Makefile.in
    1.17  
    1.18 @@ -23,16 +27,3 @@
    1.19  	make &&
    1.20  	make install
    1.21  }
    1.22 -
    1.23 -genpkg_rules() {
    1.24 -	case $PACKAGE in
    1.25 -		cairomm)
    1.26 -			copy @std
    1.27 -			DEPENDS="libcairo libsigc++"
    1.28 -			;;
    1.29 -		cairomm-dev)
    1.30 -			copy @dev
    1.31 -			DEPENDS="cairomm cairo-dev libsigc++-dev"
    1.32 -			;;
    1.33 -	esac
    1.34 -}
     2.1 --- a/cdparanoia/receipt	Mon Jan 07 11:16:02 2019 +0200
     2.2 +++ b/cdparanoia/receipt	Mon Jan 07 11:27:51 2019 +0200
     2.3 @@ -10,6 +10,7 @@
     2.4  
     2.5  TARBALL="$PACKAGE-III-$VERSION.src.tgz"
     2.6  WGET_URL="http://downloads.xiph.org/releases/$PACKAGE/$TARBALL"
     2.7 +TARBALL_SHA1="1901e20d3a370ca6afa4c76a9ef30d3f03044320"
     2.8  
     2.9  SPLIT="$PACKAGE-dev"
    2.10  
    2.11 @@ -21,5 +22,7 @@
    2.12  
    2.13  	./configure $CONFIGURE_ARGS &&
    2.14  	make -j1 &&
    2.15 -	make install
    2.16 +	make install || return 1
    2.17 +
    2.18 +	find $install -type f \( -name '*.so*' -o -name '*.a' \) -exec chmod a+x '{}' \; # 644->755
    2.19  }
     3.1 --- a/cdrkit/receipt	Mon Jan 07 11:16:02 2019 +0200
     3.2 +++ b/cdrkit/receipt	Mon Jan 07 11:27:51 2019 +0200
     3.3 @@ -3,65 +3,50 @@
     3.4  PACKAGE="cdrkit"
     3.5  VERSION="1.1.11"
     3.6  CATEGORY="utilities"
     3.7 -SHORT_DESC="Wodim for recording/blanking CDs/DVDs and genisoimage for ISO"
     3.8 +SHORT_DESC="A collection of CD/DVD utilities"
     3.9  MAINTAINER="devel@slitaz.org"
    3.10  LICENSE="GPL2"
    3.11 -WEB_SITE="http://www.cdrkit.org/"
    3.12 +WEB_SITE="http://www.cdrkit.org/" # website is empty
    3.13  
    3.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.15 -WGET_URL="http://cdrkit.org/releases/$TARBALL"
    3.16 +#WGET_URL="http://cdrkit.org/releases/$TARBALL" # website is empty
    3.17 +WGET_URL="https://dev.alpinelinux.org/archive/cdrkit/$TARBALL"
    3.18 +TARBALL_SHA1="3f7ddc06db0272942e1a4cd98c3c96462df77387"
    3.19 +
    3.20  EXTRA_SOURCE_FILES="cdrkit-1.1.9-efi-boot.patch"
    3.21  
    3.22 -BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev"
    3.23 +BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev libzstd"
    3.24  SPLIT="$PACKAGE-audio $PACKAGE-isoinfo readom"
    3.25  
    3.26 +COPY_std="genisoimage wodim cdrecord mkisofs mkhybrid"
    3.27 +COPY_audio="cdda2mp3 cdda2ogg cdda2wav icedax pitchplay"
    3.28 +COPY_isoinfo="isoinfo"
    3.29 +COPY_readom="readom readcd"
    3.30 +
    3.31 +CAT_audio="multimedia|extracting audio files"
    3.32 +CAT_isoinfo="multimedia|work with iso9660 images"
    3.33 +CAT_readom="utilities|for use with graveman"
    3.34 +
    3.35 +DEPENDS_std="libcap zlib libbzip2 attr"
    3.36 +
    3.37  compile_rules() {
    3.38 -	sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \
    3.39 -		genisoimage/CMakeLists.txt
    3.40 -	[ -s $SRC/cdrkit-1.1.9-efi-boot.patch ] ||
    3.41 -		wget -P $SRC https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
    3.42 -	patch -p1 < $SRC/cdrkit-1.1.9-efi-boot.patch
    3.43 +	LDFLAGS="$LDFLAGS -Wno-dev" # mute cmake developer warnings
    3.44 +	sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' genisoimage/CMakeLists.txt
    3.45  
    3.46  	make PREFIX=/usr &&
    3.47 -	make PREFIX=/usr install
    3.48 +	make PREFIX=/usr install || return 1
    3.49 +
    3.50 +	# make symlinks for cdrtools compatibility
    3.51 +	cd $install/usr/bin
    3.52 +	ln -s genisoimage   mkhybrid
    3.53 +	ln -s genisoimage   mkisofs
    3.54 +	ln -s icedax        cdda2wav
    3.55 +	ln -s readom        readcd
    3.56 +	ln -s wodim         cdrecord
    3.57 +	cd $install/usr/share/man/man1
    3.58 +	ln -s genisoimage.1 mkhybrid.1
    3.59 +	ln -s genisoimage.1 mkisofs.1
    3.60 +	ln -s icedax.1      cdda2wav.1
    3.61 +	ln -s readom.1      readcd.1
    3.62 +	ln -s wodim.1       cdrecord.1
    3.63  }
    3.64 -
    3.65 -genpkg_rules() {
    3.66 -	case $PACKAGE in
    3.67 -		cdrkit)
    3.68 -			DEPENDS="libcap zlib libbzip2 attr"
    3.69 -			mkdir -p $fs/usr/bin
    3.70 -			cp $install/usr/bin/genisoimage $fs/usr/bin
    3.71 -			cp $install/usr/bin/wodim $fs/usr/bin
    3.72 -			# Make symlinks for cdrtools compatibility
    3.73 -			cd $fs/usr/bin
    3.74 -			ln -s wodim cdrecord
    3.75 -			ln -s genisoimage mkisofs
    3.76 -			ln -s genisoimage mkhybrid
    3.77 -			;;
    3.78 -		cdrkit-audio)
    3.79 -			CAT="multimedia|Icedax, cdda2ogg and other tools for extracting audio files."
    3.80 -			mkdir -p $fs/usr/bin
    3.81 -			cp -a $install/usr/bin/cdda* $fs/usr/bin
    3.82 -			cp $install/usr/bin/icedax $fs/usr/bin
    3.83 -			cp $install/usr/bin/pitchplay $fs/usr/bin
    3.84 -			# Make symlinks for cdrtools compatibility
    3.85 -			cd $fs/usr/bin
    3.86 -			ln -s icedax cdda2wav 
    3.87 -			;;
    3.88 -		cdrkit-isoinfo)
    3.89 -			CAT="multimedia|Isoinfo Utility programs for iso9660 images"
    3.90 -			mkdir -p $fs/usr/bin
    3.91 -			cp -a $install/usr/bin/isoinfo $fs/usr/bin	
    3.92 -			;;
    3.93 -		readom)
    3.94 -			CAT="utilities|readom as readcd for use with graveman"
    3.95 -			mkdir -p $fs/usr/bin
    3.96 -			cp $install/usr/bin/readom $fs/usr/bin
    3.97 -
    3.98 -			# Make symlinks for cdrtools compatibility
    3.99 -			cd $fs/usr/bin
   3.100 -			ln -s readom readcd
   3.101 -			;;
   3.102 -	esac
   3.103 -}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/cdrkit/stuff/patches/series	Mon Jan 07 11:27:51 2019 +0200
     4.3 @@ -0,0 +1,1 @@
     4.4 +-p1|https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch|sha1=05b36806a6df54752d1407161509a71d827f93c1
     5.1 --- a/check/receipt	Mon Jan 07 11:16:02 2019 +0200
     5.2 +++ b/check/receipt	Mon Jan 07 11:27:51 2019 +0200
     5.3 @@ -11,11 +11,15 @@
     5.4  
     5.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     5.6  WGET_URL="https://github.com/libcheck/check/releases/download/$VERSION/$TARBALL"
     5.7 +TARBALL_SHA1="f6d95392b8c6b9efdab559e6dba239b30a389b56"
     5.8  
     5.9  SPLIT="$PACKAGE-dev"
    5.10  
    5.11  COOKOPTS="force-arch" # different .h
    5.12  
    5.13 +COPY_std="*.so*"
    5.14 +COPY_dev="@dev checkmk"
    5.15 +
    5.16  compile_rules() {
    5.17  	./configure \
    5.18  		--disable-static \
    5.19 @@ -24,15 +28,3 @@
    5.20  	make &&
    5.21  	make install
    5.22  }
    5.23 -
    5.24 -genpkg_rules() {
    5.25 -	case $PACKAGE in
    5.26 -		check)
    5.27 -			copy *.so*
    5.28 -			;;
    5.29 -		*-dev)
    5.30 -			copy @dev checkmk
    5.31 -			rm -r $fs/usr/share/doc
    5.32 -			;;
    5.33 -	esac
    5.34 -}
     6.1 --- a/cookutils/receipt	Mon Jan 07 11:16:02 2019 +0200
     6.2 +++ b/cookutils/receipt	Mon Jan 07 11:27:51 2019 +0200
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt v2.
     6.5  
     6.6  PACKAGE="cookutils"
     6.7 -VERSION="1127"
     6.8 +VERSION="1130"
     6.9  CATEGORY="base-system"
    6.10  SHORT_DESC="SliTaz packages builder new generation"
    6.11  MAINTAINER="devel@slitaz.org"
     7.1 --- a/zstd/receipt	Mon Jan 07 11:16:02 2019 +0200
     7.2 +++ b/zstd/receipt	Mon Jan 07 11:27:51 2019 +0200
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt v2.
     7.5  
     7.6  PACKAGE="zstd"
     7.7 -VERSION="1.3.7"
     7.8 +VERSION="1.3.8"
     7.9  CATEGORY="base-system"
    7.10  SHORT_DESC="Zstandard - Fast real-time compression algorithm"
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
    7.12 @@ -10,9 +10,14 @@
    7.13  
    7.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    7.15  WGET_URL="https://github.com/facebook/zstd/archive/v$VERSION.tar.gz"
    7.16 +TARBALL_SHA1="c9a15a6866df9529e2c66935225d2b51487fd84c"
    7.17  
    7.18  BUILD_DEPENDS="grep zlib-dev xz-dev lz4-dev"
    7.19 -SPLIT="$PACKAGE-dev"
    7.20 +SPLIT="lib$PACKAGE $PACKAGE $PACKAGE-dev"
    7.21 +# zstd binaries doesn't depends on zstd library
    7.22 +
    7.23 +DEPENDS_libzstd=" "
    7.24 +DEPENDS_std="liblz4 liblzma zlib"
    7.25  
    7.26  TAGS_std="compression"
    7.27