← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/opencv/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/040_check_for_newer_dc1394.diff

  • Committer: Bazaar Package Importer
  • Author(s): Nobuhiro Iwamatsu
  • Date: 2010-07-16 13:12:28 UTC
  • mfrom: (4.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100716131228-95963rebybpghxef
Tags: 2.1.0-1
http://bugs.debian.org/577594
http://bugs.debian.org/587232
http://bugs.debian.org/563717
http://bugs.debian.org/581210
* New upstream release. (Closes: #577594, #587232, #563717)
* Update debian/rules.
  - Update build-system to debhelper v7.
* Update debian/control.
  - Bumped standards-version to 3.9.0. No changes needed.
  - library package name update.
    Soname of opencv library changed from 4 to 2.1.
  - Add cmake, liblapack-dev, texlive-fonts-extra, texlive-latex-extra,
    texlive-latex-recommended, latex-xcolor and  texlive-fonts-recommended
    to Build-depends.
  - Add arch depends to libraw1394-dev and libdc1394-22-dev.
    Thanks to Pino Toscano. (Closes: #581210)
* Add opencv-doc.lintian-overrides.
  opencv-doc has some sample program of python.
* Update man files.
* Update patches
  - Update and rename 500_remove_bashism.patch.
    And rename to remove_bashism.patch.
* Add new patches.
  - Enable build static library.
    enable_static.patch
  - Disable build 3rd party library.
    Use zlib and lapack in debian package.
    fix_3rdparty_build.patch
  - Fix build pdf.
    fix_build_pdf.patch
  - Remove cvconfig.h
    remove_cvconfig.h.patch
* Remove some patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/040_check_for_newer_dc1394.diff
1
 
Index: opencv-1.0.0/configure.in
2
 
===================================================================
3
 
--- opencv-1.0.0.orig/configure.in      2009-03-01 22:32:22.000000000 +0100
4
 
+++ opencv-1.0.0/configure.in   2009-03-01 22:32:30.000000000 +0100
5
 
@@ -483,14 +483,14 @@
6
 
                                      ]))
7
 
         
8
 
         if test x"$have_raw1394" = "xyes"; then
9
 
-            AC_CHECK_HEADER(libdc1394/dc1394_control.h,
10
 
-                            AC_CHECK_LIB(dc1394_control, dc1394_camera_on, 
11
 
+            AC_CHECK_HEADER(dc1394/control.h,
12
 
+                            AC_CHECK_LIB(dc1394, dc1394_camera_set_power, 
13
 
                                          [
14
 
                                            have_dc1394=yes
15
 
                                            AC_DEFINE(HAVE_DC1394,,[IEEE1394 capturing support])
16
 
-                                           AC_EGREP_HEADER(do_extra_buffering, libdc1394/dc1394_control.h,
17
 
-                                                           [AC_DEFINE(HAVE_DC1394_095,,[libdc1394 0.9.4 or 0.9.5])])
18
 
-                                           IEEE1394LIBS="-lm -lraw1394 -ldc1394_control"
19
 
+                                           AC_EGREP_HEADER(dc1394_camera_set_power, dc1394/control.h,
20
 
+                                                           [AC_DEFINE(HAVE_DC1394_2_X,,[libdc1394 2.x])])
21
 
+                                           IEEE1394LIBS="-lm -lraw1394"
22
 
                                          ]))
23
 
         fi
24