From: Carl Hetherington <cth@carlh.net>
Date: Tue, 12 Mar 2019 00:35:15 +0000 (+0000)
Subject: Fix string decoding; bump libcxml version.
X-Git-Tag: v1.6.3
X-Git-Url: https://main.carlh.net/gitweb/?p=libdcp.git;a=commitdiff_plain;h=refs%2Ftags%2Fv1.6.3

Fix string decoding; bump libcxml version.
---

diff --git a/cscript b/cscript
index d4903e3f..8d780305 100644
--- a/cscript
+++ b/cscript
@@ -36,9 +36,9 @@ import shutil
 
 def dependencies(target, options):
     if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'):
-        return (('libcxml', 'v0.16.0'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', '6648afc'))
+        return (('libcxml', 'v0.16.1'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', '6648afc'))
     else:
-        return (('libcxml', 'v0.16.0'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
+        return (('libcxml', 'v0.16.1'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index 54adf00a..743a0e8e 100644
--- a/wscript
+++ b/wscript
@@ -43,11 +43,6 @@ APPNAME = 'libdcp'
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
-if isinstance(this_version, bytes):
-    this_version = this_version.decode('UTF-8')
-if isinstance(last_version, bytes):
-    last_version = last_version.decode('UTF-8')
-
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else: