Attachment 1045521 Details for Bug 1238734 – use pkg-config to get CFLAGS and LIBS

use pkg-config to get CFLAGS and LIBS

0001-use-pkg-config-to-get-CFLAGS-and-LIBS-for-OpenCV.patch (text/plain), 2.68 KB, created by Jozef Mlich on 2015-07-02 13:43:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jozef Mlich

Created: 2015-07-02 13:43:42 UTC

Size: 2.68 KB

patch

obsolete

>From 6c37b32dd86064e94e6a67a35e3404622b40d38e Mon Sep 17 00:00:00 2001
>From: Jozef Mlich <jmlich@redhat.com>
>Date: Thu, 2 Jul 2015 15:34:02 +0200
>Subject: [PATCH] use pkg-config to get CFLAGS and LIBS for OpenCV
>
>---
> gmic-1.6.5.0-opencv3.patch | 20 ++++++++++++++++++++
> gmic.spec                  |  7 ++++++-
> 2 files changed, 26 insertions(+), 1 deletion(-)
> create mode 100644 gmic-1.6.5.0-opencv3.patch
>
>diff --git a/gmic-1.6.5.0-opencv3.patch b/gmic-1.6.5.0-opencv3.patch
>new file mode 100644
>index 0000000..00fd431
>--- /dev/null
>+++ b/gmic-1.6.5.0-opencv3.patch
>@@ -0,0 +1,20 @@
>+diff -up ./gmic-1.6.5.0/src/Makefile.opencv3 ./gmic-1.6.5.0/src/Makefile
>+--- ./gmic-1.6.5.0/src/Makefile.opencv3	2015-07-02 14:53:42.182203245 +0200
>++++ ./gmic-1.6.5.0/src/Makefile	2015-07-02 15:11:17.773449658 +0200
>+@@ -185,14 +185,8 @@ CURL_LIBS = -lcurl
>+ # Flags to enable native support of webcams, using the OpenCV library.
>+ # This requires the presence of the OpenCV include and library files.
>+ # (package 'libcv3-2-dev' on Debian).
>+-ifeq ($(OS),Darwin)
>+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/$(INCLUDE) -I$(USR)/$(INCLUDE)/opencv
>+-OPENCV_LIBS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !
>+-else
>+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/$(INCLUDE) -I$(USR)/$(INCLUDE)/opencv
>+-# OPENCV_LIBS = -lcv -lhighgui
>+-OPENCV_LIBS = -lopencv_core -lopencv_highgui   #-> Use this for OpenCV >= 2.2.0 !
>+-endif
>++OPENCV_CFLAGS = -Dcimg_use_opencv  `pkg-config opencv --cflags`
>++OPENCV_LIBS = `pkg-config opencv --libs`
>+ 
>+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
>+ # This requires the presence of the GraphicsMagick++ include and library files.
>diff --git a/gmic.spec b/gmic.spec
>index cbfd46b..8cf9654 100644
>--- a/gmic.spec
>+++ b/gmic.spec
>@@ -5,9 +5,10 @@
> Summary: GREYC's Magic for Image Computing
> Name: gmic
> Version: 1.6.5.0
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Source: http://downloads.sourceforge.net/project/%{name}/%{name}_%{version}.tar.gz
> Patch1: %{name}-%{version}-qmake.patch
>+Patch2: %{name}-1.6.5.0-opencv3.patch
> License: CeCILL
> Url: http://gmic.sourceforge.net/index.shtml
> Buildroot: %{_tmppath}/%{name}-%{version}-root
>@@ -66,6 +67,7 @@ Provides a plugin for using G'MIC from GIMP
> 
> %setup -q
> %patch1 -p1
>+%patch2 -p2 -b .opencv3
> 
> %build
> cd src
>@@ -126,6 +128,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic
> %{gimpplugindir}/gmic_gimp
> 
> %changelog
>+* Thu Jul 02 2015 Jozef Mlich <jmlich@redhat.com> - 1.6.5.0-2
>+- use pkg-config to get CFLAGS and LIBS for opencv
>+
> * Tue Jun 23 2015 Daniel P. Berrange <berrange@redhat.com> - 1.6.5.0-1
> - Update to 1.6.5.0 release
> - Enable zart binary build
>-- 
>2.4.3
>

Actions: View

Attachments on bug 1238734: 1045521