From f2446113941118eebc5496a282069c662741dc34 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Mar 12 2013 21:41:26 +0000 Subject: Update to release 0.5.1 --- diff --git a/0001-Conditionally-use-new-style-gphoto-callbacks.patch b/0001-Conditionally-use-new-style-gphoto-callbacks.patch deleted file mode 100644 index 1a1ef4d..0000000 --- a/0001-Conditionally-use-new-style-gphoto-callbacks.patch +++ /dev/null @@ -1,220 +0,0 @@ -From e6a347fd41eaee8047140d9dcbce16d3f40ff081 Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Thu, 21 Feb 2013 20:08:15 +0000 -Subject: [PATCH 1/2] Conditionally use new style gphoto callbacks - -In gphoto >= 2.5 many callbacks changed from 'char *fmt, va_args *' -to just 'char *msg'. Conditionally use the right signature based -on version ---- - configure.ac | 11 +++++++++- - src/backend/entangle-camera-list.c | 12 ++++++++++- - src/backend/entangle-camera.c | 39 +++++++++++++++++++++++++++++++--- - src/backend/entangle-progress.c | 4 ++-- - src/backend/entangle-progress.h | 4 ++-- - src/frontend/entangle-camera-manager.c | 8 ++----- - 6 files changed, 63 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e2b3ba1..b4fc39d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -89,10 +89,19 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_REQUIRED]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - --PKG_CHECK_MODULES([GPHOTO2], [libgphoto2 >= $GPHOTO2_REQUIRED]) -+have_gphoto25=no -+PKG_CHECK_MODULES([GPHOTO2], [libgphoto2 >= 2.5], [ -+ have_gphoto25=yes -+], [ -+ PKG_CHECK_MODULES([GPHOTO2], [libgphoto2 >= $GPHOTO2_REQUIRED]) -+]) - AC_SUBST(GPHOTO2_CFLAGS) - AC_SUBST(GPHOTO2_LIBS) - -+if test "$have_gphoto25" = "yes" ; then -+ AC_DEFINE_UNQUOTED([HAVE_GPHOTO25], 1, [whether we're building libgphoto >= 2.5]) -+fi -+ - PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= $GUDEV_REQUIRED]) - AC_SUBST(GUDEV_CFLAGS) - AC_SUBST(GUDEV_LIBS) -diff --git a/src/backend/entangle-camera-list.c b/src/backend/entangle-camera-list.c -index dd7d3e1..f4d7668 100644 ---- a/src/backend/entangle-camera-list.c -+++ b/src/backend/entangle-camera-list.c -@@ -129,6 +129,15 @@ static void entangle_camera_list_udev_event(EntangleDeviceManager *manager G_GNU - } - - -+#ifdef HAVE_GPHOTO25 -+static void entangle_camera_list_gphoto_log(GPLogLevel level G_GNUC_UNUSED, -+ const char *domain, -+ const char *msg, -+ void *data G_GNUC_UNUSED) -+{ -+ g_debug("%s: %s", domain, msg); -+} -+#else - static void entangle_camera_list_gphoto_log(GPLogLevel level G_GNUC_UNUSED, - const char *domain, - const char *format, -@@ -137,8 +146,9 @@ static void entangle_camera_list_gphoto_log(GPLogLevel level G_GNUC_UNUSED, - { - char *msg = g_strdup_vprintf(format, args); - g_debug("%s: %s", domain, msg); -+ g_free(msg); - } -- -+#endif - - static void entangle_camera_list_class_init(EntangleCameraListClass *klass) - { -diff --git a/src/backend/entangle-camera.c b/src/backend/entangle-camera.c -index be84800..0b14946 100644 ---- a/src/backend/entangle-camera.c -+++ b/src/backend/entangle-camera.c -@@ -541,6 +541,21 @@ const char *entangle_camera_get_port(EntangleCamera *cam) - } - - -+#ifdef HAVE_GPHOTO25 -+static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED, -+ float target, -+ const char *msg, -+ void *data) -+{ -+ EntangleCamera *cam = data; -+ EntangleCameraPrivate *priv = cam->priv; -+ -+ if (priv->progress) -+ entangle_progress_start(priv->progress, target, msg); -+ -+ return 0; /* XXX what is this actually useful for ? */ -+} -+#else - static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED, - float target, - const char *format, -@@ -550,11 +565,15 @@ static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUS - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; - -- if (priv->progress) -- entangle_progress_start(priv->progress, target, format, args); -+ if (priv->progress) { -+ char *str = g_strdup_vprintf(format, args); -+ entangle_progress_start(priv->progress, target, str); -+ g_free(str); -+ } - - return 0; /* XXX what is this actually useful for ? */ - } -+#endif - - static void do_entangle_camera_progress_update(GPContext *ctx G_GNUC_UNUSED, - unsigned int id G_GNUC_UNUSED, -@@ -587,6 +606,20 @@ static void entangle_camera_reset_last_error(EntangleCamera *cam) - priv->lastError = NULL; - } - -+ -+#ifdef HAVE_GPHOTO25 -+static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED, -+ const char *msg, -+ void *data) -+{ -+ EntangleCamera *cam = data; -+ EntangleCameraPrivate *priv = cam->priv; -+ -+ entangle_camera_reset_last_error(cam); -+ priv->lastError = g_strdup(msg); -+ ENTANGLE_DEBUG("Got error %s", priv->lastError); -+} -+#else - static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED, - const char *fmt, - va_list args, -@@ -599,7 +632,7 @@ static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED, - priv->lastError = g_strdup_vprintf(fmt, args); - ENTANGLE_DEBUG("Got error %s", priv->lastError); - } -- -+#endif - - gboolean entangle_camera_connect(EntangleCamera *cam, - GError **error) -diff --git a/src/backend/entangle-progress.c b/src/backend/entangle-progress.c -index 87b920d..c60070c 100644 ---- a/src/backend/entangle-progress.c -+++ b/src/backend/entangle-progress.c -@@ -23,11 +23,11 @@ - #include "entangle-debug.h" - #include "entangle-progress.h" - --void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args) -+void entangle_progress_start(EntangleProgress *prog, float target, const char *msg) - { - g_return_if_fail(ENTANGLE_IS_PROGRESS(prog)); - -- ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, format, args); -+ ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, msg); - } - - void entangle_progress_update(EntangleProgress *prog, float current) -diff --git a/src/backend/entangle-progress.h b/src/backend/entangle-progress.h -index 154d4c8..161220c 100644 ---- a/src/backend/entangle-progress.h -+++ b/src/backend/entangle-progress.h -@@ -38,14 +38,14 @@ typedef struct _EntangleProgressInterface EntangleProgressInterface; - struct _EntangleProgressInterface { - GTypeInterface parent; - -- void (*start) (EntangleProgress *prog, float target, const char *format, va_list args); -+ void (*start) (EntangleProgress *prog, float target, const char *msg); - void (*update) (EntangleProgress *prog, float current); - void (*stop) (EntangleProgress *prog); - }; - - GType entangle_progress_get_type(void); - --void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args); -+void entangle_progress_start(EntangleProgress *prog, float target, const char *msg); - void entangle_progress_update(EntangleProgress *prog, float current); - void entangle_progress_stop(EntangleProgress *prog); - -diff --git a/src/frontend/entangle-camera-manager.c b/src/frontend/entangle-camera-manager.c -index c97831b..107bacc 100644 ---- a/src/frontend/entangle-camera-manager.c -+++ b/src/frontend/entangle-camera-manager.c -@@ -1091,7 +1091,7 @@ static void do_camera_file_preview(EntangleCamera *cam G_GNUC_UNUSED, EntangleCa - } - - --static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *format, va_list args) -+static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *msg) - { - g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(iface)); - -@@ -1107,16 +1107,12 @@ static void do_entangle_camera_progress_start(EntangleProgress *iface, float tar - mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress")); - operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation")); - -- txt = g_strdup_vprintf(format, args); -- -- gtk_widget_set_tooltip_text(mtr, txt); -+ gtk_widget_set_tooltip_text(mtr, msg); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mtr), txt); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mtr), 0); - - gtk_widget_show(operation); - -- g_free(txt); -- - gdk_threads_leave(); - } - --- -1.8.1.2 - diff --git a/0002-Avoid-warnings-about-deprecated-mutex-condition-var-.patch b/0002-Avoid-warnings-about-deprecated-mutex-condition-var-.patch deleted file mode 100644 index 5b313a7..0000000 --- a/0002-Avoid-warnings-about-deprecated-mutex-condition-var-.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0085ba96cd7c57d7933685c5a3c555e5571fbd6f Mon Sep 17 00:00:00 2001 -From: "Daniel P. Berrange" -Date: Thu, 21 Feb 2013 20:08:58 +0000 -Subject: [PATCH 2/2] Avoid warnings about deprecated mutex/condition var - functions - -In recent glib2 releases several mutex/condition var functions -are deprecated. Add some macro wrappers to avoid the warnings ---- - src/backend/entangle-camera.c | 7 +++++++ - src/backend/entangle-colour-profile.c | 5 +++++ - src/backend/entangle-pixbuf-loader.c | 5 +++++ - 3 files changed, 17 insertions(+) - -diff --git a/src/backend/entangle-camera.c b/src/backend/entangle-camera.c -index 0b14946..e7dc875 100644 ---- a/src/backend/entangle-camera.c -+++ b/src/backend/entangle-camera.c -@@ -47,6 +47,13 @@ - 0, \ - msg) - -+#if GLIB_CHECK_VERSION(2, 31, 0) -+#define g_mutex_new() g_new0(GMutex, 1) -+#define g_mutex_free(m) g_free(m) -+#define g_cond_new() g_new0(GCond, 1) -+#define g_cond_free(c) g_free(c) -+#endif -+ - struct _EntangleCameraPrivate { - GMutex *lock; - GCond *jobCond; -diff --git a/src/backend/entangle-colour-profile.c b/src/backend/entangle-colour-profile.c -index 6fc56dc..030ddd9 100644 ---- a/src/backend/entangle-colour-profile.c -+++ b/src/backend/entangle-colour-profile.c -@@ -32,6 +32,11 @@ - #define ENTANGLE_COLOUR_PROFILE_TRANSFORM_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), ENTANGLE_TYPE_COLOUR_PROFILE_TRANSFORM, EntangleColourProfileTransformPrivate)) - -+#if GLIB_CHECK_VERSION(2, 31, 0) -+#define g_mutex_new() g_new0(GMutex, 1) -+#define g_mutex_free(m) g_free(m) -+#endif -+ - struct _EntangleColourProfilePrivate { - GMutex *lock; - GByteArray *data; -diff --git a/src/backend/entangle-pixbuf-loader.c b/src/backend/entangle-pixbuf-loader.c -index 4ae8d81..0163508 100644 ---- a/src/backend/entangle-pixbuf-loader.c -+++ b/src/backend/entangle-pixbuf-loader.c -@@ -29,6 +29,11 @@ - #define ENTANGLE_PIXBUF_LOADER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), ENTANGLE_TYPE_PIXBUF_LOADER, EntanglePixbufLoaderPrivate)) - -+#if GLIB_CHECK_VERSION(2, 31, 0) -+#define g_mutex_new() g_new0(GMutex, 1) -+#define g_mutex_free(m) g_free(m) -+#endif -+ - typedef struct _EntanglePixbufLoaderEntry { - int refs; - EntangleImage *image; --- -1.8.1.2 - diff --git a/entangle.spec b/entangle.spec index 39e421b..33dfe8b 100644 --- a/entangle.spec +++ b/entangle.spec @@ -3,17 +3,15 @@ # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 1} +%{!?enable_autotools:%define enable_autotools 0} Summary: Tethered shooting & control of digital cameras Name: entangle -Version: 0.5.0 -Release: 3%{?dist}%{?extra_release} +Version: 0.5.1 +Release: 1%{?dist}%{?extra_release} License: GPLv3+ Group: Applications/Multimedia Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.gz -Patch1: 0001-Conditionally-use-new-style-gphoto-callbacks.patch -Patch2: 0002-Avoid-warnings-about-deprecated-mutex-condition-var-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://entangle-photo.org/ @@ -49,8 +47,6 @@ and 'hands off' shooting directly from the controlling computer. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build @@ -120,6 +116,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas ||: %dir %{_datadir}/%{name}/plugins %changelog +* Tue Mar 12 2013 Daniel P Berrange - 0.5.1-1 +- Update to 0.5.1 release + * Thu Feb 21 2013 Daniel P Berrange - 0.5.0-3 - Fix crash with libgphoto >= 2.5 (rhbz #865819) diff --git a/sources b/sources index 8a07104..2eca594 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92d2203e7ec1ec6522cef7a40c7c1557 entangle-0.5.0.tar.gz +64519066aba25b2d22e997a7884a1911 entangle-0.5.1.tar.gz