From 49711068a6ace411fb29ee13f28f7dccc4f38a95 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 14 Oct 2010 08:36:48 +0200
Subject: opencv, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/opencv/Pkgfile                  |  6 ++----
 extra/opencv/libpng-1.4.patch         | 12 ------------
 extra/opencv/opencv-1.0.0-gcc44.patch | 12 ------------
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 extra/opencv/libpng-1.4.patch
 delete mode 100644 extra/opencv/opencv-1.0.0-gcc44.patch

(limited to 'extra')

diff --git a/extra/opencv/Pkgfile b/extra/opencv/Pkgfile
index 8fe3ef54c..1f86c2b0b 100644
--- a/extra/opencv/Pkgfile
+++ b/extra/opencv/Pkgfile
@@ -7,13 +7,11 @@
 name=opencv
 version=2.1.0
 release=1
-source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-$version.tar.bz2
-	opencv-1.0.0-gcc44.patch
-	libpng-1.4.patch)
+source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-$version.tar.bz2 \
+	http://nutyx.meticul.eu/files/patchs/$name/libpng-1.4.patch)
 
 build() {
 	cd OpenCV-$version
-#	patch -Np1 -i ../opencv-1.0.0-gcc44.patch
 	patch -p1 -i $SRC/libpng-1.4.patch
 	cd $SRC
 	mkdir build
diff --git a/extra/opencv/libpng-1.4.patch b/extra/opencv/libpng-1.4.patch
deleted file mode 100644
index c34c5a58a..000000000
--- a/extra/opencv/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp
---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp	2010-01-21 01:08:46.000000000 -0500
-+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp	2010-01-21 01:13:11.000000000 -0500
-@@ -223,7 +223,7 @@
-                 png_set_palette_to_rgb( png_ptr );
- 
-             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
--                png_set_gray_1_2_4_to_8( png_ptr );
-+                png_set_expand_gray_1_2_4_to_8( png_ptr );
- 
-             if( CV_MAT_CN(m_type) > 1 && color )
-                 png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/extra/opencv/opencv-1.0.0-gcc44.patch b/extra/opencv/opencv-1.0.0-gcc44.patch
deleted file mode 100644
index 971411b6c..000000000
--- a/extra/opencv/opencv-1.0.0-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up opencv-1.0.0/cxcore/include/cxmisc.h.gcc44 opencv-1.0.0/cxcore/include/cxmisc.h
---- opencv-1.0.0/cxcore/include/cxmisc.h.gcc44	2006-05-04 17:55:17.000000000 +0200
-+++ opencv-1.0.0/cxcore/include/cxmisc.h	2009-04-22 12:42:49.000000000 +0200
-@@ -130,7 +130,7 @@
-     #include <alloca.h>
- #elif defined HAVE_ALLOCA
-     #include <stdlib.h>
--#elif
-+#else
-     #error
- #endif
- 
-- 
cgit v1.2.3-70-g09d2