[cimg] 05/05: Fix build with Opencv 3.1

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository cimg.

commit a949f053a0f38d3d887275fc5e4ef638b86da5c0
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 28 13:21:07 2016 +0200

    Fix build with Opencv 3.1
---
 debian/changelog                |  3 +++
 debian/patches/opencv_3.1.patch | 24 ++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f8cd96c..176ea42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ cimg (1.7.8+dfsg-1) UNRELEASED; urgency=medium
   * update Build-Depends to libopencv-dev (Thanks for the patch to
     Nobuhiro Iwamatsu <iwamatsu at nigauri.org>)
     Closes: #841263
+  * Fix build with Opencv 3.1 (Thanks for the patch to
+    Nobuhiro Iwamatsu <iwamatsu at nigauri.org>)
+    Closes: #841264
 
  -- Andreas Tille <tille at debian.org>  Tue, 03 May 2016 09:14:47 +0200
 
diff --git a/debian/patches/opencv_3.1.patch b/debian/patches/opencv_3.1.patch
new file mode 100644
index 0000000..53348bb
--- /dev/null
+++ b/debian/patches/opencv_3.1.patch
@@ -0,0 +1,24 @@
+Author:  Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Last-Update: Wed, 19 Oct 2016 04:24:01 UTC
+Bug-Debian: https://bugs.debian.org/841264
+Description: Fix build with Opencv 3.1
+ -----
+ ....
+ /usr/bin/ld: /tmp/ccuYcVc5.o: undefined reference to symbol 'cvWriteFrame'
+ //usr/lib/x86_64-linux-gnu/libopencv_videoio.so.3.1: error adding symbols: DSO
+ //missing from command line
+ collect2: error: ld returned 1 exit status
+ Makefile:248: recipe for target 'CImg_demo' failed
+ -----
+
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -149,7 +149,7 @@ endif
+ CIMG_OPENCV_DEFINE = -Dcimg_use_opencv
+ CIMG_OPENCV_INCDIR = `pkg-config opencv --cflags || echo -I/usr/include/opencv` -I/usr/include/opencv
+ CIMG_OPENCV_CFLAGS = $(CIMG_OPENCV_DEFINE) $(CIMG_OPENCV_INCDIR)
+-CIMG_OPENCV_LIBS = `pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui`
++CIMG_OPENCV_LIBS = `pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio`
+ 
+ # Flags used to disable display capablities of CImg
+ CIMG_NODISPLAY_CFLAGS = -Dcimg_display=0
diff --git a/debian/patches/series b/debian/patches/series
index 17cd973..c9131b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 30_do_not_build_minc2_examples.patch
 # use_pkg-config.patch
 # fix_privacy_breach.patch
+opencv_3.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cimg.git