diff -uNr libgphoto2-2.5.5.orig/camlibs/ax203/jpeg_memsrcdest.h libgphoto2-2.5.5/camlibs/ax203/jpeg_memsrcdest.h
--- libgphoto2-2.5.5.orig/camlibs/ax203/jpeg_memsrcdest.h	2012-12-13 03:49:31.000000000 -0500
+++ libgphoto2-2.5.5/camlibs/ax203/jpeg_memsrcdest.h	2016-06-17 22:05:50.000000000 -0400
@@ -1,7 +1,7 @@
 #include <jpeglib.h>
 
 void
-jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
 	unsigned long bufsize);
 
 void
diff -uNr libgphoto2-2.5.5.orig/camlibs/jl2005c/jpeg_memsrcdest.h libgphoto2-2.5.5/camlibs/jl2005c/jpeg_memsrcdest.h
--- libgphoto2-2.5.5.orig/camlibs/jl2005c/jpeg_memsrcdest.h	2012-12-13 03:49:29.000000000 -0500
+++ libgphoto2-2.5.5/camlibs/jl2005c/jpeg_memsrcdest.h	2016-06-17 22:05:31.000000000 -0400
@@ -1,7 +1,7 @@
 #include <jpeglib.h>
 
 void
-jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
 	unsigned long bufsize);
 
 void
diff -uNr libgphoto2-2.5.5.orig/libgphoto2_port/gphoto2/gphoto2-port-log.h libgphoto2-2.5.5/libgphoto2_port/gphoto2/gphoto2-port-log.h
--- libgphoto2-2.5.5.orig/libgphoto2_port/gphoto2/gphoto2-port-log.h	2014-07-22 16:57:45.000000000 -0400
+++ libgphoto2-2.5.5/libgphoto2_port/gphoto2/gphoto2-port-log.h	2016-06-17 22:14:31.000000000 -0400
@@ -102,6 +102,16 @@
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #define GP_DEBUG(...) \
         gp_log(GP_LOG_DEBUG, GP_MODULE "/" __FILE__, __VA_ARGS__)
+
+/*
+ * GP_LOG_D/E:
+ * simple helper macros for convenient and consistent logging of error
+ * and debug messages including information about the source location.
+ */
+#define GP_LOG_D(...) gp_log(GP_LOG_DEBUG, __func__, __VA_ARGS__)
+#define GP_LOG_E(...) gp_log_with_source_location(GP_LOG_ERROR, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define GP_LOG_DATA(DATA, SIZE) gp_log_data(__func__, DATA, SIZE)
+
 #elif defined(__GNUC__) &&  __GNUC__ >= 2
 #define GP_DEBUG(msg, params...) \
         gp_log(GP_LOG_DEBUG, GP_MODULE "/" __FILE__, msg, ##params)