# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1451988190 -3600
# Node ID ee7f5b80836f74cb2b27c618bc7f57c8eb8d5e72
# Parent  a4c10aa3ed2dc7a4ba67327fed636386dbc91b31
Add opencv (again)

diff -r a4c10aa3ed2d -r ee7f5b80836f opencv-dev/receipt
--- a/opencv-dev/receipt	Tue Jan 05 10:11:51 2016 +0100
+++ b/opencv-dev/receipt	Tue Jan 05 11:03:10 2016 +0100
@@ -9,7 +9,7 @@
 WEB_SITE="http://opencv.org/"
 WANTED="opencv"
 
-DEPENDS="opencv"
+DEPENDS="opencv pkg-config"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r a4c10aa3ed2d -r ee7f5b80836f opencv/receipt
--- a/opencv/receipt	Tue Jan 05 10:11:51 2016 +0100
+++ b/opencv/receipt	Tue Jan 05 11:03:10 2016 +0100
@@ -10,9 +10,8 @@
 WEB_SITE="http://opencv.org/"
 WGET_URL="https://github.com/Itseez/opencv/archive/$VERSION.tar.gz"
 
-DEPENDS="gtk+ ffmpeg jpeg tiff libpng gdal"
-BUILD_DEPENDS="wget cmake gtk+-dev ffmpeg-dev jpeg-dev tiff-dev libpng-dev \
-gdal-dev"
+DEPENDS="gtk+ ffmpeg jpeg tiff libpng"
+BUILD_DEPENDS="wget cmake gtk+-dev ffmpeg-dev jpeg-dev tiff-dev libpng-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r a4c10aa3ed2d -r ee7f5b80836f syslinux/stuff/iso2exe/iso2exe.c
--- a/syslinux/stuff/iso2exe/iso2exe.c	Tue Jan 05 10:11:51 2016 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.c	Tue Jan 05 11:03:10 2016 +0100
@@ -311,7 +311,7 @@
 		}
 		lseek(fd, 0UL, SEEK_SET);
 		for (i = 0; i < 32; i++, n = BUFFERSZ) {
-			write(fd, buffer + n, 1024);
+			write(fd, buffer + n, BUFFERSZ);
 		}
 		i = getcustomsector();
 		lseek(fd, i * 2048UL, SEEK_SET);
@@ -393,11 +393,14 @@
 		clear_config(pos);
 		lseek(fd, pos, SEEK_SET);
 		write(fd, "#!boot 00000000000000000000000000000000\n", 40);
+		n = pos + 40;
 		md5_begin();
 		if (append) {
+			i = strlen(append);
 			writenhash("append=", 7);
-			writenhash(append, strlen(append));
+			writenhash(append, i);
 			writenhash("\n", 1);
+			n += i + 8;
 		}
 		if (initrd) {
 			char number[16], *p;
@@ -420,6 +423,7 @@
 				writenhash("initrd:", 7);
 				i = number - p + sizeof(number);
 				writenhash(p, i);
+				n += i + 7;
 				lseek(data, 0UL, SEEK_SET);
 				do {
 					i = read(data, buffer, BUFFERSZ);
@@ -428,11 +432,22 @@
 					if (i > end)
 						i = end;
 					writenhash(buffer, i);
+					n += i;
 					end -= i;
 				} while (end != 0);
 			}
 			close(data);
 		}
+		while (n & 0x000FFFFFUL) {
+			unsigned long i = 0x100000UL - (n & 0x000FFFFFUL);
+			if (i > BUFFERSZ)
+				i = BUFFERSZ;
+			i = write(fd, buffer + BUFFERSZ, i);
+			if (i <= 0)
+				break;
+			n += i;
+		}
+		ftruncate(fd, n);
 		md5_end();
 		{
 			static char h[] = "0123456789abcdef";