From 0319d39bfb9d91c8b850c66d7e777524e2fd8b4a Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Mon, 19 Oct 2015 09:03:44 +0000 Subject: - Update to 1.0.25 [1] - Add option for v4l [1] - Use more option helpers [1] - Removed CUPS option since CUPS requirement has been dropped upstream [1] While here: - Convert to USES=localbase - Regenerate some patches [1] This version also includes support for Canon LiDE 220 scanners. [2] PR: 203799 [1], 200788 [2] Submitted by: Ports Fury [1], avg@ [2] --- .../sane-backends/files/patch-backend__kodakaio.c | 65 +--------------------- 1 file changed, 3 insertions(+), 62 deletions(-) (limited to 'graphics/sane-backends/files/patch-backend__kodakaio.c') diff --git a/graphics/sane-backends/files/patch-backend__kodakaio.c b/graphics/sane-backends/files/patch-backend__kodakaio.c index 43e1e69cc235..029e6edd74c5 100644 --- a/graphics/sane-backends/files/patch-backend__kodakaio.c +++ b/graphics/sane-backends/files/patch-backend__kodakaio.c @@ -1,6 +1,6 @@ ---- backend/kodakaio.c.orig 2012-08-10 09:33:29.000000000 +0900 -+++ backend/kodakaio.c 2012-08-29 16:35:36.000000000 +0900 -@@ -181,6 +181,10 @@ +--- backend/kodakaio.c.orig 2015-09-26 00:53:42 UTC ++++ backend/kodakaio.c +@@ -207,6 +207,10 @@ normal levels. This system is a plan rat #include #include #include @@ -11,62 +11,3 @@ #if WITH_AVAHI /* used for auto detecting network printers */ -@@ -2184,6 +2188,7 @@ - AvahiLookupResultFlags flags, - AVAHI_GCC_UNUSED void* userdata) { - -+ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL; - char *pidkey, *pidvalue; - char *vidkey, *vidvalue; - size_t valuesize; -@@ -2204,20 +2209,40 @@ - avahi_address_snprint(a, sizeof(a), address); - - /* Output short for Kodak ESP */ -- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name); -- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), -- &vidkey, &vidvalue, &valuesize); -- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); -- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), -- &pidkey, &pidvalue, &valuesize); -- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); -+ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name); -+ -+ vid_pair_list = avahi_string_list_find(txt, "vid"); -+ if(vid_pair_list != NULL) { -+ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize); -+ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); -+ } -+ else DBG(min(10,DBG_AUTO), "failed to find key vid\n"); - -+ pid_pair_list = avahi_string_list_find(txt, "pid"); -+ if(pid_pair_list != NULL) { -+ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize); -+ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); -+ } -+ else DBG(min(10,DBG_AUTO), "failed to find key pid\n"); -+ -+ if(pid_pair_list != NULL && vid_pair_list != NULL) { - ProcessAvahiDevice(name, vidvalue, pidvalue, a); -- avahi_free(vidkey); avahi_free(vidvalue); -- avahi_free(pidkey); avahi_free(pidvalue); -+ } -+ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n"); -+ -+ if(vid_pair_list != NULL) { -+ avahi_free(vidkey); -+ avahi_free(vidvalue); -+ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n"); -+ } -+ if(pid_pair_list != NULL) { -+ avahi_free(pidkey); -+ avahi_free(pidvalue); -+ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n"); -+ } - } - } -- -+ DBG(min(10,DBG_AUTO), "ending resolve_callback\n"); - avahi_service_resolver_free(r); - } - -- cgit v1.2.3