Package: argyll
Version: 1.0.4-1
Severity: normal
Tags: patch
Argyll embeds an old version of yajl (0.3.0) in its source code. Now
that yajl is in Debian, I'm attaching a patch that lets it compile
against the system yajl instead.
Note: Argyll modified yajl's API so argyll's jcnf can save comments.
But from what I can see, ucmm/ucmm.c is the only file that uses jcnf,
and it doesn't take advantage of that feature. So even though the patch
comments out a bit of argyll's code, it shouldn't affect its
functionality.
Regards,
John Stamp
--- a/jcnf/Makefile.am
+++ b/jcnf/Makefile.am
@@ -2,15 +2,13 @@
include $(top_srcdir)/Makefile.shared
-SUBDIRS = yajl
-
privatelib_LTLIBRARIES = libjcnf.la
privatelibdir = $(pkglibdir)
libjcnf_la_SOURCES = jcnf.h jcnf.c
-libjcnf_la_LIBADD = yajl/libyajl.la
+libjcnf_la_LIBADD = -lyajl
-LDADD = ./libjcnf.la yajl/libyajl.la
+LDADD = ./libjcnf.la -lyajl
check_PROGRAMS = test
--- a/jcnf/jcnf.c
+++ b/jcnf/jcnf.c
@@ -42,9 +42,9 @@
#include <string.h>
#include <math.h>
-#include "yajl/yajl_common.h"
-#include "yajl/yajl_gen.h"
-#include "yajl/yajl_parse.h"
+#include <yajl/yajl_common.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_parse.h>
#include "jcnf.h"
@@ -955,9 +955,10 @@
}
}
+ /*
if (p->keys[i]->comment != NULL) {
yajl_gen_cpp_comment(g, p->keys[i]->comment, strlen(p->keys[i]->comment));
- }
+ }*/
#ifdef NEVER
yajl_gen_map_open(g);
--- a/spectro/Makefile.am
+++ b/spectro/Makefile.am
@@ -22,10 +22,10 @@
../numlib/libargyllnum.la ./libinst.la ../libargyll.la
LDADD = ./libinsttypes.la ./libdisp.la ./libinst.la ../ucmm/libucmm.la \
- ../jcnf/libjcnf.la ../jcnf/yajl/libyajl.la ../xicc/libxicc.la \
+ ../jcnf/libjcnf.la ../xicc/libxicc.la \
../xicc/libxcolorants.la $(ICC_LIBS) ../cgats/libcgats.la \
../rspl/librspl.la ../gamut/libgamut.la ../target/libtarget.la \
- ../plot/libplot.la ../numlib/libargyllnum.la $(X_LIBS) -lusb
+ ../plot/libplot.la ../numlib/libargyllnum.la $(X_LIBS) -lusb -lyajl
bin_PROGRAMS = synthcal dispwin dispread dispcal fakeread synthread \
chartread spotread spec2cie average spyd2en
