opencv: add debian patches, compilations gets a bit further now, although it probably needs some more #include <stdint.h>

25 files changed, 40083 insertions, 1 deletions

diff --git a/packages/opencv/opencv/.mtn2git_empty b/packages/opencv/opencv/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opencv/opencv/.mtn2git_empty
diff --git a/packages/opencv/opencv/debian/.mtn2git_empty b/packages/opencv/opencv/debian/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opencv/opencv/debian/.mtn2git_empty
diff --git a/packages/opencv/opencv/debian/010_enable_static.diff b/packages/opencv/opencv/debian/010_enable_static.diff
new file mode 100644
index 0000000000..bc3057d771
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_enable_static.diff
@@ -0,0 +1,12 @@
+Index: opencv-1.0.0/configure.in
+===================================================================
+--- opencv-1.0.0.orig/configure.in	2006-11-03 16:54:33.000000000 +0100
++++ opencv-1.0.0/configure.in	2006-11-14 10:11:29.000000000 +0100
+@@ -48,7 +48,6 @@
+ 
+ # disable building static libraries,
+ # allow Cygwin to build DLLs
+-AC_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
+ 
+ # does the user want to build universal binaries on Mac OS X?
diff --git a/packages/opencv/opencv/debian/010_ffmpeg_linking.diff b/packages/opencv/opencv/debian/010_ffmpeg_linking.diff
new file mode 100644
index 0000000000..d025c1b831
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_ffmpeg_linking.diff
@@ -0,0 +1,24 @@
+Index: opencv-1.0.0/configure.in
+===================================================================
+--- opencv-1.0.0.orig/configure.in	2006-11-14 10:11:29.000000000 +0100
++++ opencv-1.0.0/configure.in	2006-11-14 10:12:30.000000000 +0100
+@@ -435,18 +435,11 @@
+     fi
+     if test x"$with_ffmpeg" = "xyes"; then
+         AC_CHECK_HEADER(ffmpeg/avcodec.h,
+-                        AC_CHECK_LIB(avcodec, avcodec_decode_video,
+-                                     [
+-                                       AC_CHECK_LIB(avformat, av_open_input_file,
+                                                     [
+                                                       have_ffmpeg=yes
+                                                       AC_DEFINE(HAVE_FFMPEG,,[FFMpeg video library])
+-                                                      FFMPEGLIBS="-lavcodec -lavformat"
++                                                      FFMPEGLIBS="`pkg-config --libs libavcodec libavformat`"
+                                                     ],
+-                                                    [ have_ffmpeg=no ],
+-                                                    [-lavcodec])
+-                                     ],
+-                                     [ have_ffmpeg=no ]),
+                         [ have_ffmpeg=no ])
+     else
+         # if we get here then --with-ffmpeg was not called with 'yes','no' or 'auto'
diff --git a/packages/opencv/opencv/debian/010_fix_optimisations.diff b/packages/opencv/opencv/debian/010_fix_optimisations.diff
new file mode 100644
index 0000000000..d87129f827
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_fix_optimisations.diff
@@ -0,0 +1,41 @@
+Index: opencv-1.0.0/configure.in
+===================================================================
+--- opencv-1.0.0.orig/configure.in	2006-11-14 16:26:01.000000000 +0100
++++ opencv-1.0.0/configure.in	2006-11-14 16:26:41.000000000 +0100
+@@ -197,28 +197,35 @@
+             # apples g++ fails with '-march=i686' and there are no apple machines older than prescott/core anyway
+             CXXFLAGS="-g -march=prescott -ffast-math -fomit-frame-pointer $CXXFLAGS"
+         fi
++        CXXFLAGS="-O3 $CXXFLAGS"
+         ;;
+     i686-*-*)
+         if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+           # default to i686/pentiumpro -- people can override this
+           CXXFLAGS="-g -march=i686 -ffast-math -fomit-frame-pointer $CXXFLAGS"
+         fi
++        CXXFLAGS="-O3 $CXXFLAGS"
+         ;;
+     powerpc-*-*)
+         if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+             # default to G3 processors -- people can override this
+             CXXFLAGS="-g -mcpu=G3 -mtune=G5 -fomit-frame-pointer $CXXFLAGS"
+         fi
++        CXXFLAGS="-O3 $CXXFLAGS"
++        ;;
++    m68k-*-*)
++        CXXFLAGS="-O2 $CXXFLAGS"
+         ;;
+     *-*-*)
+         if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
+             CXXFLAGS="-fomit-frame-pointer $CXXFLAGS"
+         fi
++        CXXFLAGS="-O3 $CXXFLAGS"
+         ;;
+     esac
+     
+     CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-    CXXFLAGS="-O3 $CXXFLAGS"
++    CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
+ fi
+ 
+ if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
diff --git a/packages/opencv/opencv/debian/010_m4_syntax.diff b/packages/opencv/opencv/debian/010_m4_syntax.diff
new file mode 100644
index 0000000000..9be3a4e00e
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_m4_syntax.diff
@@ -0,0 +1,26 @@
+Index: opencv-1.0.0/configure.in
+===================================================================
+--- opencv-1.0.0.orig/configure.in	2006-11-14 10:13:30.000000000 +0100
++++ opencv-1.0.0/configure.in	2006-11-14 10:14:13.000000000 +0100
+@@ -18,9 +18,9 @@
+ # init autotools
+ AC_PREREQ(2.59)
+ AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@lists.sourceforge.net])
+-AC_CONFIG_SRCDIR([opencv.pc.in])
+-AC_CONFIG_AUX_DIR([autotools])
+-AC_CONFIG_MACRO_DIR([autotools/aclocal])
++AC_CONFIG_SRCDIR(opencv.pc.in)
++AC_CONFIG_AUX_DIR(autotools)
++AC_CONFIG_MACRO_DIR(autotools/aclocal)
+ 
+ # put CVS revision of this configure.in into the resulting configure script
+ AC_REVISION($Revision: 1.39 $)
+@@ -31,7 +31,7 @@
+ 
+ # setup automake - we need >= 1.6 because of python and aclocal support
+ #                  we updated to 1.9 because of cross-platform issues
+-AM_CONFIG_HEADER([cvconfig.h])
++AM_CONFIG_HEADER(cvconfig.h)
+ AM_INIT_AUTOMAKE([1.9])
+ AC_PROG_MAKE_SET
+ 
diff --git a/packages/opencv/opencv/debian/010_makefile_syntax.diff b/packages/opencv/opencv/debian/010_makefile_syntax.diff
new file mode 100644
index 0000000000..e97354e4d6
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_makefile_syntax.diff
@@ -0,0 +1,15 @@
+Index: opencv-1.0.0/Makefile.am
+===================================================================
+--- opencv-1.0.0.orig/Makefile.am	2006-07-20 14:34:09.000000000 +0200
++++ opencv-1.0.0/Makefile.am	2006-11-14 10:14:17.000000000 +0100
+@@ -6,8 +6,10 @@
+ ## Any directories that you want built and installed should go here.
+ if BUILD_APPS
+   APPS_DIR = apps
++  NO_APPS_DIR =
+ else
+   APPS_DIR =
++  NO_APPS_DIR = apps
+ endif
+ SUBDIRS = cxcore cv cvaux ml otherlibs utils interfaces $(APPS_DIR) tests samples data docs
+ 
diff --git a/packages/opencv/opencv/debian/010_proper_sonames.diff b/packages/opencv/opencv/debian/010_proper_sonames.diff
new file mode 100644
index 0000000000..c624c45997
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_proper_sonames.diff
@@ -0,0 +1,183 @@
+Index: opencv-0.9.7/opencv.pc.in
+===================================================================
+--- opencv-0.9.7.orig/opencv.pc.in	2005-07-25 14:25:20.000000000 +0200
++++ opencv-0.9.7/opencv.pc.in	2006-05-14 05:24:18.000000000 +0200
+@@ -8,5 +8,5 @@
+ Name: OpenCV
+ Description: Intel(R) Open Source Computer Vision Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lcxcore -lcv -lhighgui -lcvaux
++Libs: -L${libdir} -lcxcore0.9.7 -lcv0.9.7 -lhighgui0.9.7 -lcvaux0.9.7
+ Cflags: -I${includedir}
+Index: opencv-0.9.7/apps/haartraining/src/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/apps/haartraining/src/Makefile.am	2005-07-25 14:25:44.000000000 +0200
++++ opencv-0.9.7/apps/haartraining/src/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -2,10 +2,10 @@
+ 
+ bin_PROGRAMS = opencv-haartraining opencv-createsamples opencv-performance
+ 
+-ALL_CV_LIBS =                                           \
+-	$(top_builddir)/otherlibs/highgui/libhighgui.la \
+-	$(top_builddir)/cv/src/libcv.la                 \
+-	$(top_builddir)/cxcore/src/libcxcore.la         \
++ALL_CV_LIBS =                                                \
++	$(top_builddir)/otherlibs/highgui/libhighgui0.9.7.la \
++	$(top_builddir)/cv/src/libcv0.9.7.la                 \
++	$(top_builddir)/cxcore/src/libcxcore0.9.7.la         \
+ 	libcvhaartraining.a
+ 
+ libcvhaartraining_a_SOURCES = \
+Index: opencv-0.9.7/cv/src/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/cv/src/Makefile.am	2005-07-25 14:25:44.000000000 +0200
++++ opencv-0.9.7/cv/src/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libcv.la
++lib_LTLIBRARIES = libcv0.9.7.la
+ 
+-libcv_la_SOURCES = \
++libcv0_9_7_la_SOURCES = \
+     cvaccum.cpp cvadapthresh.cpp cvapprox.cpp cvcalccontrasthistogram.cpp \
+     cvcalcimagehomography.cpp cvcalibinit.cpp cvcalibration.cpp \
+     cvcamshift.cpp cvcanny.cpp cvcolor.cpp cvcondens.cpp cvcontours.cpp \
+@@ -19,8 +19,8 @@
+ noinst_HEADERS = _cv.h _cvgeom.h _cvimgproc.h _cvipp.h _cvlist.h _cvmatrix.h
+ EXTRA_DIST = cv.dsp cv.vcproj cv.rc resource.h
+ 
+-libcv_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
+-libcv_la_LIBADD  = $(top_builddir)/cxcore/src/libcxcore.la
++libcv0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
++libcv0_9_7_la_LIBADD  = $(top_builddir)/cxcore/src/libcxcore0.9.7.la
+ 
+ LIBS = -ldl -lpthread -lm
+ 
+Index: opencv-0.9.7/cvaux/src/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/cvaux/src/Makefile.am	2005-07-25 14:56:45.000000000 +0200
++++ opencv-0.9.7/cvaux/src/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libcvaux.la
++lib_LTLIBRARIES = libcvaux0.9.7.la
+ 
+-libcvaux_la_SOURCES = \
++libcvaux0_9_7_la_SOURCES = \
+     camshift.cpp cv3dtracker.cpp cvaux.cpp cvauxutils.cpp \
+     cvbgfg_acmmm2003.cpp cvbgfg_common.cpp cvbgfg_gaussmix.cpp \
+     cvcalibfilter.cpp cvclique.cpp cvcorrespond.cpp cvcorrimages.cpp \
+@@ -19,7 +19,7 @@
+ include_HEADERS =
+ noinst_HEADERS = _cvaux.h _cvfacedetection.h _cvvectrack.h _cvvm.h
+ 
+-libcvaux_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
+-libcvaux_la_LIBADD  = $(top_builddir)/cv/src/libcv.la
++libcvaux0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
++libcvaux0_9_7_la_LIBADD  = $(top_builddir)/cv/src/libcv0.9.7.la
+ 
+ INCLUDES = -I. -I$(top_srcdir)/cvaux/include -I$(top_srcdir)/cxcore/include -I$(top_srcdir)/cv/include -I$(top_srcdir)/cv/src -I$(top_srcdir)
+Index: opencv-0.9.7/cxcore/src/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/cxcore/src/Makefile.am	2005-07-25 14:25:44.000000000 +0200
++++ opencv-0.9.7/cxcore/src/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libcxcore.la
++lib_LTLIBRARIES = libcxcore0.9.7.la
+ 
+-libcxcore_la_SOURCES = cxalloc.cpp cxarithm.cpp cxarray.cpp cxcmp.cpp \
++libcxcore0_9_7_la_SOURCES = cxalloc.cpp cxarithm.cpp cxarray.cpp cxcmp.cpp \
+     cxconvert.cpp cxcopy.cpp cxdatastructs.cpp cxdrawing.cpp \
+     cxdxt.cpp cxerror.cpp cxjacobieigens.cpp cxlogic.cpp cxlut.cpp \
+     cxmathfuncs.cpp cxmatmul.cpp cxmatrix.cpp cxmean.cpp \
+@@ -13,7 +13,7 @@
+ 
+ EXTRA_DIST = cxcore.dsp cxcore.vcproj cxcore.rc  resource.h
+ 
+-libcxcore_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
++libcxcore0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
+ 
+ LIBS = -ldl -lpthread -lm
+ 
+Index: opencv-0.9.7/interfaces/swig/python/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am	2005-07-25 14:25:44.000000000 +0200
++++ opencv-0.9.7/interfaces/swig/python/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -37,14 +37,14 @@
+                     ../filtered/constants.h \
+                     cv.i imagedata.i
+ _cv_la_CXXFLAGS   = $(PYTHON_CSPEC)
+-_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la
++_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv0.9.7.la
+ _cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+                     -L$(SWIG_PYTHON_LIBS)
+ 
+ _highgui_la_SOURCES    = _highgui.cpp ../../../otherlibs/highgui/highgui.h \
+                          highgui.i
+ _highgui_la_CXXFLAGS   = $(PYTHON_CSPEC)
+-_highgui_la_LIBADD     = $(top_builddir)/otherlibs/highgui/libhighgui.la
++_highgui_la_LIBADD     = $(top_builddir)/otherlibs/highgui/libhighgui0.9.7.la
+ _highgui_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+                          -L$(SWIG_PYTHON_LIBS)
+ 
+Index: opencv-0.9.7/otherlibs/highgui/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/otherlibs/highgui/Makefile.am	2005-07-25 14:25:44.000000000 +0200
++++ opencv-0.9.7/otherlibs/highgui/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libhighgui.la
++lib_LTLIBRARIES = libhighgui0.9.7.la
+ 
+-libhighgui_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
++libhighgui0_9_7_la_SOURCES = bitstrm.cpp cvcap.cpp cvcap_dc1394.cpp \
+     cvcap_v4l.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp \
+     grfmt_png.cpp grfmt_pxm.cpp grfmt_sunras.cpp grfmt_tiff.cpp \
+     image.cpp loadsave.cpp precomp.cpp utils.cpp window_lnx.cpp \
+@@ -14,8 +14,8 @@
+ 
+ noinst_HEADERS = _highgui.h bitstrm.h grfmt_base.h grfmt_bmp.h grfmt_jpeg.h grfmt_pxm.h grfmt_png.h grfmt_sunras.h grfmt_tiff.h grfmts.h utils.h
+ 
+-libhighgui_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
++libhighgui0_9_7_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
+ 
+-libhighgui_la_LIBADD  = $(top_builddir)/cv/src/libcv.la @GTK_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@ @IEEE1394LIBS@
++libhighgui0_9_7_la_LIBADD  = $(top_builddir)/cv/src/libcv0.9.7.la @GTK_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@ @IEEE1394LIBS@
+ 
+ INCLUDES = -I. -I$(top_srcdir)/cxcore/include -I$(top_srcdir)/cv/include @GTK_CFLAGS@
+Index: opencv-0.9.7/tests/cv/src/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/tests/cv/src/Makefile.am	2005-07-26 15:56:15.000000000 +0200
++++ opencv-0.9.7/tests/cv/src/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -27,12 +27,12 @@
+     athresh.cpp ats.cpp canny.cpp cvtest.cpp \
+     tsysa.cpp ucontours.cpp ugraphics.cpp uiplutils.cpp ureadfile.cpp
+ 
+-cvtest_LDADD =                                          \
+-	$(top_builddir)/cv/src/libcv.la                 \
+-	$(top_builddir)/cxcore/src/libcxcore.la         \
+-	$(top_builddir)/tests/trs/libtrs.a              \
+-	$(top_builddir)/tests/cxts/libcxts.a            \
+-	$(top_builddir)/cvaux/src/libcvaux.la           \
+-	$(top_builddir)/otherlibs/highgui/libhighgui.la
++cvtest_LDADD =                                               \
++	$(top_builddir)/cv/src/libcv0.9.7.la                 \
++	$(top_builddir)/cxcore/src/libcxcore0.9.7.la         \
++	$(top_builddir)/tests/trs/libtrs.a                   \
++	$(top_builddir)/tests/cxts/libcxts.a                 \
++	$(top_builddir)/cvaux/src/libcvaux0.9.7.la           \
++	$(top_builddir)/otherlibs/highgui/libhighgui0.9.7.la
+ 
+ EXTRA_DIST = cvtest.dsp cvtest.vcproj
+Index: opencv-0.9.7/tests/cxcore/src/Makefile.am
+===================================================================
+--- opencv-0.9.7.orig/tests/cxcore/src/Makefile.am	2005-07-25 14:25:44.000000000 +0200
++++ opencv-0.9.7/tests/cxcore/src/Makefile.am	2006-05-14 05:24:18.000000000 +0200
+@@ -11,8 +11,8 @@
+ 	adxt.cpp            \
+ 	amath.cpp           \
+ 	cxcoretest_main.cpp
+-cxcoretest_LDADD =                              \
+-	$(top_builddir)/cxcore/src/libcxcore.la \
++cxcoretest_LDADD =                                   \
++	$(top_builddir)/cxcore/src/libcxcore0.9.7.la \
+ 	$(top_builddir)/tests/cxts/libcxts.a
+ 
+ EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vcproj
diff --git a/packages/opencv/opencv/debian/010_python_cspec.diff b/packages/opencv/opencv/debian/010_python_cspec.diff
new file mode 100644
index 0000000000..94e35f35a8
--- /dev/null
+++ b/packages/opencv/opencv/debian/010_python_cspec.diff
@@ -0,0 +1,13 @@
+Index: opencv-1.0.0/configure.in
+===================================================================
+--- opencv-1.0.0.orig/configure.in	2006-11-14 10:47:47.000000000 +0100
++++ opencv-1.0.0/configure.in	2006-11-14 10:50:22.000000000 +0100
+@@ -656,6 +656,8 @@
+         with_swig=yes
+     fi
+     
++    PYTHON_CSPEC="$PYTHON_CSPEC -fno-strict-aliasing"
++
+     ### almost ok... just need to check if we have the Python headers ###
+ 
+     # first, save the CPPFLAGS
diff --git a/packages/opencv/opencv/debian/020_python_linking.diff b/packages/opencv/opencv/debian/020_python_linking.diff
new file mode 100644
index 0000000000..50e3311e49
--- /dev/null
+++ b/packages/opencv/opencv/debian/020_python_linking.diff
@@ -0,0 +1,21 @@
+Index: opencv-1.0.0/interfaces/swig/python/Makefile.am
+===================================================================
+--- opencv-1.0.0.orig/interfaces/swig/python/Makefile.am	2008-06-09 00:03:26.000000000 +0000
++++ opencv-1.0.0/interfaces/swig/python/Makefile.am	2008-06-09 00:04:02.000000000 +0000
+@@ -105,14 +105,14 @@
+                     pycvseq.hpp cvshadow.cpp cvshadow.h \
+                     cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
+ _cv_la_CXXFLAGS   = $(PYTHON_CSPEC)
+-_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la
++_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la $(top_builddir)/cxcore/src/libcxcore.la
+ _cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+                     -L$(SWIG_PYTHON_LIBS)
+ 
+ _highgui_la_SOURCES    = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+                          highgui.i
+ _highgui_la_CXXFLAGS     = $(PYTHON_CSPEC)
+-_highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la
++_highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la $(top_builddir)/cv/src/libcv.la $(top_builddir)/cxcore/src/libcxcore.la
+ _highgui_la_LDFLAGS      = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+                            -L$(SWIG_PYTHON_LIBS)
+ 
diff --git a/packages/opencv/opencv/debian/030_install_hook.diff b/packages/opencv/opencv/debian/030_install_hook.diff
new file mode 100644
index 0000000000..5c583faae5
--- /dev/null
+++ b/packages/opencv/opencv/debian/030_install_hook.diff
@@ -0,0 +1,13 @@
+Index: opencv-1.0.0/Makefile.am
+===================================================================
+--- opencv-1.0.0.orig/Makefile.am	2008-06-08 23:35:37.000000000 +0000
++++ opencv-1.0.0/Makefile.am	2008-06-08 23:35:45.000000000 +0000
+@@ -50,7 +50,7 @@
+ 	cd src && $(MAKE) install-libLTLIBRARIES
+ 
+ # Run ldconfig after installing the library:
+-install-hook:
++install-exec-hook:
+ 	-ldconfig
+ 
+ 
diff --git a/packages/opencv/opencv/debian/050_rebootstrap.diff b/packages/opencv/opencv/debian/050_rebootstrap.diff
new file mode 100644
index 0000000000..73a41921f7
--- /dev/null
+++ b/packages/opencv/opencv/debian/050_rebootstrap.diff
@@ -0,0 +1,38664 @@
+Index: opencv-1.0.0/Makefile.in
+===================================================================
+--- opencv-1.0.0.orig/Makefile.in	2008-06-09 00:03:40.000000000 +0000
++++ opencv-1.0.0/Makefile.in	2008-06-09 00:04:20.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,15 +17,11 @@
+ # The top-level input Makefile for OpenCV
+ 
+ 
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -40,6 +36,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(libcvinclude_HEADERS) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/cvconfig.h.in $(srcdir)/opencv.pc.in \
+@@ -47,8 +44,7 @@
+ 	COPYING ChangeLog INSTALL NEWS THANKS TODO \
+ 	autotools/config.guess autotools/config.sub autotools/depcomp \
+ 	autotools/install-sh autotools/ltmain.sh autotools/missing \
+-	autotools/mkinstalldirs autotools/py-compile
+-subdir = .
++	autotools/py-compile
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/autotools/aclocal/az_python.m4 \
+ 	$(top_srcdir)/autotools/aclocal/pkg.m4 \
+@@ -58,18 +54,19 @@
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++ configure.lineno config.status.lineno
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = cvconfig.h
+ CONFIG_CLEAN_FILES = opencv.pc opencv.spec
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
++	install-dvi-recursive install-exec-recursive \
++	install-html-recursive install-info-recursive \
++	install-pdf-recursive install-ps-recursive install-recursive \
++	installcheck-recursive installdirs-recursive pdf-recursive \
++	ps-recursive uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -82,6 +79,8 @@
+ DATA = $(pkgconfig_DATA)
+ libcvincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(libcvinclude_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = cxcore cv cvaux ml otherlibs utils interfaces apps \
+@@ -99,8 +98,6 @@
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -108,24 +105,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_APPS_FALSE = @BUILD_APPS_FALSE@
+-BUILD_APPS_TRUE = @BUILD_APPS_TRUE@
+-BUILD_CARBON_FALSE = @BUILD_CARBON_FALSE@
+-BUILD_CARBON_TRUE = @BUILD_CARBON_TRUE@
+-BUILD_DC1394_FALSE = @BUILD_DC1394_FALSE@
+-BUILD_DC1394_TRUE = @BUILD_DC1394_TRUE@
+-BUILD_FFMPEG_FALSE = @BUILD_FFMPEG_FALSE@
+-BUILD_FFMPEG_TRUE = @BUILD_FFMPEG_TRUE@
+-BUILD_GTK_FALSE = @BUILD_GTK_FALSE@
+-BUILD_GTK_TRUE = @BUILD_GTK_TRUE@
+-BUILD_PYTHON_WRAPPERS_FALSE = @BUILD_PYTHON_WRAPPERS_FALSE@
+-BUILD_PYTHON_WRAPPERS_TRUE = @BUILD_PYTHON_WRAPPERS_TRUE@
+-BUILD_QUICKTIME_FALSE = @BUILD_QUICKTIME_FALSE@
+-BUILD_QUICKTIME_TRUE = @BUILD_QUICKTIME_TRUE@
+-BUILD_V4L_FALSE = @BUILD_V4L_FALSE@
+-BUILD_V4L_TRUE = @BUILD_V4L_TRUE@
+-BUILD_XINE_FALSE = @BUILD_XINE_FALSE@
+-BUILD_XINE_TRUE = @BUILD_XINE_TRUE@
+ CARBON_CFLAGS = @CARBON_CFLAGS@
+ CARBON_LIBS = @CARBON_LIBS@
+ CC = @CC@
+@@ -142,6 +121,7 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -151,12 +131,14 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FFMPEGLIBS = @FFMPEGLIBS@
++GREP = @GREP@
+ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ IEEE1394LIBS = @IEEE1394LIBS@
+ IMAGELIBS = @IMAGELIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -169,9 +151,11 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ LT_VERSION = @LT_VERSION@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MMAJOR = @MMAJOR@
+ MMINOR = @MMINOR@
+ MSUBMINOR = @MSUBMINOR@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+@@ -192,6 +176,7 @@
+ QUICKTIME_CFLAGS = @QUICKTIME_CFLAGS@
+ QUICKTIME_LIBS = @QUICKTIME_LIBS@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -200,23 +185,15 @@
+ SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@
+ SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
+ SWIG_VERSION = @SWIG_VERSION@
+-UPDATE_SWIG_WRAPPERS_FALSE = @UPDATE_SWIG_WRAPPERS_FALSE@
+-UPDATE_SWIG_WRAPPERS_TRUE = @UPDATE_SWIG_WRAPPERS_TRUE@
+ VERSION = @VERSION@
+ XINE_LIBS = @XINE_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -228,41 +205,54 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pkgpyexecdir = @pkgpyexecdir@
+ pkgpythondir = @pkgpythondir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ pyexecdir = @pyexecdir@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ 
+ # tell make where aclocal finds its files in Maintainer Mode 
+ ACLOCAL_AMFLAGS = -I ./autotools/aclocal
+ @BUILD_APPS_FALSE@APPS_DIR = 
+ @BUILD_APPS_TRUE@APPS_DIR = apps
++@BUILD_APPS_FALSE@NO_APPS_DIR = apps
++@BUILD_APPS_TRUE@NO_APPS_DIR = 
+ SUBDIRS = cxcore cv cvaux ml otherlibs utils interfaces $(APPS_DIR) tests samples data docs
+ 
+ # All the rest of the distributed files
+@@ -297,15 +287,15 @@
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+ 		&& exit 0; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
++	  $(AUTOMAKE) --foreign  Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -328,7 +318,7 @@
+ cvconfig.h: stamp-h1
+ 	@if test ! -f $@; then \
+ 	  rm -f stamp-h1; \
+-	  $(MAKE) stamp-h1; \
++	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ 	else :; fi
+ 
+ stamp-h1: $(srcdir)/cvconfig.h.in $(top_builddir)/config.status
+@@ -354,10 +344,9 @@
+ 
+ distclean-libtool:
+ 	-rm -f libtool
+-uninstall-info-am:
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
++	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -374,7 +363,7 @@
+ 	done
+ install-libcvincludeHEADERS: $(libcvinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libcvincludedir)" || $(mkdir_p) "$(DESTDIR)$(libcvincludedir)"
++	test -z "$(libcvincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libcvincludedir)"
+ 	@list='$(libcvinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -421,8 +410,7 @@
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+ 
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ 	@failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -466,8 +454,8 @@
+ 	unique=`for i in $