wok-6.x rev 22326

updated zbar and zbar-dev (0.10 -> 0.23)
author Hans-G?nter Theisgen
date Fri Nov 15 09:21:05 2019 +0100 (2019-11-15)
parents 28641e299609
children 4ed10109d053
files zbar-dev/receipt zbar/receipt
line diff
     1.1 --- a/zbar-dev/receipt	Fri Nov 15 07:49:52 2019 +0100
     1.2 +++ b/zbar-dev/receipt	Fri Nov 15 09:21:05 2019 +0100
     1.3 @@ -1,21 +1,22 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="zbar-dev"
     1.7 -VERSION="0.10"
     1.8 +VERSION="0.23"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Decode barcode & QR code, development code."
    1.11 +SHORT_DESC="Decode barcode and QR code, development files."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="LGPL2.1"
    1.14 -WEB_SITE="http://zbar.sourceforge.net/"
    1.15 -WANTED="zbar"
    1.16 +WEB_SITE="http://github.com/mchehab/zbar"
    1.17  
    1.18  DEPENDS="zbar pkg-config"
    1.19 +WANTED="zbar"
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.   
    1.22  genpkg_rules()                                      
    1.23  {
    1.24  	mkdir -p $fs/usr/lib
    1.25 -	cp -a $install/usr/include $fs/usr
    1.26 -	cp -a $install/usr/lib/*a $fs/usr/lib
    1.27 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.28 +
    1.29 +	cp -a $install/usr/include		$fs/usr
    1.30 +	cp -a $install/usr/lib/*a		$fs/usr/lib
    1.31 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    1.32  }
     2.1 --- a/zbar/receipt	Fri Nov 15 07:49:52 2019 +0100
     2.2 +++ b/zbar/receipt	Fri Nov 15 09:21:05 2019 +0100
     2.3 @@ -1,30 +1,39 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="zbar"
     2.7 -VERSION="0.10"
     2.8 +VERSION="0.23"
     2.9  CATEGORY="utilities"
    2.10 -SHORT_DESC="Decode barcode & QR code."
    2.11 +SHORT_DESC="Decode barcode and QR code."
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="LGPL2.1"
    2.14 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.15 -WEB_SITE="http://zbar.sourceforge.net/"
    2.16 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.17 +WEB_SITE="http://github.com/mchehab/zbar"
    2.18  
    2.19 -DEPENDS="jpeg imagemagick pango cairo freetype fontconfig atk gtk+ libgio"
    2.20 -BUILD_DEPENDS="linux-api-headers jpeg-dev imagemagick-dev pango-dev cairo-dev \
    2.21 -freetype-dev fontconfig-dev atk-dev gtk+-dev libgio-dev util-linux-uuid-dev \
    2.22 -lcms-dev fftw-dev openexr-dev ilmbase-dev graphviz-dev gdk-pixbuf libxml2-dev \
    2.23 -libtool"
    2.24 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.25 +WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
    2.26 +
    2.27 +DEPENDS="atk cairo fontconfig freetype gcc83-lib-base gtk+ 
    2.28 +	imagemagick jpeg libgio pango"
    2.29 +BUILD_DEPENDS="atk-dev cairo-dev fftw-dev fontconfig-dev freetype-dev 
    2.30 +	gcc83 gdk-pixbuf graphviz-dev gtk+-dev ilmbase-dev imagemagick-dev 
    2.31 +	jpeg-dev lcms-dev libgio-dev libtool libxml2-dev linux-api-headers 
    2.32 +	openexr-dev pango-dev util-linux-uuid-dev"
    2.33  
    2.34  # Rules to configure and make the package.
    2.35  compile_rules()
    2.36  {
    2.37 -	sed -i 's|w\(and/MagickWand\.h\)|MagickW\1|' configu* zbarimg/zbarimg.c
    2.38 -	./configure --prefix=/usr --mandir=/usr/share/man \
    2.39 -		--localstatedir=/var \
    2.40 -		--without-qt \
    2.41 -		--without-python \
    2.42 -		--disable-video \
    2.43 +#	sed -i 's|w\(and/MagickWand\.h\)|MagickW\1|' configu* zbarimg/zbarimg.c
    2.44 +
    2.45 +	autoreconf -vfi &&
    2.46 +	./configure			\
    2.47 +		CC=gcc-83		\
    2.48 +		CXX=g++-83		\
    2.49 +		--prefix=/usr		\
    2.50 +		--mandir=/usr/share/man	\
    2.51 +		--localstatedir=/var	\
    2.52 +		--without-qt		\
    2.53 +		--without-python	\
    2.54 +		--disable-video		\
    2.55 +		--disable-doc		\
    2.56  	$CONFIGURE_ARGS &&
    2.57  	make &&
    2.58  	make DESTDIR=$DESTDIR install
    2.59 @@ -34,6 +43,7 @@
    2.60  genpkg_rules()                                      
    2.61  {
    2.62  	mkdir -p $fs/usr/lib
    2.63 -	cp -a $install/usr/bin $fs/usr
    2.64 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.65 +
    2.66 +	cp -a $install/usr/bin		$fs/usr
    2.67 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    2.68  }