Attachment 1082 Details for Bug 1393 – DIgikam 3.5.13.2 : add support for gphoto 2.5

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] DIgikam 3.5.13.2 : add support for gphoto 2.5

digikam-3.5.13.2-add_gphoto25_support.patch (text/plain), 1.95 KB, created by Francois Andriot on 2013-01-20 09:32:21 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-01-20 09:32:21 CST

Size: 1.95 KB

patch

obsolete

>--- trinity-digikam-3.5.13.2/digikam/utilities/cameragui/gpcamera.cpp.ORI	2013-01-20 16:00:06.448174588 +0100
>+++ trinity-digikam-3.5.13.2/digikam/utilities/cameragui/gpcamera.cpp	2013-01-20 16:14:18.831383743 +0100
>@@ -845,10 +845,19 @@
>     
>     m_status = new GPStatus;
> 
>+#ifdef HAVE_GPHOTO25
>     errorCode = gp_camera_folder_put_file(d->camera,
>                                           TQFile::encodeName(folder),
>+                                          TQFile::encodeName(itemName),
>+                                          GP_FILE_TYPE_NORMAL,
>                                           cfile,
>                                           m_status->context);
>+#else
>+    errorCode = gp_camera_folder_put_file(d->camera,
>+                                          TQFile::encodeName(folder),
>+                                          cfile,
>+                                          m_status->context);
>+#endif
>     if (errorCode != GP_OK) 
>     {
>         DDebug() << "Failed to upload item to camera!" << endl;
>@@ -1108,7 +1117,13 @@
>         for (int i = 0 ; i < numPorts ; i++) 
>         {
>             gp_port_info_list_get_info( list, i, &info );
>+#ifdef HAVE_GPHOTO25
>+            char *xpath;
>+            gp_port_info_get_name (info, &xpath);
>+            plist.append(xpath);
>+#else
>             plist.append( info.path );
>+#endif
>         }
>     }
> 
>--- trinity-digikam-3.5.13.2/digikam/configure.in.in.ORI	2013-01-20 16:16:43.950459312 +0100
>+++ trinity-digikam-3.5.13.2/digikam/configure.in.in	2013-01-20 16:25:40.438134606 +0100
>@@ -129,6 +129,8 @@
> AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config)
> AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config)
> if test -n "${GPHOTO_CONFIG}"; then
>+  GPHOTO_VERSION="`$GPHOTO_CONFIG --version`"
>+  case "${GPHOTO_VERSION}" in "libgphoto2 2.5"*) CXXFLAGS="$CXXFLAGS -DHAVE_GPHOTO25";; esac
>   GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
>   AC_SUBST(GPHOTO_CFLAGS)
>   LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"

Actions: View | Diff

Attachments on bug 1393: 1078 | 1079 | 1080 | 1081 | 1082 | 1083 | 1084 | 1085 | 1087 | 1088 | 1089 | 1091 | 1092 | 1093 | 1094 | 1095 | 1096 | 1099 | 1103 | 1226 | 1294 | 1295 | 1296 | 1297 | 1298 | 1299 | 1300 | 1301 | 1302 | 1303 | 1309