summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-09-05 15:09:42 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-09-05 15:09:42 +0200
commitfd1b46b3956de6cb058f1a781d030f51792e6035 (patch)
treee3c9e54c1c33f338d14acdc917062d10a130318c
parent524e592ff0d7d7dbef7bfd9ec97952ad78eb6199 (diff)
downloadnutyx-pakxe-fd1b46b3956de6cb058f1a781d030f51792e6035.tar.gz
nutyx-pakxe-fd1b46b3956de6cb058f1a781d030f51792e6035.tar.bz2
nutyx-pakxe-fd1b46b3956de6cb058f1a781d030f51792e6035.tar.xz
nutyx-pakxe-fd1b46b3956de6cb058f1a781d030f51792e6035.zip
opencv, maj footprint et md5sum
-rw-r--r--extra/opencv/.md5sum1
-rw-r--r--extra/opencv/Pkgfile14
-rw-r--r--extra/opencv/opencv-1.0.0-gcc44.patch12
3 files changed, 21 insertions, 6 deletions
diff --git a/extra/opencv/.md5sum b/extra/opencv/.md5sum
index cf7f12b87..98dce8e2b 100644
--- a/extra/opencv/.md5sum
+++ b/extra/opencv/.md5sum
@@ -1 +1,2 @@
+2d787a389b6fd47e181d3996374a0100 opencv-1.0.0-gcc44.patch
b147b7cd3c059831c415c5a2bcecdf95 opencv-1.1pre1.tar.gz
diff --git a/extra/opencv/Pkgfile b/extra/opencv/Pkgfile
index efb06c48a..1cc7a9432 100644
--- a/extra/opencv/Pkgfile
+++ b/extra/opencv/Pkgfile
@@ -2,17 +2,19 @@
# URL: http://opencv.willowgarage.com/wiki/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: libjpeg, libtiff, libjasper, libpng, zlib, ffmpeg, libgstreamer, libxine, libdc1394
+# Depends on: libjpeg, libtiff, jasper, libpng, zlib, ffmpeg, gstreamer, xine-lib, libdc1394
name=opencv
version=1.1pre1
release=1
-source=(http://ovh.dl.sourceforge.net/sourceforge/opencvlibrary/$name-$version.tar.gz)
+source=(http://ovh.dl.sourceforge.net/sourceforge/opencvlibrary/$name-$version.tar.gz\
+ opencv-1.0.0-gcc44.patch)
build() {
- cd $name-1.1.0
- ./configure --prefix=/usr
- make -j3
- make DESTDIR=$PKG install
+ cd $name-1.1.0
+ patch -Np1 -i ../opencv-1.0.0-gcc44.patch
+ ./configure --prefix=/usr
+ make -j3
+ make DESTDIR=$PKG install
}
diff --git a/extra/opencv/opencv-1.0.0-gcc44.patch b/extra/opencv/opencv-1.0.0-gcc44.patch
new file mode 100644
index 000000000..971411b6c
--- /dev/null
+++ b/extra/opencv/opencv-1.0.0-gcc44.patch
@@ -0,0 +1,12 @@
+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
+