[packages/gphoto2] - updated to 2.5.14 - added cdk patch (support default post-2012 cdk headers layout)

[qboosh]

commit c9d407462b4f2f4992d8e29bd17a2c0ca514a6ea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 19 18:27:31 2017 +0200

    - updated to 2.5.14
    - added cdk patch (support default post-2012 cdk headers layout)

 gphoto2-cdk.patch | 37 +++++++++++++++++++++++++++++++++++++
 gphoto2.spec      | 11 +++++++----
 2 files changed, 44 insertions(+), 4 deletions(-)
---
diff --git a/gphoto2.spec b/gphoto2.spec
index cadbacd..ad86810 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -8,28 +8,30 @@ Summary(pl.UTF-8):	Działający z linii poleceń program obsługujący libgphoto
 Summary(pt_BR.UTF-8):	GNU Photo - programa GNU para câmeras digitais
 Summary(zh_CN.UTF-8):	gPhoto - Linux下的使用数码相机的程序
 Name:		gphoto2
-Version:	2.5.10
-Release:	2
+Version:	2.5.14
+Release:	1
 License:	LGPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5:	7b3d0e721f6c1a151c6b9e130223d934
+# Source0-md5:	6c6a21b5e879330cdd71ef92dce36399
 Patch0:		%{name}-manpage_addon.patch
 Patch1:		automake-1.12.patch
 Patch2:		%{name}-ac.patch
+Patch3:		%{name}-cdk.patch
 URL:		http://www.gphoto.org/
 %{?with_aalib:BuildRequires:	aalib-devel}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cdk-devel >= 5.0_td20010421
 BuildRequires:	gettext-tools >= 0.14.1
-BuildRequires:	libexif-devel >= 0.6.9
+BuildRequires:	libexif-devel >= 1:0.6.9
 BuildRequires:	libgphoto2-devel >= 2.5.10
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	readline-devel
+Requires:	libexif >= 1:0.6.9
 Requires:	libgphoto2 >= 2.5.10
 Obsoletes:	gphoto2-progs
 # these are not true (renamed to libgphoto2-{devel,static}) - we must have
@@ -54,6 +56,7 @@ uma grande variedade de câmeras fotográficas digitais.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__rm} po/stamp-po
 
diff --git a/gphoto2-cdk.patch b/gphoto2-cdk.patch
new file mode 100644
index 0000000..f65dd8e
--- /dev/null
+++ b/gphoto2-cdk.patch
@@ -0,0 +1,37 @@
+--- gphoto2-2.5.14/configure.ac.orig	2017-07-19 17:05:04.747246216 +0200
++++ gphoto2-2.5.14/configure.ac	2017-07-19 17:24:56.143899271 +0200
+@@ -141,8 +141,8 @@
+ if $try_cdk; then
+         CPPFLAGS_save="$CPPFLAGS"
+         CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
+-        AC_CHECK_HEADER([cdk/cdk.h], [
+-                have_cdk=:
++        AC_CHECK_HEADERS([cdk/cdk.h cdk.h], [have_cdk=:])
++        if $have_cdk; then
+                 AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
+                 if test -n "${CDK_CONFIG}"; then
+                         CDK_CFLAGS=`$CDK_CONFIG --cflags`
+@@ -160,7 +160,7 @@
+                         cdk_msg="yes (but without fscale)"
+                 ])
+                 LDFLAGS="$LDFLAGS_save"
+-        ])
++	fi
+         CPPFLAGS="$CPPFLAGS_save"
+ fi
+ AM_CONDITIONAL([HAVE_CDK], [$have_cdk])
+--- gphoto2-2.5.14/gphoto2/gphoto2-cmd-config.c.orig	2015-08-01 13:20:27.000000000 +0200
++++ gphoto2-2.5.14/gphoto2/gphoto2-cmd-config.c	2017-07-19 16:49:28.570590242 +0200
+@@ -29,7 +29,12 @@
+ 
+ #include <gphoto2/gphoto2-widget.h>
+ 
++#ifdef HAVE_CDK_H
++#include <cdk.h>
++#elif defined(HAVE_CDK_CDK_H)
+ #include <cdk/cdk.h>
++#endif
++
+ 
+ #ifndef MAX
+ # define MAX(a, b) ((a) > (b) ? (a) : (b))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gphoto2.git/commitdiff/c9d407462b4f2f4992d8e29bd17a2c0ca514a6ea