wok rev 23262

updated opencv and opencv-dev (4.1.0 -> 4.2.0)
author Hans-G?nter Theisgen
date Fri Mar 27 06:58:47 2020 +0100 (2020-03-27)
parents 2924eb0cff19
children 2c5c15f050b7
files opencv-dev/receipt opencv/receipt
line diff
     1.1 --- a/opencv-dev/receipt	Thu Mar 26 11:01:56 2020 +0100
     1.2 +++ b/opencv-dev/receipt	Fri Mar 27 06:58:47 2020 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="opencv-dev"
     1.7 -VERSION="4.1.0"
     1.8 +VERSION="4.2.0"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Open source computer vision library - development files"
    1.11 +SHORT_DESC="Open source computer vision library - development files."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="BSD"
    1.14  WEB_SITE="https://opencv.org/"
     2.1 --- a/opencv/receipt	Thu Mar 26 11:01:56 2020 +0100
     2.2 +++ b/opencv/receipt	Fri Mar 27 06:58:47 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="opencv"
     2.7 -VERSION="4.1.0"
     2.8 +VERSION="4.2.0"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="Open source computer vision library."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -11,7 +11,7 @@
    2.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.14  WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/$VERSION/$TARBALL"
    2.15  
    2.16 -DEPENDS="ffmpeg gtk+ jpeg libpng tiff"
    2.17 +DEPENDS="ffmpeg gcc83-lib-base gtk+ jpeg libpng tiff"
    2.18  BUILD_DEPENDS="cmake ffmpeg-dev gcc83 gtk+-dev jpeg-dev libgnutls \
    2.19  	libpng-dev tiff-dev"
    2.20  
    2.21 @@ -20,10 +20,13 @@
    2.22  {
    2.23  	export	CC=gcc-83
    2.24  	export	CXX=g++-83
    2.25 +	export	LDFLAGS="$LDFLAGS -latomic"
    2.26  
    2.27 -	mkdir build
    2.28 -	cd build 
    2.29 -	cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_PRECOMPILED_HEADERS=OFF &&
    2.30 +	mkdir	build &&
    2.31 +	cd	build &&
    2.32 +	cmake	..				\
    2.33 +		-DCMAKE_INSTALL_PREFIX=/usr	\
    2.34 +		-DENABLE_PRECOMPILED_HEADERS=OFF &&
    2.35  	make &&
    2.36  	make DESTDIR=$DESTDIR install
    2.37  }