Update sratom

source/modules/lilv/sratom-0.4.6/NEWS

@@ -1,3 +1,9 @@
+sratom (0.4.7) unstable;
+
+  * Fix warnings when building with ISO C++ compilers
+
+ -- David Robillard <d@drobilla.net>  Fri, 08 Aug 2014 18:14:19 -0400
+
 sratom (0.4.6) stable;
 
   * Update for latest LV2 Atom Object simplification

source/modules/lilv/sratom-0.4.6/sratom.pc.in

@@ -7,5 +7,5 @@ Name: Sratom
 Version: @SRATOM_VERSION@
 Description: LV2 Atom RDF serialisation library
 Requires: lv2 @PKG_serd_0@ @PKG_sord_0@
-Libs: -L${libdir} -l@LIB_SRATOM@
+Libs: -L${libdir} -l@LIB_SRATOM@ -lsord-0 -lserd-0 -lm
 Cflags: -I${includedir}/sratom-@SRATOM_MAJOR_VERSION@

source/modules/lilv/sratom-0.4.6/sratom/sratom.h

@@ -23,9 +23,9 @@
 
 #include <stdint.h>
 
-#include "lv2/atom.h"
-#include "lv2/atom-forge.h"
-#include "lv2/urid.h"
+#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
 #include "serd/serd.h"
 #include "sord/sord.h"
 
@@ -83,7 +83,7 @@ typedef enum {
 	   to sratom_read(); if this is a resource it will be read as an Object,
 	   but all other named resources encountered will be read as URIs.
 	*/
-	SRATOM_OBJECT_MODE_BLANK_SUBJECT,
+	SRATOM_OBJECT_MODE_BLANK_SUBJECT
 } SratomObjectMode;
 
 /**

source/modules/lilv/sratom-0.4.6/src/sratom.c

@@ -14,17 +14,15 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#define __STDC_LIMIT_MACROS 1
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lv2/atom-forge.h"
-#include "lv2/atom-util.h"
-#include "lv2/midi.h"
+#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
 
 #include "sratom/sratom.h"
 
@@ -36,7 +34,7 @@
 typedef enum {
 	MODE_SUBJECT,
 	MODE_BODY,
-	MODE_SEQUENCE,
+	MODE_SEQUENCE
 } ReadMode;
 
 struct SratomImpl {
@@ -600,7 +598,6 @@ read_node(Sratom*         sratom,
 				for (const char* s = str; s < str + len; s += 2) {
 					unsigned num;
 					sscanf(s, "%2X", &num);
-					assert(num < UINT8_MAX);
 					const uint8_t c = num;
 					lv2_atom_forge_raw(forge, &c, 1);
 				}

source/modules/lilv/sratom-0.4.6/wscript

@@ -8,7 +8,7 @@ import waflib.extras.autowaf as autowaf
 # major increment <=> incompatible changes
 # minor increment <=> compatible changes (additions)
 # micro increment <=> no interface changes
-SRATOM_VERSION       = '0.4.6'
+SRATOM_VERSION       = '0.4.7'
 SRATOM_MAJOR_VERSION = '0'
 
 # Mandatory waf variables
@@ -57,7 +57,7 @@ def configure(conf):
     autowaf.set_lib_env(conf, 'sratom', SRATOM_VERSION)
     conf.write_config_header('sratom_config.h', remove=False)
 
-    autowaf.display_msg(conf, "Unit tests", str(conf.env.BUILD_TESTS))
+    autowaf.display_msg(conf, "Unit tests", bool(conf.env.BUILD_TESTS))
     print('')
 
 lib_source = ['src/sratom.c']
@@ -143,7 +143,6 @@ def build(bld):
     # Documentation
     autowaf.build_dox(bld, 'SRATOM', SRATOM_VERSION, top, out)
 
-    bld.add_post_fun(autowaf.run_ldconfig)
     if bld.env.DOCS:
         bld.add_post_fun(fix_docs)