[gentoo-commits] gentoo-x86 commit in media-libs/opencv/files: opencv-1.0.0-automagicdependencies.patch opencv-1.0.0-havepngexrdefs.patch opencv-1.0.0-fixpythonmultilib.patch opencv-1.0.0-enableuseflags.patch opencv-1.0.0-addoptionalsamples.patch opencv-1.0.0-cvcapffmpegundefinedsymbols.patch

[Thomas Anderson (gentoofan23)]

gentoofan23    08/06/23 00:27:08

  Added:                opencv-1.0.0-automagicdependencies.patch
                        opencv-1.0.0-havepngexrdefs.patch
                        opencv-1.0.0-fixpythonmultilib.patch
                        opencv-1.0.0-enableuseflags.patch
                        opencv-1.0.0-addoptionalsamples.patch
                        opencv-1.0.0-cvcapffmpegundefinedsymbols.patch
  Log:
  Import changes from science overlay, fixes tons of automagic bugs as well as multilib bugs. Keyworded ~amd64
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  media-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-automagicdependencies.patch?rev=1.1&content-type=text/plain

Index: opencv-1.0.0-automagicdependencies.patch
===================================================================
--- opencv-1.0.0-orig/configure.in	2006-11-03 10:54:33.000000000 -0500
+++ opencv-1.0.0/configure.in	2008-06-12 14:25:31.000000000 -0400
@@ -20,7 +20,6 @@
 AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@×××××××××××××××××.net])
 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.1 $)
@@ -81,15 +80,22 @@
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug],[build debug version without optimization])],
               [debug=$enableval], 
-              [debug=no])
+              [debug="no"])
+AM_CONDITIONAL([ENABLE_DEBUG], [test x"$enable_debug" = x"yes"])
 
 # does the user want to build demo applications?
 AC_ARG_ENABLE([apps],
               [AS_HELP_STRING([--enable-apps],[build demo applications])],
               [enable_apps=$enableval],
-              [enable_apps="yes"])
+              [enable_apps="no"])
 AM_CONDITIONAL([BUILD_APPS], [test x"$enable_apps" = x"yes"])
 
+AC_ARG_ENABLE([samples],
+              [AS_HELP_STRING([--enable-samples],[install sample source code])],
+              [enable_samples=$enableval],
+              [enable_samples="no"])
+AM_CONDITIONAL([INSTALL_SAMPLES], [test x"$enable_samples" = x"yes"])
+
 
 # the following checks reflect the dependencies of OpenCV on other
 # libraries that do the actual work for video I/O or windowing 
@@ -101,55 +107,64 @@
 AC_ARG_WITH([swig], 
             [AS_HELP_STRING([--with-swig],[use swig wrapper generator])],
             [with_swig=$withval],
-            [with_swig=no])
+            [with_swig="no"])
+AM_CONDITIONAL([WITH_SWIG], [test x"$with_swig" = x"yes"])
 
 # does the user want to compile python modules as well?
 AC_ARG_WITH([python], 
             [AS_HELP_STRING([--with-python],[use python for wrapping])],
             [with_python=$withval],
-            [with_python=yes])
+            [with_python="no"])
+AM_CONDITIONAL([WITH_PYTHON], [test x"$with_python" = x"yes"])
 
 # does the user want OpenCV to use xine video libraries?
 AC_ARG_WITH([xine],
             [AS_HELP_STRING([--with-xine],[use xine libraries (see LICENSE)])],
             [with_xine=$withval],
-            [with_xine=no])
+            [with_xine="no"])
+AM_CONDITIONAL([WITH_XINE], [test x"$with_xine" = x"yes"])
 
 # does the user want OpenCV to use ffmpeg video libraries?
 AC_ARG_WITH([ffmpeg],
             [AS_HELP_STRING([--with-ffmpeg],[use ffmpeg libraries (see LICENSE)])],
             [with_ffmpeg=$withval],
-            [with_ffmpeg=auto])
+            [with_ffmpeg="no"])
+AM_CONDITIONAL([WITH_XINE], [test x"$with_xine" = x"yes"])
 
 # does the user want OpenCV to use libraw1394/libdc1394 for video input?
 AC_ARG_WITH([1394libs],
             [AS_HELP_STRING([--with-1394libs],[use libraw1394/libdc1394])],
             [with_1394libs=$withval],
-            [with_1394libs=auto])
+            [with_1394libs="no"])
+AM_CONDITIONAL([WITH_1394LIBS], [test x"$with_1394libs" = x"yes"])
 
 # does the user want OpenCV to use the video4linux kernel module?
 AC_ARG_WITH([v4l],
             [AS_HELP_STRING([--with-v4l],[use video4linux])],
             [with_v4l=$withval],
-            [with_v4l=auto])
+            [with_v4l="no"])
+AM_CONDITIONAL([WITH_V4L], [test x"$with_v4l" = x"yes"])
 
 # does the user want OpenCV to use QuickTime video libraries?
 AC_ARG_WITH([quicktime],
             [AS_HELP_STRING([--with-quicktime],[use QuickTime libraries])],
             [with_quicktime=$withval],
-            [with_quicktime=yes])
+            [with_quicktime="no"])
+AM_CONDITIONAL([WITH_QUICKTIME], [test x"$with_quicktime" = x"yes"])
 
 # does the user want OpenCV to use the Carbon GUI of Mac OS X?
 AC_ARG_WITH([carbon],
             [AS_HELP_STRING([--with-carbon],[use Carbon windows])],
             [with_carbon=$withval],
-            [with_carbon=yes])
+            [with_carbon="no"])
+AM_CONDITIONAL([WITH_CARBON], [test x"$with_carbon" = x"yes"])
 
 # does the user want OpenCV to use GTK+ 2.0 for the GUI?
 AC_ARG_WITH([gtk],
             [AS_HELP_STRING([--with-gtk],[use gtk+ 2.0 windows])],
             [with_gtk=$withval],
-            [with_gtk=auto])
+            [with_gtk="no"])
+AM_CONDITIONAL([WITH_GTK], [test x"$with_gtk" = x"yes"])
 
 
 ######################################################################
@@ -340,7 +355,7 @@
 
 # if QuickTime is present, it will override everything else,
 # (unless '--without-quicktime' was given)
-if test x"$with_quicktime" = "xyes"; then
+if test x"$with_quicktime" = x"yes"; then
 
     # check other ./configure flags
     if test x"$with_ffmpeg" = "xyes"; then
@@ -423,129 +438,62 @@
 AC_SUBST(XINE_LIBS)
 AM_CONDITIONAL([BUILD_XINE], [test x"$have_xine" = "xyes"])
 
-# unfortunately, xine does not feature video writing,
-# so we have to resort to FFMPEG here
-if test x"$with_ffmpeg" = "xno"; then
-    have_ffmpeg=no
-    # FFMPEGLIBS=""
-else
-
-    # check if ./configure arguments are valid
-    if test x"$with_ffmpeg" = "xauto"; then
-       with_ffmpeg=yes
-    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"
-                                                    ],
-                                                    [ 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'
-        AC_MSG_WARN([unexpected arguments for option --with-ffmpeg, continuing assuming 'no'])
-        have_ffmpeg=no
-    fi
+if test x"$with_ffmpeg" = x"yes"; then
+        AC_CHECK_HEADER(ffmpeg/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])])
+        AC_CHECK_HEADER(ffmpeg/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])])
+        AC_CHECK_LIB(avcodec, avcodec_decode_video,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
+        AC_CHECK_LIB(avformat, av_open_input_file,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
+        AC_CHECK_LIB(swscale, sws_getContext,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
+        AC_DEFINE(HAVE_FFMPEG,,[FFMpeg video library])
+        FFMPEGLIBS="-lavcodec -lavformat -lswscale"
+        have_ffmpeg=yes
 fi
 AC_SUBST(FFMPEGLIBS)
 AM_CONDITIONAL([BUILD_FFMPEG], [test x"$have_ffmpeg" = "xyes"])
 
 # IEEE1394 / FireWire video video i/o with libdc1394, libraw1394
 # (can be managed by QuickTime as well)
-if test x"$with_1394libs" = "xno"; then
+if test x"$with_1394libs" = x"no"; then
     have_raw1394=no
     have_dc1394=no
     # IEEE1394LIBS=""
-else
+fi
+if test x"$with_1394libs" = x"yes"; then
 
-    # check if ./configure arguments are valid
-    if test x"$with_1394libs" = "xauto"; then
-       with_1394libs=yes
-    fi
-    if test x"$with_1394libs" = "xyes"; then
-    
-        SAVELIBS="$LIBS"
-        have_raw1394=no
-        have_dc1394=no
-        
-        AC_CHECK_HEADER(libraw1394/raw1394.h,
-                        AC_CHECK_LIB(raw1394, raw1394_new_handle, 
-                                     [
-                                       have_raw1394=yes
-                                       LIBS="-lm -lraw1394 $LIBS"
-                                     ]))
-        
-        if test x"$have_raw1394" = "xyes"; then
-            AC_CHECK_HEADER(libdc1394/dc1394_control.h,
-                            AC_CHECK_LIB(dc1394_control, dc1394_camera_on, 
-                                         [
-                                           have_dc1394=yes
-                                           AC_DEFINE(HAVE_DC1394,,[IEEE1394 capturing support])
-                                           AC_EGREP_HEADER(do_extra_buffering, libdc1394/dc1394_control.h,
-                                                           [AC_DEFINE(HAVE_DC1394_095,,[libdc1394 0.9.4 or 0.9.5])])
-                                           IEEE1394LIBS="-lm -lraw1394 -ldc1394_control"
-                                         ]))
-        fi
-        
-        LIBS="$SAVELIBS"
-    else
-        # if we get here then --with-1394libs was not called with 'yes','no' or 'auto'
-        AC_MSG_WARN([unexpected arguments for option --with-1394libs, continuing assuming 'no'])
-        have_dc1394=no
-    fi
+	AC_CHECK_HEADER(libraw1394/raw1394.h,, [AC_MSG_ERROR([1394 requested but header file libraw1394/raw1394.h not found])])
+	AC_CHECK_LIB(raw1394, raw1394_new_handle,, [AC_MSG_ERROR([1394 requested but 1394 libraries not found])])
+	AC_CHECK_HEADER(libdc1394/dc1394_control.h,, [AC_MSG_ERROR([1394 requested but header file libdc1394/dc1394_control.h not found])])
+	AC_CHECK_LIB(dc1394_control, dc1394_camera_on,, [AC_MSG_ERROR([1394 requested but 1394 raw libraries not found])])
+	AC_DEFINE(HAVE_DC1394,, [IEEE1394 capturing support])
+	have_raw1394=yes
+	have_dc1394=yes
+	LIBS="-lm -lraw1394 $LIBS"
+	IEEE1394LIBS="-lm -lraw1394 -ldc1394_control"
+    SAVELIBS="$LIBS"
+	LIBS="$SAVELIBS"
 fi
 AC_SUBST(IEEE1394LIBS)
-AM_CONDITIONAL([BUILD_DC1394], [test x"$have_dc1394" = "xyes"])
+AM_CONDITIONAL([BUILD_DC1394], [test x"$have_dc1394" = x"yes"])
 
 # Video for Linux (V4L) 
 # we support version 1 and 2 currently
-if test x"$with_v4l" = "xno"; then
-    have_v4l=no
-    have_v4l2=no
-    have_v4l1or2=no
-else
-    # check if ./configure arguments are valid
-    if test x"$with_v4l" = "xauto"; then
-       with_v4l=yes
-    fi
-    if test x"$with_v4l" = "xyes"; then
-        AC_CHECK_HEADER([linux/videodev.h],
-                        [
-                          AC_DEFINE(HAVE_CAMV4L,,[V4L capturing support])
-                          have_v4l=yes
-                          have_v4l1or2=yes
-                        ],
-                        [ 
-                          have_v4l=no
-                          have_v4l1or2=no
-                        ])
-        AC_CHECK_HEADER([linux/videodev2.h],
-                        [
-                          AC_DEFINE(HAVE_CAMV4L2,,[V4L2 capturing support])
-                          have_v4l2=yes
-                          have_v4l1or2=yes
-                        ],
-                        [ have_v4l2=no ],
-                [[
-                #include <asm/types.h>
-                #include <sys/time.h>
-                ]])
-    else
-        # if we get here then --with-v4l was not called with 'yes','no' or 'auto'
-        AC_MSG_WARN([unexpected arguments for option --with-v4l, continuing assuming 'no'])
-        have_v4l=no
-        have_v4l2=no
-        have_v4l1or2=no
-    fi
+have_v4l=no
+have_v4l2=no
+have_v4l1or2=no
+if test x"$with_v4l" = x"yes"; then
+	AC_CHECK_HEADER(linux/videodev.h,, [AC_MSG_ERROR([Video4linux requested but header file linux/videodev.h not found])])
+	AC_DEFINE(HAVE_CAMV4L,,[V4L capturing support])
+	have_v4l=yes
+fi
+
+if test x"$with_v4l2" = x"yes"; then
+	AC_CHECK_HEADER(linux/videodev2.h,, [AC_MSG_ERROR([Video4linux2 requested but header file linux/videodev.h not found])])
+	AC_DEFINE(HAVE_CAMV4L2,, [V4L2 capturing support])
+	have_v4l2=yes
+fi
 
+if test x"$with_v4l" = x"yes" && test x"$with_v4l2" = x"yes"; then
+	have_v4l1or2=yes
 fi
 AM_CONDITIONAL([BUILD_V4L], [test x"$have_v4l1or2" = "xyes"])
 
@@ -558,78 +506,86 @@
 
 AC_SUBST(IMAGELIBS)
 
-have_jpeg=no
-AC_CHECK_HEADER(jpeglib.h,
-                AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-                             [
-                               have_jpeg=yes
-                               AC_DEFINE(HAVE_JPEG,,[IJG JPEG codec])
-                               IMAGELIBS="$IMAGELIBS -ljpeg"
-                             ]))
-
-have_zlib=no
-AC_CHECK_HEADER(zlib.h,
-                AC_CHECK_LIB(z, gzopen,
-                             [
-                               have_zlib=yes
-                               AC_DEFINE(HAVE_ZLIB,,[LZ77 compression/decompression library (used for PNG)])
-                               IMAGELIBS="$IMAGELIBS -lz -lm"
-                               LIBS="$LIBS -lz -lm"
-                             ]))
-
-have_png=no
-AC_CHECK_HEADER(png.h, 
-                [
-                  AC_DEFINE(HAVE_PNG_H,,[png.h needs to be included])
-                  have_png=yes
-                ])
-AC_CHECK_HEADER([libpng/png.h], 
-                [
-                  AC_DEFINE(HAVE_LIBPNG_PNG_H,,[libpng/png.h needs to be included])
-                  have_png=yes
-                ])
-if test x"$have_png" = "xyes"; then
-    AC_CHECK_LIB(png12, png_read_image,
-                 [
-                   have_png=yes
-                   AC_DEFINE(HAVE_PNG,,[PNG codec])
-                   IMAGELIBS="-lpng12 $IMAGELIBS"
-                   LIBS="-lpng12 $LIBS"
-                   AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha)
-                 ],
-                 [ have_png=no ])
-fi
-
-have_tiff=no
-AC_CHECK_HEADER(tiff.h,
-                AC_CHECK_LIB(tiff, TIFFReadRGBAStrip,
-                             [
-                               have_tiff=yes
-                               AC_DEFINE(HAVE_TIFF,,[TIFF codec])
-                               IMAGELIBS="$IMAGELIBS -ltiff"
-                               LIBS="$LIBS -ltiff"
-                             ]))
-
-have_jasper=no
-AC_CHECK_HEADER(jasper/jasper.h,
-                AC_CHECK_LIB(jasper, jas_image_readcmpt,
-                             [
-                               have_jasper=yes
-                               AC_DEFINE(HAVE_JASPER,,[JPEG-2000 codec])
-                               IMAGELIBS="$IMAGELIBS -ljasper"
-                               LIBS="$LIBS -ljasper"
-                             ]))
-
-have_ilmimf=no
-AC_CHECK_HEADER(ImfCRgbaFile.h,
-                AC_CHECK_LIB(IlmImf, ImfInputReadPixels,
-                             [
-                               have_ilmimf=yes
-                               AC_DEFINE(HAVE_ILMIMF,,[OpenEXR codec])
-                               IMAGELIBS="$IMAGELIBS -lIlmImf -lIex -lHalf"
-                               LIBS="$LIBS -lIlmImf -lIex -lHalf"
-                             ],,
-                             [ -lIex -lHalf ]))
+AC_ARG_ENABLE(jpeg,
+	[AS_HELP_STRING([--enable-jpeg], [Enable JPEG Image I/O])],
+	[enable_jpeg=$enableval],
+	[enable_jpeg=no])
+
+if test x"$enable_jpeg" = x"yes"; then
+	AC_CHECK_HEADER(jpeglib.h,, [AC_MSG_ERROR([Jpeg library requested but header jpeglib.h not found])])
+	AC_CHECK_LIB(jpeg, jpeg_destroy_compress,, [AC_MSG_ERROR([Jpeg library requested but libraries not found])])
+	IMAGELIBS="$IMAGELIBS -ljpeg"
+	AC_DEFINE(HAVE_JPEG,,[IJG JPEG codec])
+fi
+
+AC_ARG_ENABLE(zlib,
+	[AS_HELP_STRING([--enable-zlib], [Enable Zlib compression])],
+	[enable_zlib=$enableval],
+	[enable_zlib=no])
+
+if test x"$enable_zlib" = x"yes"; then
+	AC_CHECK_HEADER(zlib.h,, [AC_MSG_ERROR([Zlib library requested but header zlib.h not found])])
+	AC_CHECK_LIB(z,gzopen,, [AC_MSG_ERROR([Zlib library requested but libraries not found])])
+	AC_DEFINE(HAVE_ZLIB,,[lZ77 compression/decompression library (used for PNG)])
+	IMAGELIBS="$IMAGELIBS -lz -lm"
+	LIBS="$LIBS -lz -lm"
+fi
+
+AC_ARG_ENABLE(png,
+	[AS_HELP_STRING([--enable-png], [Enable PNG Image I/O])],
+	[enable_png=$enableval],
+	[enable_png=no])
+
+if test x"$enable_png" = x"yes"; then
+	AC_CHECK_HEADER(png.h,, [AC_MSG_ERROR([PNG requested but headers not found])])
+	AC_CHECK_LIB(png12, png_read_image,, [AC_MSG_ERROR([PNG requested but libraries not found])])
+	AC_DEFINE(HAVE_PNG,, [PNG codec])
+	AC_DEFINE(HAVE_PNG_H,, [PNG header])
+	IMAGELIBS="`libpng-config --ldflags` $IMAGELIBS"
+	LIBS="`libpng-config --ldflags` $IMAGELIBS"
+	AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha)
+fi
+AM_CONDITIONAL([HAVE_PNG], [test x"$enable_png" = x"yes"])
+
+AC_ARG_ENABLE(tiff,
+	[AS_HELP_STRING([--enable-tiff], [Enable TIFF Image I/O])],
+	[enable_tiff=$enableval],
+	[enable_tiff=no])
+
+if test x"$enable_tiff" = x"yes"; then
+	AC_CHECK_HEADER(tiff.h,, [AC_MSG_ERROR([Tiff requested but header file not found])])
+	AC_CHECK_LIB(tiff, TIFFReadRGBAStrip,, [AC_MSG_ERROR([Tiff requested but libraries not found])])
+	AC_DEFINE(HAVE_TIFF,,[TIFF codec])
+	IMAGELIBS="$IMAGELIBS -ltiff"
+	LIBS="$LIBS -ltiff"
+fi
+
+AC_ARG_ENABLE(jasper,
+	[AS_HELP_STRING([--enable-jasper], [Enable Jasper])],
+	[enable_jasper=$enableval],
+	[enable_jasper=no])
+
+if test x"$enable_jasper" = x"yes"; then
+	AC_CHECK_HEADER(jasper/jasper.h,, [AC_MSG_ERROR([Jasper requested but header filejasper/jasper.h not found])])
+	AC_CHECK_LIB(jasper, jas_image_readcmpt,, [AC_MSG_ERROR([Jasper requested but libraries not found])])
+	AC_DEFINE(HAVE_JASPER,, [JPEG-2000 codec])
+	IMAGELIBS="$IMAGELIBS -ljasper"
+	LIBS="$LIBS -ljasper"
+fi
+
+
+AC_ARG_ENABLE(openexr,
+	[AS_HELP_STRING([--enable-openexr], [Enable Openexr support])],
+	[enable_openexr=$enableval],
+	[enable_openexr=no])
+
+if test x"$enable_openexr" = x"yes"; then
+	AC_CHECK_HEADER(OpenEXR/ImfCRgbaFile.h,, [AC_MSG_ERROR([Openexr requested but header file ImfCrgbaFile.h not found])])
+	AC_CHECK_LIB(IlmImf, ImfInputReadPixels,, [AC_MSG_ERROR([Openexr requested but libraries not found])])
+	AC_DEFINE(HAVE_ILMIMF,, [OpenExr codec])
+	IMAGELIBS="$IMAGELIBS -lIlmImf -lIex -lHalf"
+	LIBS="$LIBS -lIlmImf -lIex -lHalf"
+fi
 
 # Restore original LIBS settings...
 LIBS="$SAVELIBS"
@@ -690,7 +646,7 @@
 AM_CONDITIONAL([BUILD_PYTHON_WRAPPERS], [test x"$have_python" = "xyes"])
 
 # check for swig itself
-SWIG=""
+SWIG="no"
 if test x"$with_swig" = "xyes"; then
     AC_MSG_NOTICE([Checking for SWIG])
 
@@ -807,12 +763,12 @@
     Use gthread:              ${have_gthread}
     
     Image I/O ---------------------
-    Use libjpeg:              ${have_jpeg}
-    Use zlib:                 ${have_zlib}
-    Use libpng:               ${have_png}
-    Use libtiff:              ${have_tiff}
-    Use libjasper:            ${have_jasper}
-    Use libIlmImf:            ${have_ilmimf}
+    Use libjpeg:              ${enable_jpeg}
+    Use zlib:                 ${enable_zlib}
+    Use libpng:               ${enable_png}
+    Use libtiff:              ${enable_tiff}
+    Use libjasper:            ${enable_jasper}
+    Use libIlmImf:            ${enable_openexr}
     
     Video I/O ---------------------
     Use QuickTime / Mac OS X: ${have_quicktime}
@@ -828,6 +784,7 @@
 
 Additional build settings ============================================
     Build demo apps           ${enable_apps}
+    Install source snippets   ${enable_samples}
 
 Now run make ...
 ])



1.1                  media-libs/opencv/files/opencv-1.0.0-havepngexrdefs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-havepngexrdefs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-havepngexrdefs.patch?rev=1.1&content-type=text/plain

Index: opencv-1.0.0-havepngexrdefs.patch
===================================================================
diff -aur opencv-1.0.0-orig/otherlibs/highgui/Makefile.am opencv-1.0.0/otherlibs/highgui/Makefile.am
--- opencv-1.0.0-orig/otherlibs/highgui/Makefile.am	2006-10-31 10:49:51.000000000 -0500
+++ opencv-1.0.0/otherlibs/highgui/Makefile.am	2008-06-07 10:15:18.000000000 -0400
@@ -4,8 +4,8 @@
     cvcap_v4l.cpp cvcap_xine.cpp                                 \
     window_carbon.cpp window_gtk.cpp window_w32.cpp
 
-INCLUDES = -I. -I$(top_srcdir)/cxcore/include \
-    -I$(top_srcdir)/cv/include @GTHREAD_CFLAGS@ @GTK_CFLAGS@ \
+INCLUDES = -I. -I$(top_srcdir)/cxcore/include -I$(top_srcdir) \
+    -I$(top_srcdir)/cv/include -I/usr/include/OpenEXR @GTHREAD_CFLAGS@ @GTK_CFLAGS@ \
     @QUICKTIME_CFLAGS@ @CARBON_CFLAGS@
 
 noinst_HEADERS     = \
diff -aur opencv-1.0.0-orig/otherlibs/highgui/grfmt_exr.cpp opencv-1.0.0/otherlibs/highgui/grfmt_exr.cpp
--- opencv-1.0.0-orig/otherlibs/highgui/grfmt_exr.cpp	2006-10-17 07:58:55.000000000 -0400
+++ opencv-1.0.0/otherlibs/highgui/grfmt_exr.cpp	2008-06-07 10:12:42.000000000 -0400
@@ -40,6 +40,7 @@
 //M*/
 
 #include "_highgui.h"
+#include "cvconfig.h"
 
 #ifdef HAVE_ILMIMF
 
diff -aur opencv-1.0.0-orig/otherlibs/highgui/grfmt_png.cpp opencv-1.0.0/otherlibs/highgui/grfmt_png.cpp
--- opencv-1.0.0-orig/otherlibs/highgui/grfmt_png.cpp	2006-10-11 12:51:43.000000000 -0400
+++ opencv-1.0.0/otherlibs/highgui/grfmt_png.cpp	2008-06-07 09:56:54.000000000 -0400
@@ -40,6 +40,7 @@
 //M*/
 
 #include "_highgui.h"
+#include "cvconfig.h"
 
 #ifdef HAVE_PNG
 
@@ -50,10 +51,10 @@
     and png2bmp sample from libpng distribution (Copyright (C) 1999-2001 MIYASAKA Masaru)
 \****************************************************************************************/
 
-#if defined WIN32 || defined HAVE_PNG_H
+#ifdef HAVE_PNG_H
 #include <png.h>
 #else
-#include <libpng/png.h>
+#include <libpng12/png.h>
 #endif
 #include "grfmt_png.h"
 



1.1                  media-libs/opencv/files/opencv-1.0.0-fixpythonmultilib.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-fixpythonmultilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-fixpythonmultilib.patch?rev=1.1&content-type=text/plain

Index: opencv-1.0.0-fixpythonmultilib.patch
===================================================================
--- opencv-1.0.0-orig/interfaces/swig/python/Makefile.am	2006-08-10 09:29:20.000000000 -0400
+++ opencv-1.0.0/interfaces/swig/python/Makefile.am	2008-06-07 07:43:34.000000000 -0400
@@ -92,9 +92,9 @@
 
 if BUILD_PYTHON_WRAPPERS
 
-pkgpython_LTLIBRARIES = _cv.la _highgui.la
+pkgpyexec_LTLIBRARIES = _cv.la _highgui.la
 
-pkgpython_PYTHON = \
+pkgpyexec_PYTHON = \
   __init__.py    \
   cv.py          \
   adaptors.py    \



1.1                  media-libs/opencv/files/opencv-1.0.0-enableuseflags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-enableuseflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-enableuseflags.patch?rev=1.1&content-type=text/plain

Index: opencv-1.0.0-enableuseflags.patch
===================================================================
--- ../configure.in	2006-11-26 19:03:36.000000000 +0100
+++ configure.in	2006-11-26 19:13:23.000000000 +0100
@@ -81,13 +81,14 @@
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug],[build debug version without optimization])],
               [debug=$enableval], 
-              [debug=no])
+              [debug="no"])
+AM_CONDITIONAL([ENABLE_DEBUG], [test x"$enable_debug" = x"yes"])
 
 # does the user want to build demo applications?
 AC_ARG_ENABLE([apps],
               [AS_HELP_STRING([--enable-apps],[build demo applications])],
               [enable_apps=$enableval],
-              [enable_apps="yes"])
+              [enable_apps="no"])
 AM_CONDITIONAL([BUILD_APPS], [test x"$enable_apps" = x"yes"])
 
 
@@ -101,55 +102,64 @@
 AC_ARG_WITH([swig], 
             [AS_HELP_STRING([--with-swig],[use swig wrapper generator])],
             [with_swig=$withval],
-            [with_swig=no])
+            [with_swig="no"])
+AM_CONDITIONAL([WITH_SWIG], [test x"$with_swig" = x"yes"])
 
 # does the user want to compile python modules as well?
 AC_ARG_WITH([python], 
             [AS_HELP_STRING([--with-python],[use python for wrapping])],
             [with_python=$withval],
-            [with_python=yes])
+            [with_python="no"])
+AM_CONDITIONAL([WITH_PYTHON], [test x"$with_python" = x"yes"])
 
 # does the user want OpenCV to use xine video libraries?
 AC_ARG_WITH([xine],
             [AS_HELP_STRING([--with-xine],[use xine libraries (see LICENSE)])],
             [with_xine=$withval],
-            [with_xine=no])
+            [with_xine=i"no"])
+AM_CONDITIONAL([WITH_XINE], [test x"$with_xine" = x"yes"])
 
 # does the user want OpenCV to use ffmpeg video libraries?
 AC_ARG_WITH([ffmpeg],
             [AS_HELP_STRING([--with-ffmpeg],[use ffmpeg libraries (see LICENSE)])],
             [with_ffmpeg=$withval],
             [with_ffmpeg=auto])
+AM_CONDITIONAL([WITH_XINE], [test x"$with_xine" = x"yes"])
 
 # does the user want OpenCV to use libraw1394/libdc1394 for video input?
 AC_ARG_WITH([1394libs],
             [AS_HELP_STRING([--with-1394libs],[use libraw1394/libdc1394])],
             [with_1394libs=$withval],
-            [with_1394libs=auto])
+            [with_1394libs="no"])
+AM_CONDITIONAL([WITH_1394LIBS], [test x"$with_1394libs" = x"yes"])
 
 # does the user want OpenCV to use the video4linux kernel module?
 AC_ARG_WITH([v4l],
             [AS_HELP_STRING([--with-v4l],[use video4linux])],
             [with_v4l=$withval],
-            [with_v4l=auto])
+            [with_v4l="no"])
+AM_CONDITIONAL([WITH_V4L], [test x"$with_v4l" = x"yes"])
 
 # does the user want OpenCV to use QuickTime video libraries?
 AC_ARG_WITH([quicktime],
             [AS_HELP_STRING([--with-quicktime],[use QuickTime libraries])],
             [with_quicktime=$withval],
-            [with_quicktime=yes])
+            [with_quicktime="no"])
+AM_CONDITIONAL([WITH_QUICKTIME], [test x"$with_quicktime" = x"yes"])
 
 # does the user want OpenCV to use the Carbon GUI of Mac OS X?
 AC_ARG_WITH([carbon],
             [AS_HELP_STRING([--with-carbon],[use Carbon windows])],
             [with_carbon=$withval],
-            [with_carbon=yes])
+            [with_carbon="no"])
+AM_CONDITIONAL([WITH_CARBON], [test x"$with_carbon" = x"yes"])
 
 # does the user want OpenCV to use GTK+ 2.0 for the GUI?
 AC_ARG_WITH([gtk],
             [AS_HELP_STRING([--with-gtk],[use gtk+ 2.0 windows])],
             [with_gtk=$withval],
-            [with_gtk=auto])
+            [with_gtk="no"])
+AM_CONDITIONAL([WITH_GTK], [test x"$with_gtk" = x"yes"])
 
 
 ######################################################################
@@ -187,7 +197,7 @@
     AC_MSG_RESULT([yes])
     if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
         CPPFLAGS="-DDEBUG -D_DEBUG $CPPFLAGS"
-        CXXFLAGS="-ggdb -O0 $CXXFLAGS"
+        CXXFLAGS="-ggdb -O0 -g $CXXFLAGS"
     fi
 else
     AC_MSG_RESULT([no])
@@ -202,7 +212,7 @@
     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"
+          CXXFLAGS="-march=i686 -ffast-math -fomit-frame-pointer $CXXFLAGS"
         fi
         ;;
     powerpc-*-*)
@@ -340,7 +350,7 @@
 
 # if QuickTime is present, it will override everything else,
 # (unless '--without-quicktime' was given)
-if test x"$with_quicktime" = "xyes"; then
+if test x"$with_quicktime" = x"yes"; then
 
     # check other ./configure flags
     if test x"$with_ffmpeg" = "xyes"; then
@@ -690,7 +700,7 @@
 AM_CONDITIONAL([BUILD_PYTHON_WRAPPERS], [test x"$have_python" = "xyes"])
 
 # check for swig itself
-SWIG=""
+SWIG="no"
 if test x"$with_swig" = "xyes"; then
     AC_MSG_NOTICE([Checking for SWIG])
 
@@ -821,6 +831,7 @@
     Use dc1394 & raw1394:     ${have_dc1394}
     Use v4l:                  ${have_v4l}
     Use v4l2:                 ${have_v4l2}
+    Use gtk:		      ${have_gtk}
     
 Wrappers for other languages =========================================
     SWIG                      ${SWIG}




1.1                  media-libs/opencv/files/opencv-1.0.0-addoptionalsamples.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-addoptionalsamples.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-addoptionalsamples.patch?rev=1.1&content-type=text/plain

Index: opencv-1.0.0-addoptionalsamples.patch
===================================================================
diff -aur opencv-1.0.0-orig/samples/c/Makefile.am opencv-1.0.0/samples/c/Makefile.am
--- opencv-1.0.0-orig/samples/c/Makefile.am	2006-10-18 10:27:23.000000000 -0400
+++ opencv-1.0.0/samples/c/Makefile.am	2008-06-09 11:58:36.000000000 -0400
@@ -1,3 +1,5 @@
+if INSTALL_SAMPLES
+
 csamplesdir=$(pkgdatadir)/samples/c
 
 dist_csamples_DATA = airplane.jpg baboon.jpg lena.jpg fruits.jpg stuff.jpg \
@@ -10,4 +12,5 @@
 inpaint.cpp laplace.c letter_recog.cpp lkdemo.c minarea.c morphology.c motempl.c \
 mushroom.cpp pyramid_segmentation.c squares.c watershed.cpp
 
+endif
 
diff -aur opencv-1.0.0-orig/samples/python/Makefile.am opencv-1.0.0/samples/python/Makefile.am
--- opencv-1.0.0-orig/samples/python/Makefile.am	2006-10-04 04:02:12.000000000 -0400
+++ opencv-1.0.0/samples/python/Makefile.am	2008-06-09 12:00:25.000000000 -0400
@@ -1,3 +1,5 @@
+if INSTALL_SAMPLES
+if WITH_PYTHON
 csamplesdir=$(pkgdatadir)/samples/python
 
 dist_csamples_SCRIPTS =     \
@@ -29,3 +31,6 @@
     pyramid_segmentation.py \
     squares.py              \
     watershed.py
+
+endif
+endif



1.1                  media-libs/opencv/files/opencv-1.0.0-cvcapffmpegundefinedsymbols.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-cvcapffmpegundefinedsymbols.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-cvcapffmpegundefinedsymbols.patch?rev=1.1&content-type=text/plain

Index: opencv-1.0.0-cvcapffmpegundefinedsymbols.patch
===================================================================
--- otherlibs/highgui/cvcap_ffmpeg.cpp	2006-07-24 18:27:39.000000000 -0400
+++ otherlibs/highgui/cvcap_ffmpeg.cpp	2008-06-12 12:25:42.000000000 -0400
@@ -41,9 +41,14 @@
 
 #include "_highgui.h"
 
+#define __STDC_CONSTANT_MACROS
 
 extern "C" {
 #include <ffmpeg/avformat.h>
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/swscale.h>
+#include <sys/types.h> /* size_t */
+#include <sys/errno.h>
 }
 
 #ifdef NDEBUG
@@ -52,6 +57,8 @@
 #define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, __FILE__, __LINE__)
 #endif
 
+static struct SwsContext *img_convert_ctx;
+
 typedef struct CvCaptureAVI_FFMPEG
 {
     CvCaptureVTable   * vtable;
@@ -214,19 +221,21 @@
 {
     if( !capture || !capture->video_st || !capture->picture->data[0] )
     return 0;
-#if LIBAVFORMAT_BUILD > 4628
-    img_convert( (AVPicture*)&capture->rgb_picture, PIX_FMT_BGR24,
-                 (AVPicture*)capture->picture,
-                 capture->video_st->codec->pix_fmt,
-                 capture->video_st->codec->width,
-                 capture->video_st->codec->height );
-#else
-    img_convert( (AVPicture*)&capture->rgb_picture, PIX_FMT_BGR24,
-                 (AVPicture*)capture->picture,
-                 capture->video_st->codec.pix_fmt,
-                 capture->video_st->codec.width,
-                 capture->video_st->codec.height );
-#endif
+
+    img_convert_ctx = sws_getContext(capture->video_st->codec->width,
+				     capture->video_st->codec->height,
+				     capture->video_st->codec->pix_fmt,
+				     capture->video_st->codec->width,
+				     capture->video_st->codec->height,
+				     PIX_FMT_BGR24,
+				     SWS_BICUBIC,
+				     NULL, NULL, NULL);
+    
+    sws_scale(img_convert_ctx, capture->picture->data, 
+	      capture->picture->linesize, 0,
+	      capture->video_st->codec->height, 
+	      capture->rgb_picture.data, capture->rgb_picture.linesize);
+    
     return &capture->frame;
 }
 
@@ -713,9 +722,20 @@
 				PIX_FMT_BGR24, image->width, image->height);
 
 		// convert to the color format needed by the codec
-		if( img_convert((AVPicture *)mywriter->picture, c->pix_fmt,
-					(AVPicture *)mywriter->rgb_picture, PIX_FMT_BGR24, 
-					image->width, image->height) < 0){
+		img_convert_ctx = sws_getContext(image->width,
+						 image->height,
+						 PIX_FMT_BGR24,
+						 c->width,
+						 c->height,
+						 c->pix_fmt,
+						 SWS_BICUBIC,
+						 NULL, NULL, NULL);
+		
+		if ( sws_scale(img_convert_ctx, mywriter->rgb_picture->data, 
+			       mywriter->rgb_picture->linesize, 0,
+			       image->height, 
+			       mywriter->picture->data, mywriter->picture->linesize) < 0 )
+		{
 			CV_ERROR(CV_StsUnsupportedFormat, "FFMPEG::img_convert pixel format conversion from BGR24 not handled");
 		}
 	}



-- 
gentoo-commits@l.g.o mailing list